From dd1cf550bd2d27b8492fec704b4b9ae534c12668 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Fri, 10 Apr 2026 17:59:33 +0800 Subject: [PATCH 01/45] refactor: add IPlanVisitor --- .../plan/planner/plan/node/IPlanVisitor.java | 22 + .../planner/plan/node/IQueryPlanVisitor.java | 812 ++++++++++++++++++ .../plan/planner/plan/node/PlanNodeId.java | 2 +- .../agent/task/PipeDataNodeTaskAgent.java | 2 +- .../PipeTableModelTsFileBuilderV2.java | 2 +- .../builder/PipeTreeModelTsFileBuilderV2.java | 2 +- .../schemaregion/IoTDBSchemaRegionSource.java | 2 +- .../PipeTableStatementToPlanVisitor.java | 2 +- .../PipeTreeStatementToPlanVisitor.java | 2 +- .../thrift/impl/ClientRPCServiceImpl.java | 2 +- .../impl/DataNodeInternalRPCServiceImpl.java | 2 +- .../iotdb/db/queryengine/common/QueryId.java | 2 +- .../queryengine/common/ResultNodeContext.java | 2 +- .../execution/driver/DriverContext.java | 2 +- .../execution/operator/OperatorContext.java | 2 +- .../schema/CountGroupByLevelScanOperator.java | 2 +- .../operator/schema/SchemaCountOperator.java | 2 +- .../schema/SchemaFetchScanOperator.java | 2 +- .../schema/SchemaQueryScanOperator.java | 2 +- ...AbstractSeriesAggregationScanOperator.java | 2 +- .../source/AbstractSourceOperator.java | 2 +- .../ActiveDeviceRegionScanOperator.java | 2 +- .../ActiveTimeSeriesRegionScanOperator.java | 2 +- .../AlignedSeriesAggregationScanOperator.java | 2 +- .../source/AlignedSeriesScanOperator.java | 2 +- .../operator/source/ExchangeOperator.java | 2 +- .../source/LastCacheScanOperator.java | 2 +- .../source/SeriesAggregationScanOperator.java | 2 +- .../operator/source/SeriesScanOperator.java | 2 +- .../source/ShowDiskUsageOperator.java | 2 +- .../operator/source/ShowQueriesOperator.java | 2 +- .../operator/source/SourceOperator.java | 2 +- .../AbstractAggTableScanOperator.java | 2 +- .../relational/AbstractTableScanOperator.java | 2 +- .../source/relational/CteScanOperator.java | 2 +- .../InformationSchemaTableScanOperator.java | 2 +- .../optimization/AggregationPushDown.java | 2 +- .../plan/optimization/PredicatePushDown.java | 2 +- .../planner/LocalExecutionPlanContext.java | 2 +- .../plan/planner/OperatorTreeGenerator.java | 2 +- .../plan/planner/TableOperatorGenerator.java | 6 +- .../distribution/DistributionPlanner.java | 2 +- .../distribution/NodeGroupContext.java | 2 +- .../SimpleFragmentParallelPlanner.java | 2 +- .../planner/distribution/SourceRewriter.java | 2 +- .../plan/AbstractFragmentParallelPlanner.java | 2 +- .../plan/planner/plan/PlanFragment.java | 2 +- .../planner/plan/node/ExplainAnalyzeNode.java | 7 +- .../plan/planner/plan/node/PlanNode.java | 4 +- .../plan/planner/plan/node/PlanVisitor.java | 794 +---------------- .../plan/planner/plan/node/WritePlanNode.java | 1 + .../plan/node/load/LoadSingleTsFileNode.java | 2 +- .../plan/node/load/LoadTsFileNode.java | 2 +- .../plan/node/load/LoadTsFilePieceNode.java | 2 +- .../read/AbstractSchemaMergeNode.java | 2 +- .../metadata/read/CountSchemaMergeNode.java | 9 +- .../read/DeviceSchemaFetchScanNode.java | 9 +- .../node/metadata/read/DevicesCountNode.java | 2 +- .../metadata/read/DevicesSchemaScanNode.java | 2 +- .../read/LevelTimeSeriesCountNode.java | 2 +- .../read/LogicalViewSchemaScanNode.java | 2 +- .../read/NodeManagementMemoryMergeNode.java | 9 +- .../metadata/read/NodePathsConvertNode.java | 9 +- .../metadata/read/NodePathsCountNode.java | 9 +- .../read/NodePathsSchemaScanNode.java | 2 +- .../read/PathsUsingTemplateScanNode.java | 2 +- .../metadata/read/SchemaFetchMergeNode.java | 9 +- .../metadata/read/SchemaFetchScanNode.java | 2 +- .../metadata/read/SchemaQueryMergeNode.java | 9 +- .../read/SchemaQueryOrderByHeatNode.java | 9 +- .../metadata/read/SchemaQueryScanNode.java | 9 +- .../read/SeriesSchemaFetchScanNode.java | 9 +- .../metadata/read/TableDeviceSourceNode.java | 2 +- .../metadata/read/TimeSeriesCountNode.java | 2 +- .../read/TimeSeriesSchemaScanNode.java | 2 +- .../metadata/write/ActivateTemplateNode.java | 9 +- .../write/AlterEncodingCompressorNode.java | 9 +- .../metadata/write/AlterTimeSeriesNode.java | 7 +- .../write/BatchActivateTemplateNode.java | 9 +- .../write/ConstructSchemaBlackListNode.java | 9 +- .../write/CreateAlignedTimeSeriesNode.java | 7 +- .../write/CreateMultiTimeSeriesNode.java | 7 +- .../metadata/write/CreateTimeSeriesNode.java | 9 +- .../write/DeactivateTemplateNode.java | 9 +- .../metadata/write/DeleteTimeSeriesNode.java | 9 +- .../InternalBatchActivateTemplateNode.java | 9 +- .../InternalCreateMultiTimeSeriesNode.java | 9 +- .../write/InternalCreateTimeSeriesNode.java | 9 +- .../write/PreDeactivateTemplateNode.java | 9 +- .../RollbackPreDeactivateTemplateNode.java | 9 +- .../write/RollbackSchemaBlackListNode.java | 9 +- .../write/view/AlterLogicalViewNode.java | 9 +- .../ConstructLogicalViewBlackListNode.java | 9 +- .../write/view/CreateLogicalViewNode.java | 9 +- .../write/view/DeleteLogicalViewNode.java | 9 +- .../RollbackLogicalViewBlackListNode.java | 9 +- .../node/pipe/PipeEnrichedDeleteDataNode.java | 7 +- .../node/pipe/PipeEnrichedInsertNode.java | 7 +- .../pipe/PipeEnrichedNonWritePlanNode.java | 7 +- .../node/pipe/PipeEnrichedWritePlanNode.java | 7 +- .../node/pipe/PipeOperateSchemaQueueNode.java | 7 +- .../plan/node/process/AI/InferenceNode.java | 9 +- .../process/ActiveRegionScanMergeNode.java | 9 +- .../process/AggregationMergeSortNode.java | 9 +- .../plan/node/process/AggregationNode.java | 9 +- .../plan/node/process/CollectNode.java | 9 +- .../plan/node/process/ColumnInjectNode.java | 9 +- .../plan/node/process/DeviceMergeNode.java | 9 +- .../plan/node/process/DeviceViewIntoNode.java | 9 +- .../plan/node/process/DeviceViewNode.java | 9 +- .../plan/node/process/ExchangeNode.java | 9 +- .../planner/plan/node/process/FillNode.java | 9 +- .../planner/plan/node/process/FilterNode.java | 9 +- .../plan/node/process/GroupByLevelNode.java | 9 +- .../plan/node/process/GroupByTagNode.java | 9 +- .../node/process/HorizontallyConcatNode.java | 9 +- .../planner/plan/node/process/IntoNode.java | 9 +- .../planner/plan/node/process/LimitNode.java | 9 +- .../plan/node/process/MergeSortNode.java | 9 +- .../node/process/MultiChildProcessNode.java | 2 +- .../planner/plan/node/process/OffsetNode.java | 9 +- .../plan/node/process/ProcessNode.java | 2 +- .../plan/node/process/ProjectNode.java | 9 +- .../node/process/RawDataAggregationNode.java | 9 +- .../node/process/SingleChildProcessNode.java | 2 +- .../node/process/SingleDeviceViewNode.java | 9 +- .../process/SlidingWindowAggregationNode.java | 9 +- .../planner/plan/node/process/SortNode.java | 9 +- .../planner/plan/node/process/TopKNode.java | 9 +- .../plan/node/process/TransformNode.java | 9 +- .../node/process/TwoChildProcessNode.java | 2 +- .../process/join/FullOuterTimeJoinNode.java | 9 +- .../node/process/join/InnerTimeJoinNode.java | 9 +- .../process/join/LeftOuterTimeJoinNode.java | 9 +- .../process/last/LastQueryCollectNode.java | 9 +- .../node/process/last/LastQueryMergeNode.java | 9 +- .../plan/node/process/last/LastQueryNode.java | 9 +- .../process/last/LastQueryTransformNode.java | 9 +- .../plan/node/sink/IdentitySinkNode.java | 9 +- .../plan/node/sink/MultiChildrenSinkNode.java | 2 +- .../plan/node/sink/ShuffleSinkNode.java | 9 +- .../plan/planner/plan/node/sink/SinkNode.java | 2 +- .../AlignedSeriesAggregationScanNode.java | 9 +- .../node/source/AlignedSeriesScanNode.java | 9 +- .../node/source/DeviceRegionScanNode.java | 9 +- .../plan/node/source/LastQueryScanNode.java | 9 +- .../node/source/LastSeriesSourceNode.java | 2 +- .../plan/node/source/RegionScanNode.java | 9 +- .../source/SeriesAggregationScanNode.java | 9 +- .../source/SeriesAggregationSourceNode.java | 9 +- .../plan/node/source/SeriesScanNode.java | 9 +- .../node/source/SeriesScanSourceNode.java | 9 +- .../plan/node/source/SeriesSourceNode.java | 2 +- .../plan/node/source/ShowDiskUsageNode.java | 9 +- .../plan/node/source/ShowQueriesNode.java | 9 +- .../planner/plan/node/source/SourceNode.java | 2 +- .../node/source/TimeseriesRegionScanNode.java | 9 +- .../plan/node/source/VirtualSourceNode.java | 2 +- .../node/write/AbstractDeleteDataNode.java | 2 +- ...ontinuousSameSearchIndexSeparatorNode.java | 2 +- .../plan/node/write/DeleteDataNode.java | 7 +- .../node/write/InsertMultiTabletsNode.java | 7 +- .../planner/plan/node/write/InsertNode.java | 2 +- .../plan/node/write/InsertRowNode.java | 7 +- .../plan/node/write/InsertRowsNode.java | 7 +- .../node/write/InsertRowsOfOneDeviceNode.java | 7 +- .../plan/node/write/InsertTabletNode.java | 7 +- .../planner/plan/node/write/ObjectNode.java | 7 +- .../node/write/RelationalDeleteDataNode.java | 7 +- .../node/write/RelationalInsertRowNode.java | 7 +- .../node/write/RelationalInsertRowsNode.java | 7 +- .../write/RelationalInsertTabletNode.java | 7 +- .../planner/plan/node/write/SearchNode.java | 2 +- .../plan/parameter/AggregationDescriptor.java | 3 - .../planner/distribute/SubPlanGenerator.java | 2 +- .../TableDistributedPlanGenerator.java | 2 +- .../distribute/TableDistributedPlanner.java | 2 +- .../TableModelQueryFragmentPlanner.java | 2 +- .../planner/iterative/GroupReference.java | 9 +- .../planner/iterative/IterativeOptimizer.java | 2 +- .../planner/node/AggregationNode.java | 9 +- .../node/AggregationTableScanNode.java | 9 +- .../AggregationTreeDeviceViewScanNode.java | 9 +- ...gnedAggregationTreeDeviceViewScanNode.java | 10 +- .../relational/planner/node/ApplyNode.java | 9 +- .../planner/node/AssignUniqueId.java | 9 +- .../relational/planner/node/CollectNode.java | 9 +- .../relational/planner/node/CopyToNode.java | 9 +- .../planner/node/CorrelatedJoinNode.java | 9 +- .../relational/planner/node/CteScanNode.java | 9 +- .../planner/node/DeviceTableScanNode.java | 9 +- .../planner/node/EnforceSingleRowNode.java | 9 +- .../relational/planner/node/ExceptNode.java | 9 +- .../relational/planner/node/ExchangeNode.java | 9 +- .../planner/node/ExplainAnalyzeNode.java | 9 +- .../relational/planner/node/FillNode.java | 9 +- .../relational/planner/node/FilterNode.java | 9 +- .../relational/planner/node/GapFillNode.java | 9 +- .../relational/planner/node/GroupNode.java | 9 +- .../node/InformationSchemaTableScanNode.java | 9 +- .../planner/node/IntersectNode.java | 9 +- .../relational/planner/node/IntoNode.java | 9 +- .../relational/planner/node/JoinNode.java | 9 +- .../relational/planner/node/LimitNode.java | 9 +- .../planner/node/LinearFillNode.java | 9 +- .../planner/node/MarkDistinctNode.java | 9 +- .../planner/node/MergeSortNode.java | 9 +- ...gnedAggregationTreeDeviceViewScanNode.java | 10 +- .../relational/planner/node/OffsetNode.java | 9 +- .../relational/planner/node/OutputNode.java | 9 +- .../planner/node/PatternRecognitionNode.java | 9 +- .../planner/node/PreviousFillNode.java | 9 +- .../relational/planner/node/ProjectNode.java | 9 +- .../planner/node/RowNumberNode.java | 9 +- .../relational/planner/node/SemiJoinNode.java | 9 +- .../planner/node/SetOperationNode.java | 2 +- .../relational/planner/node/SortNode.java | 9 +- .../planner/node/StreamSortNode.java | 9 +- ...skUsageInformationSchemaTableScanNode.java | 2 +- .../planner/node/TableFunctionNode.java | 9 +- .../node/TableFunctionProcessorNode.java | 9 +- .../planner/node/TableScanNode.java | 9 +- .../relational/planner/node/TopKNode.java | 9 +- .../planner/node/TopKRankingNode.java | 9 +- .../node/TreeAlignedDeviceViewScanNode.java | 9 +- .../planner/node/TreeDeviceViewScanNode.java | 9 +- .../TreeNonAlignedDeviceViewScanNode.java | 9 +- .../relational/planner/node/UnionNode.java | 9 +- .../planner/node/ValueFillNode.java | 9 +- .../relational/planner/node/ValuesNode.java | 9 +- .../relational/planner/node/WindowNode.java | 9 +- .../schema/AbstractTableDeviceQueryNode.java | 2 +- .../AbstractTableDevicesDeletionNode.java | 2 +- .../ConstructTableDevicesBlackListNode.java | 9 +- .../schema/CreateOrUpdateTableDeviceNode.java | 9 +- .../node/schema/DeleteTableDeviceNode.java | 7 +- .../DeleteTableDevicesInBlackListNode.java | 9 +- .../RollbackTableDevicesBlackListNode.java | 9 +- .../schema/TableAttributeColumnDropNode.java | 9 +- .../TableDeviceAttributeCommitUpdateNode.java | 9 +- .../TableDeviceAttributeUpdateNode.java | 9 +- .../node/schema/TableDeviceFetchNode.java | 9 +- .../schema/TableDeviceQueryCountNode.java | 9 +- .../node/schema/TableDeviceQueryScanNode.java | 9 +- .../node/schema/TableNodeLocationAddNode.java | 9 +- .../schema/TableSchemaQueryWriteVisitor.java | 2 +- .../optimizations/AdaptivePlanOptimizer.java | 2 +- .../optimizations/PlanNodeDecorrelator.java | 2 +- .../planner/optimizations/SymbolMapper.java | 2 +- .../sql/util/ExpressionFormatter.java | 1 - ...GeneralRegionAttributeSecurityService.java | 2 +- .../storageengine/dataregion/DataRegion.java | 2 +- .../DataRegionStateMachineTest.java | 2 +- .../SchemaRegionSimpleRecoverTest.java | 2 +- .../schemaRegion/SchemaRegionTestUtil.java | 2 +- .../pipe/consensus/DeletionRecoverTest.java | 2 +- .../pipe/consensus/DeletionResourceTest.java | 2 +- .../event/PipeTabletInsertionEventTest.java | 2 +- .../sink/PipeDataNodeThriftRequestTest.java | 2 +- .../PipePlanTablePatternParseVisitorTest.java | 2 +- .../PipePlanTreePatternParseVisitorTest.java | 2 +- .../pipe/source/PipeRealtimeExtractTest.java | 2 +- .../SchemaRegionListeningQueueTest.java | 2 +- .../queryengine/execution/DataDriverTest.java | 2 +- .../executor/RegionWriteExecutorTest.java | 2 +- .../AggregationMergeSortOperatorTest.java | 2 +- .../operator/AggregationOperatorTest.java | 2 +- ...gnedSeriesAggregationScanOperatorTest.java | 2 +- .../AlignedSeriesScanOperatorTest.java | 2 +- .../operator/CteScanOperatorTest.java | 2 +- .../DeviceIteratorScanOperatorTest.java | 2 +- .../operator/DeviceViewIntoOperatorTest.java | 2 +- .../operator/DeviceViewOperatorTest.java | 2 +- .../operator/ExchangeOperatorTest.java | 2 +- .../execution/operator/FillOperatorTest.java | 2 +- .../HorizontallyConcatOperatorTest.java | 2 +- .../operator/LastQueryMergeOperatorTest.java | 2 +- .../operator/LastQueryOperatorTest.java | 2 +- .../LastQueryTreeSortOperatorTest.java | 2 +- .../execution/operator/LimitOperatorTest.java | 2 +- .../operator/MergeTreeSortOperatorTest.java | 2 +- ...nedTreeDeviceViewScanOperatorTreeTest.java | 2 +- .../operator/OffsetOperatorTest.java | 2 +- .../operator/OperatorMemoryTest.java | 2 +- .../RawDataAggregationOperatorTest.java | 2 +- .../SeriesAggregationScanOperatorTest.java | 2 +- .../operator/SeriesScanOperatorTest.java | 2 +- .../SingleDeviceViewOperatorTest.java | 2 +- .../SlidingWindowAggregationOperatorTest.java | 2 +- .../operator/SortOperatorSortBranchTest.java | 2 +- .../operator/TransformOperatorTest.java | 2 +- .../operator/TreeIntoOperatorTest.java | 2 +- .../operator/TreeLinearFillOperatorTest.java | 2 +- .../operator/TreeSortOperatorTest.java | 2 +- .../operator/TreeTopKOperatorTest.java | 2 +- .../operator/UpdateLastCacheOperatorTest.java | 2 +- .../ViewFromTreeAdaptorOperatorTest.java | 2 +- .../process/TableStreamSortOperatorTest.java | 2 +- .../operator/process/ValuesOperatorTest.java | 2 +- .../gapfill/GapFillWGroupWMoOperatorTest.java | 2 +- .../GapFillWGroupWoMoOperatorTest.java | 2 +- .../GapFillWoGroupWMoOperatorTest.java | 2 +- .../GapFillWoGroupWoMoOperatorTest.java | 2 +- .../process/window/RowNumberOperatorTest.java | 2 +- .../window/TableWindowOperatorTest.java | 2 +- .../window/TopKRankingOperatorTest.java | 2 +- .../CountGroupByLevelMergeOperatorTest.java | 2 +- .../schema/SchemaCountOperatorTest.java | 2 +- .../schema/SchemaQueryScanOperatorTest.java | 2 +- .../sink/IdentitySinkOperatorTest.java | 2 +- .../SinkOperatorDownStreamNodeIdTest.java | 2 +- .../relational/TableScanOperatorTest.java | 2 +- .../plan/optimization/TestPlanBuilder.java | 2 +- .../planner/FragmentInstanceSerdeTest.java | 2 +- .../plan/planner/PipelineBuilderTest.java | 2 +- .../AggregationDistributionTest.java | 2 +- .../planner/distribution/LastQueryTest.java | 2 +- .../logical/RegionScanLogicalPlannerTest.java | 2 +- .../planner/node/PlanGraphPrinterTest.java | 2 +- .../planner/node/load/LoadTsFileNodeTest.java | 2 +- .../read/DeviceSchemaFetchScanNodeTest.java | 2 +- .../read/DeviceSchemaScanNodeSerdeTest.java | 2 +- ...odeManagementMemoryMergeNodeSerdeTest.java | 2 +- .../read/PathsUsingTemplateScanNodeTest.java | 2 +- .../read/SchemaCountNodeSerdeTest.java | 2 +- .../read/SchemaFetchMergeNodeTest.java | 2 +- .../read/SeriesSchemaFetchScanNodeTest.java | 2 +- .../TimeSeriesSchemaScanNodeSerdeTest.java | 2 +- .../write/MetadataWriteNodeSerDeTest.java | 2 +- .../PipeEnrichedDeleteDataNodeSerdeTest.java | 2 +- .../pipe/PipeEnrichedInsertNodeSerdeTest.java | 2 +- ...PipeEnrichedNonWritePlanNodeSerdeTest.java | 2 +- .../PipeEnrichedWritePlanNodeSerdeTest.java | 2 +- .../process/AggregationNodeSerdeTest.java | 2 +- .../node/process/DeviceViewNodeSerdeTest.java | 2 +- .../node/process/ExchangeNodeSerdeTest.java | 2 +- .../node/process/FillNodeSerdeTest.java | 2 +- .../node/process/FilterNodeSerdeTest.java | 2 +- .../process/GroupByLevelNodeSerdeTest.java | 2 +- .../node/process/GroupByTagNodeSerdeTest.java | 2 +- .../node/process/IntoNodeSerdeTest.java | 2 +- .../node/process/LimitNodeSerdeTest.java | 2 +- .../node/process/OffsetNodeSerdeTest.java | 2 +- .../SingleDeviceViewNodeSerdeTest.java | 2 +- .../node/process/SortNodeSerdeTest.java | 2 +- .../node/process/TimeJoinNodeSerdeTest.java | 2 +- .../node/process/WindowNodeSerdeTest.java | 2 +- .../node/sink/IdentitySinkNodeSerdeTest.java | 2 +- .../sink/ShuffleSinkHandleNodeSerdeTest.java | 2 +- .../SeriesAggregationScanNodeSerdeTest.java | 2 +- .../node/source/SeriesScanNodeSerdeTest.java | 2 +- .../node/source/SourceNodeSerdeTest.java | 2 +- ...SameSearchIndexSeparatorNodeSerDeTest.java | 2 +- .../node/write/DeleteDataNodeSerdeTest.java | 2 +- .../InsertMultiTabletsNodeSerdeTest.java | 2 +- .../node/write/InsertRowNodeSerdeTest.java | 2 +- .../node/write/InsertRowsNodeSerdeTest.java | 2 +- .../InsertRowsOfOneDeviceNodeSerdeTest.java | 2 +- .../node/write/InsertTabletNodeSerdeTest.java | 2 +- .../node/write/WritePlanNodeSplitTest.java | 2 +- .../write/RelationalDeleteDataNodeTest.java | 2 +- .../analyzer/AggregationCornerCaseTest.java | 2 +- .../plan/relational/analyzer/JoinTest.java | 2 +- .../relational/analyzer/TestPlanBuilder.java | 2 +- .../PatternRecognitionNodeSerdeTest.java | 2 +- .../plan/statement/StatementTestUtils.java | 2 +- .../DataNodeInternalRPCServiceImplTest.java | 2 +- .../dataregion/DataRegionTest.java | 2 +- .../db/storageengine/dataregion/TTLTest.java | 2 +- ...sSpaceCompactionWithFastPerformerTest.java | 2 +- ...eCompactionWithReadPointPerformerTest.java | 2 +- ...nerSeqCompactionWithFastPerformerTest.java | 2 +- ...qCompactionWithReadChunkPerformerTest.java | 2 +- .../settle/SettleRequestHandlerTest.java | 2 +- .../memtable/MemTableTestUtils.java | 2 +- .../memtable/PrimitiveMemTableTest.java | 2 +- .../memtable/TsFileProcessorTest.java | 2 +- .../dataregion/wal/WALManagerTest.java | 2 +- .../dataregion/wal/WALTestUtils.java | 2 +- .../wal/allocation/ElasticStrategyTest.java | 2 +- .../allocation/FirstCreateStrategyTest.java | 2 +- .../allocation/RoundRobinStrategyTest.java | 2 +- .../wal/buffer/WALBufferCommonTest.java | 2 +- .../dataregion/wal/io/WALFileTest.java | 2 +- .../wal/node/ConsensusReqReaderTest.java | 2 +- .../dataregion/wal/node/WALFakeNodeTest.java | 2 +- .../dataregion/wal/node/WALNodeTest.java | 2 +- .../wal/node/WalDeleteOutdatedNewTest.java | 2 +- .../wal/recover/WALRecoverManagerTest.java | 2 +- .../wal/recover/WALRepairWriterTest.java | 2 +- .../recover/file/TsFilePlanRedoerTest.java | 2 +- .../UnsealedTsFileRecoverPerformerTest.java | 2 +- .../trigger/executor/TriggerExecuteTest.java | 2 +- .../apache/iotdb/db/utils/MemUtilsTest.java | 2 +- 394 files changed, 1837 insertions(+), 1637 deletions(-) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IQueryPlanVisitor.java rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/planner/plan/node/PlanNodeId.java (97%) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java new file mode 100644 index 0000000000000..4a82f59756d0f --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java @@ -0,0 +1,22 @@ +/* + * 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.node_commons.plan.planner.plan.node; + +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; + +public interface IPlanVisitor { + + R visitPlan(PlanNode node, C context); +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IQueryPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IQueryPlanVisitor.java new file mode 100644 index 0000000000000..bba1a28314c2d --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IQueryPlanVisitor.java @@ -0,0 +1,812 @@ +/* + * 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.node_commons.plan.planner.plan.node; + +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesCountNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesSchemaScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.LevelTimeSeriesCountNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodeManagementMemoryMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsConvertNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsCountNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsSchemaScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaFetchMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryOrderByHeatNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SeriesSchemaFetchScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TimeSeriesCountNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TimeSeriesSchemaScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.BatchActivateTemplateNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ConstructSchemaBlackListNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateAlignedTimeSeriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateMultiTimeSeriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateTimeSeriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.DeactivateTemplateNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.DeleteTimeSeriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalBatchActivateTemplateNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalCreateMultiTimeSeriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalCreateTimeSeriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.PreDeactivateTemplateNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.RollbackPreDeactivateTemplateNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.RollbackSchemaBlackListNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.AlterLogicalViewNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.ConstructLogicalViewBlackListNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.CreateLogicalViewNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.DeleteLogicalViewNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.RollbackLogicalViewBlackListNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AI.InferenceNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ActiveRegionScanMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.CollectNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ColumnInjectNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewIntoNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByTagNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.HorizontallyConcatNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.IntoNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MergeSortNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleDeviceViewNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SlidingWindowAggregationNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SortNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TopKNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TransformNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.InnerTimeJoinNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.LeftOuterTimeJoinNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryCollectNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryTransformNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.ShuffleSinkNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesAggregationScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.DeviceRegionScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.LastQueryScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.RegionScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationSourceNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanSourceNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowDiskUsageNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowQueriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.TimeseriesRegionScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AlignedAggregationTreeDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.NonAlignedAggregationTreeDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeAlignedDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.ConstructTableDevicesBlackListNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.DeleteTableDeviceNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.DeleteTableDevicesInBlackListNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.RollbackTableDevicesBlackListNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableAttributeColumnDropNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeCommitUpdateNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; +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.node.schema.TableNodeLocationAddNode; + +public interface IQueryPlanVisitor extends IPlanVisitor { + + ///////////////////////////////////////////////////////////////////////////////////////////////// + // Data Query Node + ///////////////////////////////////////////////////////////////////////////////////////////////// + + // source -------------------------------------------------------------------------------------- + + default R visitSourceNode(SourceNode node, C context) { + return visitPlan(node, context); + } + + default R visitSeriesScanSource(SeriesScanSourceNode node, C context) { + return visitSourceNode(node, context); + } + + default R visitSeriesScan(SeriesScanNode node, C context) { + return visitSeriesScanSource(node, context); + } + + default R visitAlignedSeriesScan(AlignedSeriesScanNode node, C context) { + return visitSeriesScanSource(node, context); + } + + default R visitSeriesAggregationSourceNode(SeriesAggregationSourceNode node, C context) { + return visitSourceNode(node, context); + } + + default R visitSeriesAggregationScan(SeriesAggregationScanNode node, C context) { + return visitSeriesAggregationSourceNode(node, context); + } + + default R visitAlignedSeriesAggregationScan(AlignedSeriesAggregationScanNode node, C context) { + return visitSeriesAggregationSourceNode(node, context); + } + + default R visitLastQueryScan(LastQueryScanNode node, C context) { + return visitSourceNode(node, context); + } + + default R visitRegionScan(RegionScanNode node, C context) { + return visitSourceNode(node, context); + } + + default R visitDeviceRegionScan(DeviceRegionScanNode node, C context) { + return visitRegionScan(node, context); + } + + default R visitTimeSeriesRegionScan(TimeseriesRegionScanNode node, C context) { + return visitRegionScan(node, context); + } + + default R visitCteScan(CteScanNode node, C context) { + return visitSourceNode(node, context); + } + + // single child -------------------------------------------------------------------------------- + + default R visitSingleChildProcess(SingleChildProcessNode node, C context) { + return visitPlan(node, context); + } + + default R visitFill(FillNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitFilter(FilterNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitSlidingWindowAggregation(SlidingWindowAggregationNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitLimit(LimitNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitOffset(OffsetNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitSort(SortNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitProject(ProjectNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitExchange(ExchangeNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitTransform(TransformNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitInto(IntoNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitInto( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitDeviceViewInto(DeviceViewIntoNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitColumnInject(ColumnInjectNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitSingleDeviceView(SingleDeviceViewNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitInference(InferenceNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitExplainAnalyze(ExplainAnalyzeNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitRawDataAggregation(RawDataAggregationNode node, C context) { + return visitSingleChildProcess(node, context); + } + + // two child ----------------------------------------------------------------------------------- + + default R visitTwoChildProcess(TwoChildProcessNode node, C context) { + return visitPlan(node, context); + } + + default R visitLeftOuterTimeJoin(LeftOuterTimeJoinNode node, C context) { + return visitTwoChildProcess(node, context); + } + + // multi child -------------------------------------------------------------------------------- + + default R visitMultiChildProcess(MultiChildProcessNode node, C context) { + return visitPlan(node, context); + } + + default R visitDeviceView(DeviceViewNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitAggregationMergeSort(AggregationMergeSortNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitDeviceMerge(DeviceMergeNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitGroupByLevel(GroupByLevelNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitGroupByTag(GroupByTagNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitAggregation(AggregationNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitFullOuterTimeJoin(FullOuterTimeJoinNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitInnerTimeJoin(InnerTimeJoinNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitLastQuery(LastQueryNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitLastQueryMerge(LastQueryMergeNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitLastQueryCollect(LastQueryCollectNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitLastQueryTransform(LastQueryTransformNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitMergeSort(MergeSortNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitCollect(CollectNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitTopK(TopKNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitHorizontallyConcat(HorizontallyConcatNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitRegionMerge(ActiveRegionScanMergeNode node, C context) { + return visitMultiChildProcess(node, context); + } + + // others ----------------------------------------------------------------------------------- + + default R visitShowQueries(ShowQueriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitShowDiskUsage(ShowDiskUsageNode node, C context) { + return visitPlan(node, context); + } + + default R visitIdentitySink(IdentitySinkNode node, C context) { + return visitPlan(node, context); + } + + default R visitShuffleSink(ShuffleSinkNode node, C context) { + return visitPlan(node, context); + } + + ///////////////////////////////////////////////////////////////////////////////////////////////// + // Schema Write & Query Node + ///////////////////////////////////////////////////////////////////////////////////////////////// + + default R visitSchemaQueryMerge(SchemaQueryMergeNode node, C context) { + return visitPlan(node, context); + } + + default R visitSchemaQueryScan(SchemaQueryScanNode node, C context) { + return visitPlan(node, context); + } + + default R visitSchemaQueryOrderByHeat(SchemaQueryOrderByHeatNode node, C context) { + return visitPlan(node, context); + } + + default R visitTimeSeriesSchemaScan(TimeSeriesSchemaScanNode node, C context) { + return visitPlan(node, context); + } + + default R visitDevicesSchemaScan(DevicesSchemaScanNode node, C context) { + return visitPlan(node, context); + } + + default R visitDevicesCount(DevicesCountNode node, C context) { + return visitPlan(node, context); + } + + default R visitTimeSeriesCount(TimeSeriesCountNode node, C context) { + return visitPlan(node, context); + } + + default R visitLevelTimeSeriesCount(LevelTimeSeriesCountNode node, C context) { + return visitPlan(node, context); + } + + default R visitCountMerge(CountSchemaMergeNode node, C context) { + return visitPlan(node, context); + } + + default R visitCreateTimeSeries(CreateTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitSchemaFetchMerge(SchemaFetchMergeNode node, C context) { + return visitPlan(node, context); + } + + default R visitSeriesSchemaFetchScan(SeriesSchemaFetchScanNode node, C context) { + return visitPlan(node, context); + } + + default R visitDeviceSchemaFetchScan(DeviceSchemaFetchScanNode node, C context) { + return visitPlan(node, context); + } + + default R visitCreateAlignedTimeSeries(CreateAlignedTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitCreateMultiTimeSeries(CreateMultiTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitAlterTimeSeries(AlterTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitInternalCreateTimeSeries(InternalCreateTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitActivateTemplate(ActivateTemplateNode node, C context) { + return visitPlan(node, context); + } + + default R visitPreDeactivateTemplate(PreDeactivateTemplateNode node, C context) { + return visitPlan(node, context); + } + + default R visitRollbackPreDeactivateTemplate(RollbackPreDeactivateTemplateNode node, C context) { + return visitPlan(node, context); + } + + default R visitDeactivateTemplate(DeactivateTemplateNode node, C context) { + return visitPlan(node, context); + } + + default R visitInternalBatchActivateTemplate(InternalBatchActivateTemplateNode node, C context) { + return visitPlan(node, context); + } + + default R visitInternalCreateMultiTimeSeries(InternalCreateMultiTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitNodePathsSchemaScan(NodePathsSchemaScanNode node, C context) { + return visitPlan(node, context); + } + + default R visitNodeManagementMemoryMerge(NodeManagementMemoryMergeNode node, C context) { + return visitPlan(node, context); + } + + default R visitNodePathConvert(NodePathsConvertNode node, C context) { + return visitPlan(node, context); + } + + default R visitNodePathsCount(NodePathsCountNode node, C context) { + return visitPlan(node, context); + } + + default R visitDeleteTimeseries(DeleteTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitAlterEncodingCompressor(AlterEncodingCompressorNode node, C context) { + return visitPlan(node, context); + } + + default R visitAlterTimeSeriesDataType(AlterTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitConstructSchemaBlackList(ConstructSchemaBlackListNode node, C context) { + return visitPlan(node, context); + } + + default R visitRollbackSchemaBlackList(RollbackSchemaBlackListNode node, C context) { + return visitPlan(node, context); + } + + default R visitBatchActivateTemplate(BatchActivateTemplateNode node, C context) { + return visitPlan(node, context); + } + + default R visitCreateLogicalView(CreateLogicalViewNode node, C context) { + return visitPlan(node, context); + } + + default R visitConstructLogicalViewBlackList(ConstructLogicalViewBlackListNode node, C context) { + return visitPlan(node, context); + } + + default R visitRollbackLogicalViewBlackList(RollbackLogicalViewBlackListNode node, C context) { + return visitPlan(node, context); + } + + default R visitDeleteLogicalView(DeleteLogicalViewNode node, C context) { + return visitPlan(node, context); + } + + default R visitAlterLogicalView(AlterLogicalViewNode node, C context) { + return visitPlan(node, context); + } + + default R visitCreateOrUpdateTableDevice( + final CreateOrUpdateTableDeviceNode node, final C context) { + return visitPlan(node, context); + } + + default R visitTableDeviceAttributeUpdate( + final TableDeviceAttributeUpdateNode node, final C context) { + return visitPlan(node, context); + } + + default R visitTableDeviceFetch(final TableDeviceFetchNode node, final C context) { + return visitPlan(node, context); + } + + default R visitTableDeviceQueryScan(final TableDeviceQueryScanNode node, final C context) { + return visitPlan(node, context); + } + + default R visitTableDeviceQueryCount(final TableDeviceQueryCountNode node, final C context) { + return visitPlan(node, context); + } + + default R visitTableDeviceAttributeCommit( + final TableDeviceAttributeCommitUpdateNode node, final C context) { + return visitPlan(node, context); + } + + default R visitTableNodeLocationAdd(final TableNodeLocationAddNode node, final C context) { + return visitPlan(node, context); + } + + default R visitDeleteTableDevice(final DeleteTableDeviceNode node, final C context) { + return visitPlan(node, context); + } + + default R visitTableAttributeColumnDrop( + final TableAttributeColumnDropNode node, final C context) { + return visitPlan(node, context); + } + + default R visitConstructTableDevicesBlackList( + final ConstructTableDevicesBlackListNode node, final C context) { + return visitPlan(node, context); + } + + default R visitRollbackTableDevicesBlackList( + final RollbackTableDevicesBlackListNode node, final C context) { + return visitPlan(node, context); + } + + default R visitDeleteTableDevicesInBlackList( + final DeleteTableDevicesInBlackListNode node, final C context) { + return visitPlan(node, context); + } + + // =============================== Used for Table Model ==================================== + default R visitFilter( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitApply( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode node, C context) { + return visitTwoChildProcess(node, context); + } + + default R visitAssignUniqueId( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitEnforceSingleRow( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode node, + C context) { + return visitSingleChildProcess(node, context); + } + + default R visitCorrelatedJoin( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode node, + C context) { + return visitTwoChildProcess(node, context); + } + + default R visitTableScan(TableScanNode node, C context) { + return visitPlan(node, context); + } + + default R visitDeviceTableScan(DeviceTableScanNode node, C context) { + return visitTableScan(node, context); + } + + default R visitInformationSchemaTableScan(InformationSchemaTableScanNode node, C context) { + return visitTableScan(node, context); + } + + default R visitProject( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitLimit( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitOffset( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitMergeSort( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitExplainAnalyze( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode node, + C context) { + return visitSingleChildProcess(node, context); + } + + default R visitCopyTo( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitOutput( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitCollect( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitGapFill(GapFillNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitFill( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.FillNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitPreviousFill(PreviousFillNode node, C context) { + return visitFill(node, context); + } + + default R visitLinearFill(LinearFillNode node, C context) { + return visitFill(node, context); + } + + default R visitValueFill(ValueFillNode node, C context) { + return visitFill(node, context); + } + + default R visitSort( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitStreamSort( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitGroup(GroupNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitTopK( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitTopKRanking( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode node, + C context) { + return visitSingleChildProcess(node, context); + } + + default R visitRowNumber(RowNumberNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitValuesNode(ValuesNode node, C context) { + return visitPlan(node, context); + } + + default R visitJoin( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode node, C context) { + return visitTwoChildProcess(node, context); + } + + default R visitSemiJoin(SemiJoinNode node, C context) { + return visitTwoChildProcess(node, context); + } + + default R visitGroupReference(GroupReference node, C context) { + return visitPlan(node, context); + } + + default R visitAggregation( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode node, + C context) { + return visitSingleChildProcess(node, context); + } + + default R visitTableExchange( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitAggregationTableScan( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode node, + C context) { + return visitDeviceTableScan(node, context); + } + + default R visitTreeDeviceViewScan(TreeDeviceViewScanNode node, C context) { + return visitDeviceTableScan(node, context); + } + + default R visitAggregationTreeDeviceViewScan(AggregationTreeDeviceViewScanNode node, C context) { + return visitAggregationTableScan(node, context); + } + + default R visitAlignedAggregationTreeDeviceViewScan( + AlignedAggregationTreeDeviceViewScanNode node, C context) { + return visitAggregationTreeDeviceViewScan(node, context); + } + + default R visitNonAlignedAggregationTreeDeviceViewScan( + NonAlignedAggregationTreeDeviceViewScanNode node, C context) { + return visitAggregationTreeDeviceViewScan(node, context); + } + + default R visitTreeAlignedDeviceViewScan(TreeAlignedDeviceViewScanNode node, C context) { + return visitTreeDeviceViewScan(node, context); + } + + default R visitTreeNonAlignedDeviceViewScan(TreeNonAlignedDeviceViewScanNode node, C context) { + return visitTreeDeviceViewScan(node, context); + } + + default R visitMarkDistinct(MarkDistinctNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitWindowFunction(WindowNode node, C context) { + return visitPlan(node, context); + } + + default R visitTableFunction(TableFunctionNode node, C context) { + return visitPlan(node, context); + } + + default R visitTableFunctionProcessor(TableFunctionProcessorNode node, C context) { + return visitPlan(node, context); + } + + default R visitPatternRecognition(PatternRecognitionNode node, C context) { + return visitPlan(node, context); + } + + default R visitUnion(UnionNode node, C context) { + return visitPlan(node, context); + } + + default R visitIntersect(IntersectNode node, C context) { + return visitPlan(node, context); + } + + default R visitExcept(ExceptNode node, C context) { + return visitPlan(node, context); + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeId.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeId.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeId.java index fd842616f7cd7..7e5a68e96d56b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeId.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.planner.plan.node; +package org.apache.iotdb.db.node_commons.plan.planner.plan.node; import org.apache.tsfile.utils.Accountable; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java index 8e6818dff3207..053957bcbe85c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java @@ -48,6 +48,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.agent.task.builder.PipeDataNodeBuilder; import org.apache.iotdb.db.pipe.agent.task.builder.PipeDataNodeTaskBuilder; @@ -61,7 +62,6 @@ 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.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeOperateSchemaQueueNode; import org.apache.iotdb.db.schemaengine.SchemaEngine; import org.apache.iotdb.db.storageengine.StorageEngine; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java index 81d3a20e1a1e5..3b98454fca154 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; import org.apache.iotdb.db.storageengine.dataregion.flush.MemTableFlushTask; import org.apache.iotdb.db.storageengine.dataregion.memtable.IMemTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java index a9654d062c08c..71b1ba455f0bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.pipe.sink.util.builder; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.storageengine.dataregion.flush.MemTableFlushTask; import org.apache.iotdb.db.storageengine.dataregion.memtable.IMemTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java index f743e1dc7ccdf..d62dcfe9c3810 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java @@ -36,6 +36,7 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionSnapshotEvent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent; @@ -46,7 +47,6 @@ import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; 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.metadata.write.AlterTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeOperateSchemaQueueNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java index 03b62f637e132..e3047fb56a235 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.source.schemaregion; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateOrUpdateDevice; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java index 04348f0044284..13901264868b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.source.schemaregion; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.write.BatchActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalCreateMultiTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; 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 ed754c418c635..ee8c2c44e778b 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 @@ -47,6 +47,7 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.protocol.basic.BasicOpenSessionResp; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; @@ -79,7 +80,6 @@ import org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java index f5cdb47876a3d..608b409a28a62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -105,6 +105,7 @@ import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.partition.DataPartitionTableGenerator; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.protocol.client.ConfigNodeInfo; @@ -150,7 +151,6 @@ import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; 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.load.LoadTsFilePieceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/QueryId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/QueryId.java index 44e67aa7ba608..0e78806e3e907 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/QueryId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/QueryId.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.common; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ResultNodeContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ResultNodeContext.java index c9cb4f97776dd..648b322c764fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ResultNodeContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ResultNodeContext.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.common; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; public class ResultNodeContext { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java index 9231b89e326ef..d153e05f69631 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.execution.driver; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.ExchangeOperator; import org.apache.iotdb.db.queryengine.execution.schedule.task.DriverTaskId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java index 48a389459880f..21192550c5018 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import io.airlift.units.Duration; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java index 084935f68b02a..cd421a301e82d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ISchemaInfo; 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/SchemaCountOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java index 69c7050455f75..b21f4f0251abf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java @@ -22,12 +22,12 @@ import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; import org.apache.iotdb.db.schemaengine.schemaregion.read.req.IShowDevicesPlan; 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/SchemaFetchScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java index b2ed81a71ae9d..27465248fb2f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java @@ -25,12 +25,12 @@ import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.common.schematree.node.SchemaNode; 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.iotdb.db.schemaengine.schemaregion.ISchemaRegion; import org.apache.tsfile.common.conf.TSFileDescriptor; 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 2e0e885ab75d6..e437938fdfffd 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 @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; import org.apache.iotdb.commons.schema.column.ColumnHeader; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ISchemaInfo; 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/source/AbstractSeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java index 3c0b5ce82d873..d5fffd6b14b8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java index 285acceb7a19f..fec84b8517b4e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; public abstract class AbstractSourceOperator extends AbstractOperator implements SourceOperator { 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 fc6e624270d4e..916921e3c870f 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 @@ -24,10 +24,10 @@ 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.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DeviceContext; 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; import org.apache.iotdb.db.schemaengine.template.ClusterTemplateManager; import org.apache.tsfile.block.column.ColumnBuilder; 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 2bf866fbd9a6f..0f2b940a3a62e 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 @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java index c80b71c7a37cb..4f943e070b128 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java index 1fc8014b3ea89..2e6a3e785fa80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java index 96233f17e0859..7d6e3a2d7b964 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.exchange.source.ISourceHandle; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java index 1070e49b1727e..db22f6d350fa5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java index 70027337b5bae..84aa6d2bd34bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.IFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java index f83623a4cc2dd..94d14d31e713b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.IFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java index cf04c65dd4f0d..fa573c73eb690 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.db.storageengine.dataregion.utils.StorageEngineTimePartitionIterator; import org.apache.iotdb.db.storageengine.dataregion.utils.TreeDiskUsageStatisticUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java index 75013c844dc7c..14ebcaec19ddb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java index 6ac9f950b1b62..45c9ace8f2722 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; public interface SourceOperator extends Operator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java index 9d3979bafecd2..5b77ab661a85e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.queryengine.execution.operator.window.IWindow; import org.apache.iotdb.db.queryengine.execution.operator.window.TimeWindow; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java index 60bfd87ba316a..a2aed523dc26d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.AbstractSeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanUtil; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java index c45f6e4559544..202dd06293ef3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java @@ -21,11 +21,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; 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.iotdb.db.utils.cte.CteDataReader; import org.apache.iotdb.db.utils.cte.CteDataStore; import org.apache.iotdb.db.utils.cte.MemoryReader; 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 index d8a625fb92b6e..4ce6336409fdb 100644 --- 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 @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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 461087768e5c3..d7222e1b75996 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 @@ -25,6 +25,7 @@ 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.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java index 4a03287439e73..5a555832f41b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java @@ -23,6 +23,7 @@ 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.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java index 6c9d52dbe8c31..5e8d37a2e0e02 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimatorFactory; 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.schemaengine.schemaregion.ISchemaRegion; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index 422454c11b679..91fc26d5d1fec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -30,6 +30,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.NodeRef; @@ -177,7 +178,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimatorFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; 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 c31a2061f49ec..e219a8168af89 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 @@ -30,6 +30,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.TableDateBinTimeRangeIterator; @@ -151,10 +152,8 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; import org.apache.iotdb.db.queryengine.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; @@ -372,9 +371,6 @@ public class TableOperatorGenerator extends PlanVisitor R accept(PlanVisitor visitor, C context) { - return visitor.visitExplainAnalyze(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitExplainAnalyze(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNode.java index 4e3196c8d42c4..f0ab28bc2cb8e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNode.java @@ -21,6 +21,8 @@ import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; import org.apache.iotdb.consensus.common.request.IConsensusRequest; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -126,7 +128,7 @@ private int getChildrenCount(List children) { public abstract List getOutputColumnNames(); - public R accept(PlanVisitor visitor, C context) { + public R accept(IPlanVisitor visitor, C context) { return visitor.visitPlan(this, context); } 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 1bc3c9611098d..00125a970b7b8 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 @@ -19,99 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesCountNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesSchemaScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.LevelTimeSeriesCountNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodeManagementMemoryMergeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsConvertNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsCountNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsSchemaScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaFetchMergeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryMergeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryOrderByHeatNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SeriesSchemaFetchScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TimeSeriesCountNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TimeSeriesSchemaScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.BatchActivateTemplateNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ConstructSchemaBlackListNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateAlignedTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateMultiTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.DeactivateTemplateNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.DeleteTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalBatchActivateTemplateNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalCreateMultiTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalCreateTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.PreDeactivateTemplateNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.RollbackPreDeactivateTemplateNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.RollbackSchemaBlackListNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.AlterLogicalViewNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.ConstructLogicalViewBlackListNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.CreateLogicalViewNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.DeleteLogicalViewNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.RollbackLogicalViewBlackListNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedInsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedNonWritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedWritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeOperateSchemaQueueNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AI.InferenceNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ActiveRegionScanMergeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.CollectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ColumnInjectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceMergeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewIntoNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByTagNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.HorizontallyConcatNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.IntoNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MergeSortNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleDeviceViewNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SlidingWindowAggregationNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SortNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TopKNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TransformNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.InnerTimeJoinNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.LeftOuterTimeJoinNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryCollectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryMergeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryTransformNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.ShuffleSinkNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesAggregationScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.DeviceRegionScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.LastQueryScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.RegionScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationSourceNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanSourceNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowDiskUsageNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowQueriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.TimeseriesRegionScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertMultiTabletsNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; @@ -123,48 +36,9 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertRowNode; 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.AggregationTreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AlignedAggregationTreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.NonAlignedAggregationTreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeAlignedDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.ConstructTableDevicesBlackListNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.DeleteTableDeviceNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.DeleteTableDevicesInBlackListNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.RollbackTableDevicesBlackListNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableAttributeColumnDropNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeCommitUpdateNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; -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.node.schema.TableNodeLocationAddNode; @SuppressWarnings("java:S6539") // suppress "Monster class" warning -public abstract class PlanVisitor { +public abstract class PlanVisitor implements IQueryPlanVisitor { public R process(PlanNode node, C context) { return node.accept(this, context); @@ -172,447 +46,6 @@ public R process(PlanNode node, C context) { public abstract R visitPlan(PlanNode node, C context); - ///////////////////////////////////////////////////////////////////////////////////////////////// - // Data Query Node - ///////////////////////////////////////////////////////////////////////////////////////////////// - - // source -------------------------------------------------------------------------------------- - - public R visitSourceNode(SourceNode node, C context) { - return visitPlan(node, context); - } - - public R visitSeriesScanSource(SeriesScanSourceNode node, C context) { - return visitSourceNode(node, context); - } - - public R visitSeriesScan(SeriesScanNode node, C context) { - return visitSeriesScanSource(node, context); - } - - public R visitAlignedSeriesScan(AlignedSeriesScanNode node, C context) { - return visitSeriesScanSource(node, context); - } - - public R visitSeriesAggregationSourceNode(SeriesAggregationSourceNode node, C context) { - return visitSourceNode(node, context); - } - - public R visitSeriesAggregationScan(SeriesAggregationScanNode node, C context) { - return visitSeriesAggregationSourceNode(node, context); - } - - public R visitAlignedSeriesAggregationScan(AlignedSeriesAggregationScanNode node, C context) { - return visitSeriesAggregationSourceNode(node, context); - } - - public R visitLastQueryScan(LastQueryScanNode node, C context) { - return visitSourceNode(node, context); - } - - public R visitRegionScan(RegionScanNode node, C context) { - return visitSourceNode(node, context); - } - - public R visitDeviceRegionScan(DeviceRegionScanNode node, C context) { - return visitRegionScan(node, context); - } - - public R visitTimeSeriesRegionScan(TimeseriesRegionScanNode node, C context) { - return visitRegionScan(node, context); - } - - public R visitCteScan(CteScanNode node, C context) { - return visitSourceNode(node, context); - } - - // single child -------------------------------------------------------------------------------- - - public R visitSingleChildProcess(SingleChildProcessNode node, C context) { - return visitPlan(node, context); - } - - public R visitFill(FillNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitFilter(FilterNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitSlidingWindowAggregation(SlidingWindowAggregationNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitLimit(LimitNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitOffset(OffsetNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitSort(SortNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitProject(ProjectNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitExchange(ExchangeNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitTransform(TransformNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitInto(IntoNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitInto( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitDeviceViewInto(DeviceViewIntoNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitColumnInject(ColumnInjectNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitSingleDeviceView(SingleDeviceViewNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitInference(InferenceNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitExplainAnalyze(ExplainAnalyzeNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitRawDataAggregation(RawDataAggregationNode node, C context) { - return visitSingleChildProcess(node, context); - } - - // two child ----------------------------------------------------------------------------------- - - public R visitTwoChildProcess(TwoChildProcessNode node, C context) { - return visitPlan(node, context); - } - - public R visitLeftOuterTimeJoin(LeftOuterTimeJoinNode node, C context) { - return visitTwoChildProcess(node, context); - } - - // multi child -------------------------------------------------------------------------------- - - public R visitMultiChildProcess(MultiChildProcessNode node, C context) { - return visitPlan(node, context); - } - - public R visitDeviceView(DeviceViewNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitAggregationMergeSort(AggregationMergeSortNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitDeviceMerge(DeviceMergeNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitGroupByLevel(GroupByLevelNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitGroupByTag(GroupByTagNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitAggregation(AggregationNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitFullOuterTimeJoin(FullOuterTimeJoinNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitInnerTimeJoin(InnerTimeJoinNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitLastQuery(LastQueryNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitLastQueryMerge(LastQueryMergeNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitLastQueryCollect(LastQueryCollectNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitLastQueryTransform(LastQueryTransformNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitMergeSort(MergeSortNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitCollect(CollectNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitTopK(TopKNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitHorizontallyConcat(HorizontallyConcatNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitRegionMerge(ActiveRegionScanMergeNode node, C context) { - return visitMultiChildProcess(node, context); - } - - // others ----------------------------------------------------------------------------------- - - public R visitShowQueries(ShowQueriesNode node, C context) { - return visitPlan(node, context); - } - - public R visitShowDiskUsage(ShowDiskUsageNode node, C context) { - return visitPlan(node, context); - } - - public R visitIdentitySink(IdentitySinkNode node, C context) { - return visitPlan(node, context); - } - - public R visitShuffleSink(ShuffleSinkNode node, C context) { - return visitPlan(node, context); - } - - ///////////////////////////////////////////////////////////////////////////////////////////////// - // Schema Write & Query Node - ///////////////////////////////////////////////////////////////////////////////////////////////// - - public R visitSchemaQueryMerge(SchemaQueryMergeNode node, C context) { - return visitPlan(node, context); - } - - public R visitSchemaQueryScan(SchemaQueryScanNode node, C context) { - return visitPlan(node, context); - } - - public R visitSchemaQueryOrderByHeat(SchemaQueryOrderByHeatNode node, C context) { - return visitPlan(node, context); - } - - public R visitTimeSeriesSchemaScan(TimeSeriesSchemaScanNode node, C context) { - return visitPlan(node, context); - } - - public R visitDevicesSchemaScan(DevicesSchemaScanNode node, C context) { - return visitPlan(node, context); - } - - public R visitDevicesCount(DevicesCountNode node, C context) { - return visitPlan(node, context); - } - - public R visitTimeSeriesCount(TimeSeriesCountNode node, C context) { - return visitPlan(node, context); - } - - public R visitLevelTimeSeriesCount(LevelTimeSeriesCountNode node, C context) { - return visitPlan(node, context); - } - - public R visitCountMerge(CountSchemaMergeNode node, C context) { - return visitPlan(node, context); - } - - public R visitCreateTimeSeries(CreateTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - public R visitSchemaFetchMerge(SchemaFetchMergeNode node, C context) { - return visitPlan(node, context); - } - - public R visitSeriesSchemaFetchScan(SeriesSchemaFetchScanNode node, C context) { - return visitPlan(node, context); - } - - public R visitDeviceSchemaFetchScan(DeviceSchemaFetchScanNode node, C context) { - return visitPlan(node, context); - } - - public R visitCreateAlignedTimeSeries(CreateAlignedTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - public R visitCreateMultiTimeSeries(CreateMultiTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - public R visitAlterTimeSeries(AlterTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - public R visitInternalCreateTimeSeries(InternalCreateTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - public R visitActivateTemplate(ActivateTemplateNode node, C context) { - return visitPlan(node, context); - } - - public R visitPreDeactivateTemplate(PreDeactivateTemplateNode node, C context) { - return visitPlan(node, context); - } - - public R visitRollbackPreDeactivateTemplate(RollbackPreDeactivateTemplateNode node, C context) { - return visitPlan(node, context); - } - - public R visitDeactivateTemplate(DeactivateTemplateNode node, C context) { - return visitPlan(node, context); - } - - public R visitInternalBatchActivateTemplate(InternalBatchActivateTemplateNode node, C context) { - return visitPlan(node, context); - } - - public R visitInternalCreateMultiTimeSeries(InternalCreateMultiTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - public R visitNodePathsSchemaScan(NodePathsSchemaScanNode node, C context) { - return visitPlan(node, context); - } - - public R visitNodeManagementMemoryMerge(NodeManagementMemoryMergeNode node, C context) { - return visitPlan(node, context); - } - - public R visitNodePathConvert(NodePathsConvertNode node, C context) { - return visitPlan(node, context); - } - - public R visitNodePathsCount(NodePathsCountNode node, C context) { - return visitPlan(node, context); - } - - public R visitDeleteTimeseries(DeleteTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - public R visitAlterEncodingCompressor(AlterEncodingCompressorNode node, C context) { - return visitPlan(node, context); - } - - public R visitAlterTimeSeriesDataType(AlterTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - public R visitConstructSchemaBlackList(ConstructSchemaBlackListNode node, C context) { - return visitPlan(node, context); - } - - public R visitRollbackSchemaBlackList(RollbackSchemaBlackListNode node, C context) { - return visitPlan(node, context); - } - - public R visitBatchActivateTemplate(BatchActivateTemplateNode node, C context) { - return visitPlan(node, context); - } - - public R visitCreateLogicalView(CreateLogicalViewNode node, C context) { - return visitPlan(node, context); - } - - public R visitConstructLogicalViewBlackList(ConstructLogicalViewBlackListNode node, C context) { - return visitPlan(node, context); - } - - public R visitRollbackLogicalViewBlackList(RollbackLogicalViewBlackListNode node, C context) { - return visitPlan(node, context); - } - - public R visitDeleteLogicalView(DeleteLogicalViewNode node, C context) { - return visitPlan(node, context); - } - - public R visitAlterLogicalView(AlterLogicalViewNode node, C context) { - return visitPlan(node, context); - } - - public R visitCreateOrUpdateTableDevice( - final CreateOrUpdateTableDeviceNode node, final C context) { - return visitPlan(node, context); - } - - public R visitTableDeviceAttributeUpdate( - final TableDeviceAttributeUpdateNode node, final C context) { - return visitPlan(node, context); - } - - public R visitTableDeviceFetch(final TableDeviceFetchNode node, final C context) { - return visitPlan(node, context); - } - - public R visitTableDeviceQueryScan(final TableDeviceQueryScanNode node, final C context) { - return visitPlan(node, context); - } - - public R visitTableDeviceQueryCount(final TableDeviceQueryCountNode node, final C context) { - return visitPlan(node, context); - } - - public R visitTableDeviceAttributeCommit( - final TableDeviceAttributeCommitUpdateNode node, final C context) { - return visitPlan(node, context); - } - - public R visitTableNodeLocationAdd(final TableNodeLocationAddNode node, final C context) { - return visitPlan(node, context); - } - - public R visitDeleteTableDevice(final DeleteTableDeviceNode node, final C context) { - return visitPlan(node, context); - } - - public R visitTableAttributeColumnDrop(final TableAttributeColumnDropNode node, final C context) { - return visitPlan(node, context); - } - - public R visitConstructTableDevicesBlackList( - final ConstructTableDevicesBlackListNode node, final C context) { - return visitPlan(node, context); - } - - public R visitRollbackTableDevicesBlackList( - final RollbackTableDevicesBlackListNode node, final C context) { - return visitPlan(node, context); - } - - public R visitDeleteTableDevicesInBlackList( - final DeleteTableDevicesInBlackListNode node, final C context) { - return visitPlan(node, context); - } - ///////////////////////////////////////////////////////////////////////////////////////////////// // Data Write Node ///////////////////////////////////////////////////////////////////////////////////////////////// @@ -684,227 +117,4 @@ public R visitPipeEnrichedNonWritePlanNode(PipeEnrichedNonWritePlanNode node, C public R visitPipeOperateSchemaQueueNode(PipeOperateSchemaQueueNode node, C context) { return visitPlan(node, context); } - - // =============================== Used for Table Model ==================================== - public R visitFilter( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitApply( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode node, C context) { - return visitTwoChildProcess(node, context); - } - - public R visitAssignUniqueId( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitEnforceSingleRow( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode node, - C context) { - return visitSingleChildProcess(node, context); - } - - public R visitCorrelatedJoin( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode node, - C context) { - return visitTwoChildProcess(node, context); - } - - public R visitTableScan(TableScanNode node, C context) { - 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); - } - - public R visitLimit( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitOffset( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitMergeSort( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitExplainAnalyze( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode node, - C context) { - return visitSingleChildProcess(node, context); - } - - public R visitCopyTo( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitOutput( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitCollect( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitGapFill(GapFillNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitFill( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.FillNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitPreviousFill(PreviousFillNode node, C context) { - return visitFill(node, context); - } - - public R visitLinearFill(LinearFillNode node, C context) { - return visitFill(node, context); - } - - public R visitValueFill(ValueFillNode node, C context) { - return visitFill(node, context); - } - - public R visitSort( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitStreamSort( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitGroup(GroupNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitTopK( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode node, C context) { - return visitMultiChildProcess(node, context); - } - - public R visitTopKRanking( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode node, - C context) { - return visitSingleChildProcess(node, context); - } - - public R visitRowNumber(RowNumberNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitValuesNode(ValuesNode node, C context) { - return visitPlan(node, context); - } - - public R visitJoin( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode node, C context) { - return visitTwoChildProcess(node, context); - } - - public R visitSemiJoin(SemiJoinNode node, C context) { - return visitTwoChildProcess(node, context); - } - - public R visitGroupReference(GroupReference node, C context) { - return visitPlan(node, context); - } - - public R visitAggregation( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode node, - C context) { - return visitSingleChildProcess(node, context); - } - - public R visitTableExchange( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitAggregationTableScan( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode node, - C context) { - return visitDeviceTableScan(node, context); - } - - public R visitTreeDeviceViewScan(TreeDeviceViewScanNode node, C context) { - return visitDeviceTableScan(node, context); - } - - public R visitAggregationTreeDeviceViewScan(AggregationTreeDeviceViewScanNode node, C context) { - return visitAggregationTableScan(node, context); - } - - public R visitAlignedAggregationTreeDeviceViewScan( - AlignedAggregationTreeDeviceViewScanNode node, C context) { - return visitAggregationTreeDeviceViewScan(node, context); - } - - public R visitNonAlignedAggregationTreeDeviceViewScan( - NonAlignedAggregationTreeDeviceViewScanNode node, C context) { - return visitAggregationTreeDeviceViewScan(node, context); - } - - public R visitTreeAlignedDeviceViewScan(TreeAlignedDeviceViewScanNode node, C context) { - return visitTreeDeviceViewScan(node, context); - } - - public R visitTreeNonAlignedDeviceViewScan(TreeNonAlignedDeviceViewScanNode node, C context) { - return visitTreeDeviceViewScan(node, context); - } - - public R visitMarkDistinct(MarkDistinctNode node, C context) { - return visitSingleChildProcess(node, context); - } - - public R visitWindowFunction(WindowNode node, C context) { - return visitPlan(node, context); - } - - public R visitTableFunction(TableFunctionNode node, C context) { - return visitPlan(node, context); - } - - public R visitTableFunctionProcessor(TableFunctionProcessorNode node, C context) { - return visitPlan(node, context); - } - - public R visitPatternRecognition(PatternRecognitionNode node, C context) { - return visitPlan(node, context); - } - - public R visitUnion(UnionNode node, C context) { - return visitPlan(node, context); - } - - public R visitIntersect(IntersectNode node, C context) { - return visitPlan(node, context); - } - - public R visitExcept(ExceptNode node, C context) { - return visitPlan(node, context); - } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java index 43cbb20a40a45..1b2e25e38e3da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java index c8170a4880a08..a9f1a4a60dbaf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java @@ -25,9 +25,9 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.storageengine.dataregion.modification.ModificationFile; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java index ede0745193a0d..13f78b027f2fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.load; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java index 1488e354ef1bd..a67e77784b741 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.storageengine.load.splitter.TsFileData; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java index b53daca8f3d23..3207d4db06e1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.ProcessNode; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java index 9458461023072..7a764bd4a3c31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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 java.io.DataOutputStream; import java.io.IOException; @@ -60,8 +61,8 @@ public static PlanNode deserialize(ByteBuffer byteBuffer) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitCountMerge(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitCountMerge(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java index 357ca2b46d7d4..c9eae1accd0b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java @@ -22,11 +22,12 @@ 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.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeUtil; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; import java.io.IOException; @@ -95,7 +96,7 @@ public static DeviceSchemaFetchScanNode deserialize(ByteBuffer byteBuffer) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitDeviceSchemaFetchScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitDeviceSchemaFetchScan(this, 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 2bdce681e3faa..eed9eb16c0a08 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 @@ -24,8 +24,8 @@ 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.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.tsfile.utils.ReadWriteIOUtils; 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 d76e74d9d7adf..14082c0153a5a 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 @@ -25,8 +25,8 @@ 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.node_commons.plan.planner.plan.node.PlanNodeId; 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.tsfile.utils.ReadWriteIOUtils; 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 175a57ce85a5c..ed4abe8e08c7f 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 @@ -26,8 +26,8 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.template.Template; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.tsfile.utils.ReadWriteIOUtils; 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 78b8a26b664c3..0dcd00358196f 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 @@ -25,8 +25,8 @@ 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.node_commons.plan.planner.plan.node.PlanNodeId; 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.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java index 636d07b16f69a..f1b4093d3a119 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java @@ -21,10 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TSchemaNode; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.ProcessNode; import com.google.common.collect.ImmutableList; @@ -87,8 +88,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitNodeManagementMemoryMerge(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitNodeManagementMemoryMerge(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java index 4e5ae04a47776..31d2b1b6d027c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.ProcessNode; import com.google.common.collect.ImmutableList; @@ -75,8 +76,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitNodePathConvert(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitNodePathConvert(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java index a359d5e88a119..fc22ce3314508 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.ProcessNode; import com.google.common.collect.ImmutableList; @@ -75,8 +76,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitNodePathsCount(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitNodePathsCount(this, context); } @Override 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 04ce9356ea342..04e9d34b3e52f 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 @@ -24,8 +24,8 @@ 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.db.node_commons.plan.planner.plan.node.PlanNodeId; 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 java.io.DataOutputStream; 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 83627346a26ef..4b86d69a2019c 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 @@ -24,8 +24,8 @@ 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.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java index 000471f31e8e7..ea9cab58a7c8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.tsfile.utils.ReadWriteIOUtils; @@ -90,8 +91,8 @@ public static PlanNode deserialize(ByteBuffer byteBuffer) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitSchemaFetchMerge(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitSchemaFetchMerge(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java index d1eb46846825c..1c44b66b965f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java index 5249ff3adf9fa..3bf8b69e786b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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 java.io.DataOutputStream; import java.io.IOException; @@ -72,8 +73,8 @@ public static SchemaQueryMergeNode deserialize(ByteBuffer byteBuffer) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitSchemaQueryMerge(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitSchemaQueryMerge(this, context); } @Override 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 295ddc2d0a898..f3cd780b44bdd 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 @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.MultiChildProcessNode; import java.io.DataOutputStream; @@ -74,8 +75,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitSchemaQueryOrderByHeat(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitSchemaQueryOrderByHeat(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java index 49e90e44490e4..1ac8961a6188e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java @@ -23,10 +23,11 @@ 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.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeUtil; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import java.util.Collections; @@ -163,8 +164,8 @@ public String toString() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitSchemaQueryScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitSchemaQueryScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java index 931fe356b6f33..1c7341e5e62ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java @@ -23,11 +23,12 @@ import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.template.Template; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeUtil; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -154,8 +155,8 @@ public static SeriesSchemaFetchScanNode deserialize(ByteBuffer byteBuffer) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitSeriesSchemaFetchScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitSeriesSchemaFetchScan(this, context); } public boolean isWithTags() { 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 4891aa88825f4..597e0ca43a31d 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 @@ -25,8 +25,8 @@ 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.node_commons.plan.planner.plan.node.PlanNodeId; 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; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; 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 0e899fcd919ad..11ea4ea2a518c 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 @@ -27,8 +27,8 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.template.Template; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.tsfile.utils.ReadWriteIOUtils; 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 c91f01fd3ceb7..16599943a7063 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 @@ -26,8 +26,8 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.template.Template; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java index 1c54064c31ba4..7d01012f20362 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java @@ -22,11 +22,12 @@ 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.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.IActivateTemplateInClusterPlan; @@ -171,8 +172,8 @@ public List splitByPartition(IAnalysis analysis) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitActivateTemplate(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitActivateTemplate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java index 2e4c711483eaa..be0b91f727748 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java @@ -21,10 +21,11 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.utils.SerializeUtils; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; @@ -101,8 +102,8 @@ public List getOutputColumnNames() { } @Override - public R accept(final PlanVisitor visitor, final C context) { - return visitor.visitAlterEncodingCompressor(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((IQueryPlanVisitor) visitor).visitAlterEncodingCompressor(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java index 02783b76f0c6b..af811d4cb6fe8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java @@ -22,9 +22,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; @@ -294,8 +295,8 @@ public static AlterTimeSeriesNode deserialize(ByteBuffer byteBuffer) { } @Override - public R accept(final PlanVisitor visitor, final C schemaRegion) { - return visitor.visitAlterTimeSeries(this, schemaRegion); + public R accept(final IPlanVisitor visitor, final C schemaRegion) { + return ((PlanVisitor) visitor).visitAlterTimeSeries(this, schemaRegion); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java index 0d1d753085b9d..75c31259f41ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java @@ -22,11 +22,12 @@ 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.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; import org.apache.tsfile.utils.Pair; @@ -171,8 +172,8 @@ public List splitByPartition(IAnalysis analysis) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitBatchActivateTemplate(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitBatchActivateTemplate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java index 47438f89c0b9a..9b2794ab4d863 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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 java.io.DataOutputStream; import java.io.IOException; @@ -73,8 +74,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitConstructSchemaBlackList(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitConstructSchemaBlackList(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java index 6be75113a54a8..d894f5858ec06 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java @@ -22,10 +22,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; 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.WritePlanNode; @@ -193,8 +194,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C schemaRegion) { - return visitor.visitCreateAlignedTimeSeries(this, schemaRegion); + public R accept(IPlanVisitor visitor, C schemaRegion) { + return ((PlanVisitor) visitor).visitCreateAlignedTimeSeries(this, schemaRegion); } public static CreateAlignedTimeSeriesNode deserialize(ByteBuffer byteBuffer) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java index 5481792dceab7..74c086cd1c5b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java @@ -24,9 +24,10 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; @@ -160,8 +161,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C schemaRegion) { - return visitor.visitCreateMultiTimeSeries(this, schemaRegion); + public R accept(IPlanVisitor visitor, C schemaRegion) { + return ((PlanVisitor) visitor).visitCreateMultiTimeSeries(this, schemaRegion); } public static CreateMultiTimeSeriesNode deserialize(ByteBuffer byteBuffer) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java index 19e49ec4c0b81..1c3f47d70f9b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java @@ -22,11 +22,12 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.ICreateTimeSeriesPlan; @@ -349,8 +350,8 @@ protected void serializeAttributes(final DataOutputStream stream) throws IOExcep } @Override - public R accept(final PlanVisitor visitor, final C schemaRegion) { - return visitor.visitCreateTimeSeries(this, schemaRegion); + public R accept(final IPlanVisitor visitor, final C schemaRegion) { + return ((IQueryPlanVisitor) visitor).visitCreateTimeSeries(this, schemaRegion); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java index 3c160e4754a94..57919e233618a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java @@ -21,10 +21,11 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.schemaengine.schemaregion.write.req.IDeactivateTemplatePlan; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -76,8 +77,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitDeactivateTemplate(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitDeactivateTemplate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java index 234400fdec4d6..65155ae30e59d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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 java.io.DataOutputStream; import java.io.IOException; @@ -73,8 +74,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitDeleteTimeseries(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitDeleteTimeseries(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java index fd5bbbf14779e..d3a39f0d54449 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java @@ -22,11 +22,12 @@ 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.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; import org.apache.tsfile.utils.Pair; @@ -165,8 +166,8 @@ public List splitByPartition(IAnalysis analysis) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitInternalBatchActivateTemplate(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitInternalBatchActivateTemplate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java index 50689b72e3451..d2c025e1f6f0b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java @@ -22,11 +22,12 @@ 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.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; import org.apache.tsfile.utils.Pair; @@ -168,8 +169,8 @@ public List splitByPartition(IAnalysis analysis) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitInternalCreateMultiTimeSeries(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitInternalCreateMultiTimeSeries(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java index 76233e5934d10..61784102dca22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java @@ -22,11 +22,12 @@ 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.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; import com.google.common.collect.ImmutableList; @@ -106,8 +107,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitInternalCreateTimeSeries(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitInternalCreateTimeSeries(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java index f5610cd632cff..aa52922c21612 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java @@ -21,10 +21,11 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.schemaengine.schemaregion.write.req.IPreDeactivateTemplatePlan; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -76,8 +77,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitPreDeactivateTemplate(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitPreDeactivateTemplate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java index b1dbb3643233c..4ef336126da6e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java @@ -21,10 +21,11 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.schemaengine.schemaregion.write.req.IRollbackPreDeactivateTemplatePlan; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -78,8 +79,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitRollbackPreDeactivateTemplate(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitRollbackPreDeactivateTemplate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java index 3ca6a75cf662b..6012f3b1a35c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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 java.io.DataOutputStream; import java.io.IOException; @@ -73,8 +74,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitRollbackSchemaBlackList(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitRollbackSchemaBlackList(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java index ff3ddd3b8c396..5a71ec2eb7473 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java @@ -24,10 +24,11 @@ import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.tsfile.exception.NotImplementedException; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -92,8 +93,8 @@ private void collectAllSourcePaths(ViewExpression viewExpression, Set R accept(final PlanVisitor visitor, final C context) { - return visitor.visitAlterLogicalView(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((IQueryPlanVisitor) visitor).visitAlterLogicalView(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java index 3172e80547ccc..21fa8e716c129 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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 java.io.DataOutputStream; import java.io.IOException; @@ -73,8 +74,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitConstructLogicalViewBlackList(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitConstructLogicalViewBlackList(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java index ffdd63b29a408..82b1069bb9732 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java @@ -25,11 +25,12 @@ import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.GetSourcePathsVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.view.ICreateLogicalViewPlan; @@ -117,8 +118,8 @@ public void setViewPathToSourceExpressionMap( } @Override - public R accept(PlanVisitor visitor, C schemaRegion) { - return visitor.visitCreateLogicalView(this, schemaRegion); + public R accept(IPlanVisitor visitor, C schemaRegion) { + return ((IQueryPlanVisitor) visitor).visitCreateLogicalView(this, schemaRegion); } // endregion diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java index 1f955887cfb24..93cba9c023a90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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 java.io.DataOutputStream; import java.io.IOException; @@ -72,8 +73,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitDeleteLogicalView(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitDeleteLogicalView(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java index b5bb251910f36..d59bb85580f1e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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 java.io.DataOutputStream; import java.io.IOException; @@ -72,8 +73,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitRollbackLogicalViewBlackList(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitRollbackLogicalViewBlackList(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java index 11d70e0daa755..a3fb703e151dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java @@ -22,10 +22,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.db.consensus.statemachine.dataregion.DataExecutionVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; 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; 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.WritePlanNode; @@ -139,8 +140,8 @@ public List getOutputColumnNames() { } @Override - public R accept(final PlanVisitor visitor, final C context) { - return visitor.visitPipeEnrichedDeleteDataNode(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((PlanVisitor) visitor).visitPipeEnrichedDeleteDataNode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java index 2e517700217b7..d76f2c0de8c03 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java @@ -24,10 +24,11 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.consensus.statemachine.dataregion.DataExecutionVisitor; import org.apache.iotdb.db.exception.DataTypeInconsistentException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; 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; 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.WritePlanNode; @@ -132,8 +133,8 @@ public List getOutputColumnNames() { } @Override - public R accept(final PlanVisitor visitor, final C context) { - return visitor.visitPipeEnrichedInsertNode(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((PlanVisitor) visitor).visitPipeEnrichedInsertNode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java index 5d4c5eef5cd7e..26df8427d40de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java @@ -20,9 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe; import org.apache.iotdb.db.consensus.statemachine.schemaregion.SchemaExecutionVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; 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.metadata.write.ConstructSchemaBlackListNode; @@ -133,8 +134,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitPipeEnrichedNonWritePlanNode(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((PlanVisitor) visitor).visitPipeEnrichedNonWritePlanNode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java index e8ba967b26ea4..6dba1b9a2baa4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java @@ -21,10 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.consensus.statemachine.schemaregion.SchemaExecutionVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; 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; 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.WritePlanNode; @@ -148,8 +149,8 @@ public List getOutputColumnNames() { } @Override - public R accept(final PlanVisitor visitor, final C context) { - return visitor.visitPipeEnrichedWritePlanNode(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((PlanVisitor) visitor).visitPipeEnrichedWritePlanNode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java index 5674f264e229e..c0fd02aa37184 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningQueue; 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.schemaengine.schemaregion.SchemaRegion; @@ -79,8 +80,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitPipeOperateSchemaQueueNode(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((PlanVisitor) visitor).visitPipeOperateSchemaQueueNode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java index a01acf86db57f..32fbf5d03c821 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AI; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.model.ModelInferenceDescriptor; @@ -79,8 +80,8 @@ public boolean isGenerateTimeColumn() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitInference(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitInference(this, context); } @Override 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 745b847a10644..9886cb8ea20ff 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 @@ -21,10 +21,11 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.tsfile.utils.ReadWriteIOUtils; @@ -119,8 +120,8 @@ public String toString() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitRegionMerge(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitRegionMerge(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java index a5d73bd387513..aebd642528d8e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java @@ -19,11 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.parameter.OrderByParameter; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -109,8 +110,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitAggregationMergeSort(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitAggregationMergeSort(this, context); } @Override 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 c0d3afa11a33d..289436ab35b3c 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 @@ -20,11 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.SeriesAggregationSourceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByParameter; @@ -215,8 +216,8 @@ public static List findAggregationSourceNode(PlanNo } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitAggregation(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitAggregation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java index 19efc365e8329..29c1a3d233304 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.tsfile.utils.ReadWriteIOUtils; @@ -49,8 +50,8 @@ public CollectNode(PlanNodeId id, List children, List outputCo } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitCollect(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitCollect(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java index 6b3f2c1933ba9..1f938569d9b08 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.utils.columngenerator.parameter.ColumnGeneratorParameter; import org.apache.tsfile.enums.TSDataType; @@ -58,8 +59,8 @@ public ColumnInjectNode( } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitColumnInject(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitColumnInject(this, context); } public List getGeneratedColumnTypes() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java index 799708d859bdb..8671011ab7698 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.parameter.OrderByParameter; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -85,8 +86,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitDeviceMerge(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitDeviceMerge(this, context); } @Override 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 db0914d487ffb..c8c074f6a0e65 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 @@ -21,10 +21,11 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.parameter.DeviceViewIntoPathDescriptor; import java.io.DataOutputStream; @@ -91,8 +92,8 @@ public static DeviceViewIntoNode deserialize(ByteBuffer byteBuffer) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitDeviceViewInto(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitDeviceViewInto(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java index cb37b596bbb1f..3af3979aca908 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java @@ -19,11 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; 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.parameter.OrderByParameter; import org.apache.tsfile.file.metadata.IDeviceID; @@ -128,8 +129,8 @@ public void setOutputColumnNames(List outputColumnNames) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitDeviceView(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitDeviceView(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java index cbcb329b94e1e..3da6e7a2c5bc4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java @@ -20,11 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.common.rpc.thrift.TEndPoint; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; 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.planner.Symbol; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -64,8 +65,8 @@ public int allowedChildCount() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitExchange(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitExchange(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java index 2e5cc0239dcf5..80867fbb76038 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.parameter.FillDescriptor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -71,8 +72,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitFill(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java index 8b3ed9ee5557f..8ec4ccf02d729 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java @@ -19,12 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; 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; 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.statement.component.Ordering; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -69,8 +70,8 @@ public FilterNode( } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitFilter(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitFilter(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java index ddfaed455a74d..0088937144779 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.CrossSeriesAggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; @@ -125,8 +126,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitGroupByLevel(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitGroupByLevel(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java index 50b64e029c0bf..c84a948e68cec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.parameter.CrossSeriesAggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -119,8 +120,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitGroupByTag(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitGroupByTag(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java index 71203c1971270..0e930dca0a363 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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 java.io.DataOutputStream; import java.io.IOException; @@ -73,8 +74,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitHorizontallyConcat(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitHorizontallyConcat(this, context); } @Override 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 d6f86d528c889..59686c94bcac6 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 @@ -21,10 +21,11 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.parameter.IntoPathDescriptor; import java.io.DataOutputStream; @@ -88,8 +89,8 @@ public static IntoNode deserialize(ByteBuffer byteBuffer) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitInto(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitInto(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java index dd0ba198d5b48..7159b7953ab4c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.tsfile.utils.ReadWriteIOUtils; @@ -67,8 +68,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitLimit(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitLimit(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java index bcc54344a3519..b577bea0fbdcc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java @@ -18,10 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.parameter.OrderByParameter; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -85,8 +86,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitMergeSort(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitMergeSort(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MultiChildProcessNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MultiChildProcessNode.java index b3bd064c910b3..715eca2414d88 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MultiChildProcessNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MultiChildProcessNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java index e88608578dee5..6fe66a3239bfb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java @@ -18,10 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.tsfile.utils.ReadWriteIOUtils; @@ -65,8 +66,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitOffset(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitOffset(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProcessNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProcessNode.java index 8b3dcd41e07b5..af4a39cd1161c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProcessNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProcessNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; public abstract class ProcessNode extends PlanNode { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java index 2f13ea6d6de32..0b981bc222f67 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java @@ -19,11 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; 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.tsfile.utils.ReadWriteIOUtils; @@ -68,8 +69,8 @@ public void setOutputColumnNames(List outputColumnNames) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitProject(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitProject(this, context); } @Override 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 6f5dbac423d7a..701d58402e453 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 @@ -20,11 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; @@ -209,8 +210,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitRawDataAggregation(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitRawDataAggregation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleChildProcessNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleChildProcessNode.java index c84e2ef6457a4..989630849926e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleChildProcessNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleChildProcessNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java index f43679f68bfc3..fec55aca123bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java @@ -18,11 +18,12 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; 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.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -107,8 +108,8 @@ public List getDeviceToMeasurementIndexes() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitSingleDeviceView(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitSingleDeviceView(this, context); } @Override 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 cffd814eedc47..3ac458cd4c6a2 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 @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -130,8 +131,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitSlidingWindowAggregation(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitSlidingWindowAggregation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java index 327251b7247cd..03620d849b107 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.parameter.OrderByParameter; import com.google.common.base.Objects; @@ -66,8 +67,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitSort(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitSort(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java index 27b7d34cea32b..50773d725ff8b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.parameter.OrderByParameter; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -99,8 +100,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitTopK(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitTopK(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java index 2ca198dd2b8e2..e1f9882cea0b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java @@ -19,11 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.statement.component.Ordering; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -77,8 +78,8 @@ public final List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitTransform(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitTransform(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java index c70f88552271f..149e8024933ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java index f692e0867ff12..57e87eadd7af7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -96,8 +97,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitFullOuterTimeJoin(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitFullOuterTimeJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java index ef98496b89ce3..f9376e2f99f6e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -131,8 +132,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitInnerTimeJoin(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitInnerTimeJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java index 766a0f7fd81e2..33e5fcd9eafa7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -87,8 +88,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitLeftOuterTimeJoin(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitLeftOuterTimeJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java index ef40d6cfd17c9..9e3b37f1c105d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java @@ -18,10 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.MultiChildProcessNode; import java.io.DataOutputStream; @@ -91,8 +92,8 @@ public int hashCode() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitLastQueryCollect(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitLastQueryCollect(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java index 7a7cfabff6aac..3445a722b133b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java @@ -18,10 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -108,8 +109,8 @@ public int hashCode() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitLastQueryMerge(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitLastQueryMerge(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java index e6a71dc197bde..823accca982dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java @@ -20,10 +20,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.LastQueryScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; @@ -197,8 +198,8 @@ public int hashCode() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitLastQuery(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitLastQuery(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java index 53f85d520a1c1..fe5c0a7a58208 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -90,8 +91,8 @@ public static LastQueryTransformNode deserialize(ByteBuffer byteBuffer) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitLastQueryTransform(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitLastQueryTransform(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java index 46e7ae5aa6bed..224a7c94b5d87 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java @@ -19,11 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; 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.tsfile.utils.ReadWriteIOUtils; @@ -71,8 +72,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitIdentitySink(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitIdentitySink(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/MultiChildrenSinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/MultiChildrenSinkNode.java index b6d93596e8005..06e70a7a2023a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/MultiChildrenSinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/MultiChildrenSinkNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java index ec32f13b37837..93bd736112337 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java @@ -19,11 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; 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.tsfile.utils.ReadWriteIOUtils; @@ -70,8 +71,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitShuffleSink(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitShuffleSink(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/SinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/SinkNode.java index a277daca7557c..fe6818ab8725f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/SinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/SinkNode.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; public abstract class SinkNode extends PlanNode implements AutoCloseable { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java index d81ca0c92bd57..47a7a095d7591 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java @@ -23,14 +23,15 @@ import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; @@ -193,8 +194,8 @@ public PlanNode clone() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitAlignedSeriesAggregationScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitAlignedSeriesAggregationScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java index 2799452eabdfe..6c7b3ce504720 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java @@ -23,14 +23,15 @@ import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.tsfile.common.constant.TsFileConstant; @@ -139,8 +140,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitAlignedSeriesScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitAlignedSeriesScan(this, context); } @Override 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 5d876fcfce2f9..f40a4762bb7bd 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 @@ -24,12 +24,13 @@ 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.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DeviceContext; 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.PlanNodeUtil; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -91,8 +92,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitDeviceRegionScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitDeviceRegionScan(this, context); } @Override 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 150509120eb10..fa69d8386406c 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 @@ -23,12 +23,13 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; import org.apache.tsfile.enums.TSDataType; @@ -245,8 +246,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitLastQueryScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitLastQueryScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java index fc54cd2f09ace..9d2acee670b32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java index 9a48e16ff660d..c302e12211d73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java @@ -21,8 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import java.util.Objects; import java.util.Set; @@ -85,8 +86,8 @@ public boolean equals(Object o) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitRegionScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitRegionScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java index 54a186b98ce57..7974aea91a191 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java @@ -22,13 +22,14 @@ 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.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; @@ -183,8 +184,8 @@ public void setRegionReplicaSet(TRegionReplicaSet regionReplicaSet) { public void close() throws Exception {} @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitSeriesAggregationScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitSeriesAggregationScan(this, context); } @Override 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 aaf2f989b5b97..846a68df1bbaf 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 @@ -20,9 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -113,8 +114,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitSeriesAggregationSourceNode(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitSeriesAggregationSourceNode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java index 587d1ac248c42..506b8b16657c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java @@ -22,13 +22,14 @@ 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.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import com.google.common.collect.ImmutableList; @@ -118,8 +119,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitSeriesScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitSeriesScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java index e7498db297fef..f2f5ffa0f243e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import com.google.common.collect.ImmutableList; @@ -159,8 +160,8 @@ public void addChild(PlanNode child) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitSeriesScanSource(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitSeriesScanSource(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java index c2e052e76b7d3..a6368fedca1d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java index 18a0e3687e065..1f7ee81e63c07 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java @@ -23,11 +23,12 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -139,8 +140,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitShowDiskUsage(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitShowDiskUsage(this, context); } // We only use DataNodeLocation when do distributionPlan, so DataNodeLocation is no need to 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 1eaf122c773fd..99e9f34982dba 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 @@ -20,10 +20,11 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.schema.column.ColumnHeader; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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 com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -86,8 +87,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitShowQueries(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitShowQueries(this, context); } // We only use DataNodeLocation when do distributionPlan, so DataNodeLocation is no need to diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SourceNode.java index bf930d1d63b5e..3df3455ff925e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SourceNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.IPartitionRelatedNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; public abstract class SourceNode extends PlanNode implements AutoCloseable, IPartitionRelatedNode { protected SourceNode() {} 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 5ab4fbc82d804..4c603c888cb1a 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 @@ -27,11 +27,12 @@ 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.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; 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 com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -112,8 +113,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitTimeSeriesRegionScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitTimeSeriesRegionScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/VirtualSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/VirtualSourceNode.java index 417876b700cb9..d361b3b2d52b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/VirtualSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/VirtualSourceNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; public abstract class VirtualSourceNode extends PlanNode { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java index ff08fbd8dbd44..4ca0acdb65cd5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.storageengine.dataregion.wal.buffer.WALEntryValue; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java index f34c4ab262e4c..9c1da34259d3f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.IWALByteBufferView; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java index cfba72d66db62..65822319b0cd1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java @@ -28,12 +28,13 @@ 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.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.schematree.DeviceSchemaInfo; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; 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; 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.WritePlanNode; @@ -261,8 +262,8 @@ protected void serializeAttributes(DataOutputStream stream) throws IOException { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitDeleteData(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((PlanVisitor) visitor).visitDeleteData(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java index b41d178b396c6..5755540d9f020 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java @@ -23,9 +23,10 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; @@ -281,8 +282,8 @@ public int hashCode() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitInsertMultiTablets(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((PlanVisitor) visitor).visitInsertMultiTablets(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java index 88a6faa004745..2c78012b2018d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java @@ -28,10 +28,10 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataTypeInconsistentException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; 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.storageengine.dataregion.memtable.AbstractMemTable; import org.apache.iotdb.db.storageengine.dataregion.memtable.DeviceIDFactory; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.IWALByteBufferView; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java index a2bd6cb1a00fc..51b03c5461582 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java @@ -25,9 +25,10 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; @@ -898,8 +899,8 @@ public int hashCode() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitInsertRow(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((PlanVisitor) visitor).visitInsertRow(this, context); } public TimeValuePair composeTimeValuePair(int columnIndex) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java index 7392b7612705e..449ad782fe9a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java @@ -26,9 +26,10 @@ import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; @@ -297,8 +298,8 @@ public List splitByPartition(IAnalysis analysis) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitInsertRows(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((PlanVisitor) visitor).visitInsertRows(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java index f1e28d32b104d..f7c6be0b11672 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java @@ -27,10 +27,11 @@ import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; 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.WritePlanNode; @@ -332,8 +333,8 @@ public int hashCode() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitInsertRowsOfOneDevice(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((PlanVisitor) visitor).visitInsertRowsOfOneDevice(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java index 39683e5d9f94e..ca914359110e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java @@ -29,9 +29,10 @@ import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.exception.query.OutOfTTLException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; @@ -1168,8 +1169,8 @@ private boolean equals(Object[] columns) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitInsertTablet(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((PlanVisitor) visitor).visitInsertTablet(this, context); } public TimeValuePair composeLastTimeValuePair( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java index 5becf59799e08..4807014efb809 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java @@ -23,9 +23,10 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.exception.ObjectFileNotExist; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; @@ -325,7 +326,7 @@ public boolean isGeneratedByRemoteConsensusLeader() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitWriteObjectFile(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((PlanVisitor) visitor).visitWriteObjectFile(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java index 632d7c9ee1e0a..639537b2f33cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java @@ -23,9 +23,10 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.ProgressIndexType; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; @@ -254,8 +255,8 @@ protected void serializeAttributes(DataOutputStream stream) throws IOException { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitDeleteData(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((PlanVisitor) visitor).visitDeleteData(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java index 08c783287328c..00f47ca578082 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java @@ -23,7 +23,8 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.DataTypeInconsistentException; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.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.fetcher.cache.TableDeviceSchemaCache; @@ -104,8 +105,8 @@ public IDeviceID getDeviceID() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitRelationalInsertRow(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((PlanVisitor) visitor).visitRelationalInsertRow(this, context); } public static RelationalInsertRowNode deserialize(ByteBuffer byteBuffer) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java index 594ccf50471f9..8907d9a45bbb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java @@ -23,8 +23,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; @@ -75,8 +76,8 @@ public IDeviceID getDeviceID(int rowIdx) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitRelationalInsertRows(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((PlanVisitor) visitor).visitRelationalInsertRows(this, context); } public static RelationalInsertRowsNode deserialize(ByteBuffer byteBuffer) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java index 257f691e4a785..32e8edca317f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java @@ -27,8 +27,9 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.exception.query.OutOfTTLException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; @@ -171,8 +172,8 @@ public IDeviceID getDeviceID(int rowIdx) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitRelationalInsertTablet(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((PlanVisitor) visitor).visitRelationalInsertTablet(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/SearchNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/SearchNode.java index d506d1414e15e..6c4ef34f5c5e8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/SearchNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/SearchNode.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.consensus.index.ComparableConsensusRequest; import org.apache.iotdb.consensus.iot.log.ConsensusReqReader; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java index ac30dcf505afd..40ad0aab985c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java @@ -37,13 +37,10 @@ import java.util.Objects; import java.util.stream.Collectors; -import static org.apache.iotdb.commons.conf.IoTDBConstant.LAST_VALUE; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.addPartialSuffix; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.isBuiltinAggregationName; -import static org.apache.iotdb.db.utils.constant.SqlConstant.AVG; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_VALUE; import static org.apache.iotdb.db.utils.constant.SqlConstant.STDDEV; -import static org.apache.iotdb.db.utils.constant.SqlConstant.TIME_DURATION; public class AggregationDescriptor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/SubPlanGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/SubPlanGenerator.java index d9649714db5af..f2ba537c3ff7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/SubPlanGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/SubPlanGenerator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; 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.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.MultiChildrenSinkNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; 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 79ea52597bcee..700b43152cab2 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 @@ -33,6 +33,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TRegionInfo; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; import org.apache.iotdb.db.queryengine.plan.planner.exceptions.RootFIPlacementException; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; 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 ff7686fe86891..14de7596ab4c8 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; 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.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; 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/planner/distribute/TableModelQueryFragmentPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelQueryFragmentPlanner.java index 6ad998a5a5335..bbd06800d58e0 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; 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.sink.MultiChildrenSinkNode; 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/planner/iterative/GroupReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java index e9b649036fe1c..d84f87cdfa338 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; @@ -71,8 +72,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitGroupReference(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitGroupReference(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java index 20d8d2e33b4f0..de20151cfff04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; 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.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.PlanOptimizersStatsCollector; import org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.QueryPlanOptimizerStatistics; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationNode.java index 59bc3df472f4a..4324733d55523 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationNode.java @@ -19,12 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionType; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; @@ -218,8 +219,8 @@ public boolean hasOrderings() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitAggregation(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitAggregation(this, context); } @Override 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 56d39f2f77dcb..7e39790340a84 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 @@ -20,9 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.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.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; @@ -282,8 +283,8 @@ public AggregationTableScanNode clone() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitAggregationTableScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitAggregationTableScan(this, context); } public static AggregationTableScanNode combineAggregationAndTableScan( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java index 1635f2d7345b4..570b23654b38c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; @@ -102,8 +103,8 @@ public Map getMeasurementColumnNameMap() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitAggregationTreeDeviceViewScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitAggregationTreeDeviceViewScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java index f1758f2de8b3b..3c28cde337ac2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; @@ -86,8 +87,9 @@ public AlignedAggregationTreeDeviceViewScanNode( private AlignedAggregationTreeDeviceViewScanNode() {} @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitAlignedAggregationTreeDeviceViewScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor) + .visitAlignedAggregationTreeDeviceViewScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java index 5a9c5817eaefa..52edc0d4d90fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; @@ -117,8 +118,8 @@ public List getOutputSymbols() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitApply(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitApply(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AssignUniqueId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AssignUniqueId.java index 3528d8d364902..c3a7a28d4317c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AssignUniqueId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AssignUniqueId.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -47,8 +48,8 @@ public AssignUniqueId(PlanNodeId id, PlanNode child, Symbol idColumn) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitAssignUniqueId(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitAssignUniqueId(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CollectNode.java index 07887397b389c..04df2d8ee8d47 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CollectNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -56,8 +57,8 @@ public CollectNode(PlanNodeId id, List children, List outputSy } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitCollect(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitCollect(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java index cb04e0d410a3c..e28880181718e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java @@ -19,11 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -90,8 +91,8 @@ public PlanNode clone() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitCopyTo(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitCopyTo(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java index bbee7e5d68fe3..e367dd1c314dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; @@ -138,8 +139,8 @@ public PlanNode replaceChildren(List newChildren) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitCorrelatedJoin(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitCorrelatedJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java index 48eb58c980d01..1c094f34837e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java @@ -22,10 +22,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; @@ -67,8 +68,8 @@ public CteDataStore getDataStore() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitCteScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitCteScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java index b91737739351a..02452900f9f6b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.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.AlignedDeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; @@ -121,8 +122,8 @@ public DeviceTableScanNode( } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitDeviceTableScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitDeviceTableScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/EnforceSingleRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/EnforceSingleRowNode.java index 734f6c1a2323b..6900c5b477af3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/EnforceSingleRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/EnforceSingleRowNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -49,8 +50,8 @@ public PlanNode getSource() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitEnforceSingleRow(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitEnforceSingleRow(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java index 9eb1df4769688..611aa8bf1bc37 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ListMultimap; @@ -56,8 +57,8 @@ private ExceptNode( } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitExcept(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitExcept(this, context); } public boolean isDistinct() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java index bb34978faf51d..6a2adbe7d82db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java @@ -20,11 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TEndPoint; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -63,8 +64,8 @@ public int allowedChildCount() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitTableExchange(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitTableExchange(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java index 23aa8baad2dfd..07c9bffdba207 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -62,8 +63,8 @@ public PlanNode clone() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitExplainAnalyze(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitExplainAnalyze(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FillNode.java index ac5b578373ba7..b310c2b15e753 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FillNode.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -34,8 +35,8 @@ protected FillNode(PlanNodeId id, PlanNode child) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitFill(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FilterNode.java index 812979ed239bb..739fd66a4c8b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FilterNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; @@ -44,8 +45,8 @@ public FilterNode(PlanNodeId id, PlanNode child, Expression predicate) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitFilter(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitFilter(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GapFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GapFillNode.java index 26cd2252b0200..d64a09629280b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GapFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GapFillNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -100,8 +101,8 @@ public long getNonMonthDuration() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitGapFill(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitGapFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GroupNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GroupNode.java index 83b034ac7bf91..90139fd69ac25 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GroupNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GroupNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.planner.OrderingScheme; import com.google.common.collect.Iterables; @@ -67,8 +68,8 @@ public int getPartitionKeyCount() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitGroup(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitGroup(this, context); } @Override 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 index cca7dd4df0f7a..267c5f04f2adf 100644 --- 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 @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; @@ -84,8 +85,8 @@ public InformationSchemaTableScanNode( protected InformationSchemaTableScanNode() {} @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitInformationSchemaTableScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitInformationSchemaTableScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java index 3f7a086497180..9321368aef360 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ListMultimap; @@ -55,8 +56,8 @@ private IntersectNode( } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitIntersect(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitIntersect(this, context); } public boolean isDistinct() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java index 3386fc4d9b1ed..7a8562625651f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -68,8 +69,8 @@ public IntoNode( } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitInto(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitInto(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/JoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/JoinNode.java index 5e6cc5818acc1..5d4da802549d6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/JoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/JoinNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; @@ -174,8 +175,8 @@ public JoinNode flip() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitJoin(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LimitNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LimitNode.java index 70f1eb4921bef..dd928b2a21b35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LimitNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LimitNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -71,8 +72,8 @@ public PlanNode clone() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitLimit(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitLimit(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LinearFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LinearFillNode.java index 87824a63e3cb0..512241df8026a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LinearFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LinearFillNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.planner.Symbol; import com.google.common.collect.Iterables; @@ -64,8 +65,8 @@ public PlanNode clone() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitLinearFill(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitLinearFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MarkDistinctNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MarkDistinctNode.java index e8d13ae3a1680..218af8473ee0d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MarkDistinctNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MarkDistinctNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -97,8 +98,8 @@ public Optional getHashSymbol() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitMarkDistinct(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitMarkDistinct(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MergeSortNode.java index 7fb3fe3667867..905f757d41b80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MergeSortNode.java @@ -18,10 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -64,8 +65,8 @@ public PlanNode clone() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitMergeSort(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitMergeSort(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java index 8380f56164d93..91d09c8982185 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; @@ -86,8 +87,9 @@ public NonAlignedAggregationTreeDeviceViewScanNode( private NonAlignedAggregationTreeDeviceViewScanNode() {} @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitNonAlignedAggregationTreeDeviceViewScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor) + .visitNonAlignedAggregationTreeDeviceViewScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java index 90cf1541e58d0..d8cb4041109f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -54,8 +55,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitOffset(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitOffset(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java index d9d166e711696..6ebfb67f49a7a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -68,8 +69,8 @@ public OutputNode(PlanNodeId id, List columnNames, List outputSy } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitOutput(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitOutput(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PatternRecognitionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PatternRecognitionNode.java index 45650fec203c3..b66f0700510a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PatternRecognitionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PatternRecognitionNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -139,8 +140,8 @@ public Map getVariableDefinitions() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitPatternRecognition(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitPatternRecognition(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PreviousFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PreviousFillNode.java index db43f070cfff2..4496e7ea7f59a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PreviousFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PreviousFillNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.planner.Symbol; import com.google.common.collect.Iterables; @@ -77,8 +78,8 @@ public PlanNode clone() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitPreviousFill(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitPreviousFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java index b6ad4dc751a82..764d3b0096b7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -47,8 +48,8 @@ public ProjectNode(PlanNodeId id, PlanNode child, Assignments assignments) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitProject(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitProject(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/RowNumberNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/RowNumberNode.java index af5a95a2f2de9..26f67c3203b44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/RowNumberNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/RowNumberNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -99,8 +100,8 @@ public PlanNode clone() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitRowNumber(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitRowNumber(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SemiJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SemiJoinNode.java index bb8b85752d59e..33eb0120171bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SemiJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SemiJoinNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -97,8 +98,8 @@ public List getOutputSymbols() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitSemiJoin(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitSemiJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java index 6f399c1bedcc6..b4c7cd09c2265 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SortNode.java index 1cfa62e71c776..06d4a258d9987 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SortNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -65,8 +66,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitSort(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitSort(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/StreamSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/StreamSortNode.java index 1a60acf236c68..63891645cb0ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/StreamSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/StreamSortNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.planner.OrderingScheme; import com.google.common.base.Objects; @@ -67,8 +68,8 @@ public PlanNode replaceChildren(List newChildren) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitStreamSort(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitStreamSort(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java index a135da76c62b5..340787f0a19fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.relational.metadata.ColumnSchema; 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/planner/node/TableFunctionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionNode.java index a4db3d68d2ff1..d6778840b5966 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; @@ -242,8 +243,8 @@ public static TableFunctionNode deserialize(ByteBuffer byteBuffer) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitTableFunction(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitTableFunction(this, context); } public static class TableArgumentProperties { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionProcessorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionProcessorNode.java index 2ffb128b66be7..fb2903094d13f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionProcessorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionProcessorNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; @@ -182,8 +183,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitTableFunctionProcessor(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitTableFunctionProcessor(this, context); } @Override 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 11807d9ceb499..72dd47ff4e8df 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 @@ -21,10 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.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.Metadata; @@ -106,8 +107,8 @@ public TableScanNode( protected TableScanNode() {} @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitTableScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitTableScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKNode.java index 20d17cf3c0cc6..7796bb9525176 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -81,8 +82,8 @@ public PlanNode clone() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitTopK(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitTopK(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKRankingNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKRankingNode.java index fedb7e1f2e172..809b0fc344d01 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKRankingNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKRankingNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -95,8 +96,8 @@ public PlanNode clone() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitTopKRanking(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitTopKRanking(this, context); } public DataOrganizationSpecification getSpecification() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java index 8347a602c4dfd..71b5f5377687a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; @@ -74,8 +75,8 @@ public TreeAlignedDeviceViewScanNode( public TreeAlignedDeviceViewScanNode() {} @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitTreeAlignedDeviceViewScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitTreeAlignedDeviceViewScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java index bd93310980765..f7707bac08811 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.QualifiedObjectName; @@ -104,8 +105,8 @@ public Map getMeasurementColumnNameMap() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitTreeDeviceViewScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitTreeDeviceViewScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java index d1c1063592b78..f7f8eef9b33c9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; @@ -74,8 +75,8 @@ public TreeNonAlignedDeviceViewScanNode( public TreeNonAlignedDeviceViewScanNode() {} @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitTreeNonAlignedDeviceViewScan(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitTreeNonAlignedDeviceViewScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/UnionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/UnionNode.java index 4332542374c5d..a639affcda44e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/UnionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/UnionNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.planner.Symbol; import com.google.common.collect.ImmutableListMultimap; @@ -60,8 +61,8 @@ public List getOutputColumnNames() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitUnion(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitUnion(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValueFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValueFillNode.java index 0f987322e7994..e989db00f9b3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValueFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValueFillNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; @@ -52,8 +53,8 @@ public PlanNode clone() { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitValueFill(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitValueFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValuesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValuesNode.java index cb5c28ea02aaf..5e8bdc7495338 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValuesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValuesNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; @@ -115,8 +116,8 @@ public ValuesNode( } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitValuesNode(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitValuesNode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/WindowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/WindowNode.java index 02a77920c3056..752c8eb84bb70 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/WindowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/WindowNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; @@ -153,8 +154,8 @@ public PlanNode replaceChildren(List newChildren) { } @Override - public R accept(PlanVisitor visitor, C context) { - return visitor.visitWindowFunction(this, context); + public R accept(IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitWindowFunction(this, context); } @Override 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 a66939efe89f8..129b46fd3b895 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 @@ -22,8 +22,8 @@ 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.node_commons.plan.planner.plan.node.PlanNodeId; 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; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.schemaengine.schemaregion.attribute.update.DeviceAttributeCacheUpdater; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java index 95e7cf2c9e135..9384b16f2d770 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java index 761bc2bb1fdae..e486c8f3158eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; @@ -88,8 +89,8 @@ protected void serializeAttributes(final DataOutputStream stream) throws IOExcep } @Override - public R accept(final PlanVisitor visitor, final C context) { - return visitor.visitConstructTableDevicesBlackList(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((IQueryPlanVisitor) visitor).visitConstructTableDevicesBlackList(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java index be4b1337e7e4c..ece90a7598632 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java @@ -20,11 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; 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.WritePlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; @@ -288,8 +289,8 @@ public List splitByPartition(final IAnalysis analysis) { } @Override - public R accept(final PlanVisitor visitor, C context) { - return visitor.visitCreateOrUpdateTableDevice(this, context); + public R accept(final IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitCreateOrUpdateTableDevice(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java index 5cfccb784e638..1b29644b0cdef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.schemaengine.schemaregion.ISchemaRegionPlan; @@ -98,8 +99,8 @@ public static DeleteTableDeviceNode deserialize(final ByteBuffer buffer) { } @Override - public R accept(final PlanVisitor visitor, final C context) { - return visitor.visitDeleteTableDevice(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((PlanVisitor) visitor).visitDeleteTableDevice(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java index 5b51af4af1606..cc283a17cd91b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; @@ -60,8 +61,8 @@ public static DeleteTableDevicesInBlackListNode deserialize(final ByteBuffer buf } @Override - public R accept(final PlanVisitor visitor, final C context) { - return visitor.visitDeleteTableDevicesInBlackList(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((IQueryPlanVisitor) visitor).visitDeleteTableDevicesInBlackList(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java index b643e9b81e051..257dbee5972c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; @@ -60,8 +61,8 @@ public static RollbackTableDevicesBlackListNode deserialize(final ByteBuffer buf } @Override - public R accept(final PlanVisitor visitor, final C context) { - return visitor.visitRollbackTableDevicesBlackList(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((IQueryPlanVisitor) visitor).visitRollbackTableDevicesBlackList(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java index 02780bc2f40ea..80e1254591ab3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; @@ -108,8 +109,8 @@ public static TableAttributeColumnDropNode deserialize(final ByteBuffer buffer) } @Override - public R accept(final PlanVisitor visitor, final C context) { - return visitor.visitTableAttributeColumnDrop(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((IQueryPlanVisitor) visitor).visitTableAttributeColumnDrop(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java index 430d2a99695b8..9459efc765cd1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; @@ -111,8 +112,8 @@ public List getOutputColumnNames() { } @Override - public R accept(final PlanVisitor visitor, final C context) { - return visitor.visitTableDeviceAttributeCommit(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((IQueryPlanVisitor) visitor).visitTableDeviceAttributeCommit(this, context); } @Override 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 c0105337d87cf..65aa1db648a22 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 @@ -22,12 +22,13 @@ 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.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.SessionInfo; 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; 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.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; @@ -120,8 +121,8 @@ public SessionInfo getSessionInfo() { } @Override - public R accept(final PlanVisitor visitor, final C context) { - return visitor.visitTableDeviceAttributeUpdate(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((IQueryPlanVisitor) visitor).visitTableDeviceAttributeUpdate(this, context); } @Override 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 59c65782e4ed9..3d40afdcb57f9 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 @@ -21,10 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.schema.column.ColumnHeader; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.metadata.read.TableDeviceSourceNode; import org.apache.iotdb.db.schemaengine.schemaregion.attribute.update.DeviceAttributeCacheUpdater; @@ -174,8 +175,8 @@ public static TableDeviceFetchNode deserialize(final ByteBuffer buffer) { } @Override - public R accept(final PlanVisitor visitor, C context) { - return visitor.visitTableDeviceFetch(this, context); + public R accept(final IPlanVisitor visitor, C context) { + return ((IQueryPlanVisitor) visitor).visitTableDeviceFetch(this, context); } @Override 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 0952b6a0f297c..1659517a9ed84 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 @@ -22,10 +22,11 @@ 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.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.sql.ast.Expression; import java.nio.ByteBuffer; @@ -59,8 +60,8 @@ public List getOutputColumnNames() { } @Override - public R accept(final PlanVisitor visitor, final C context) { - return visitor.visitTableDeviceQueryCount(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((IQueryPlanVisitor) visitor).visitTableDeviceQueryCount(this, context); } @Override 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 f5b19bbf27666..fbb05c772f134 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 @@ -22,10 +22,11 @@ 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.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.sql.ast.Expression; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -73,8 +74,8 @@ public boolean isNeedAligned() { } @Override - public R accept(final PlanVisitor visitor, final C context) { - return visitor.visitTableDeviceQueryScan(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((IQueryPlanVisitor) visitor).visitTableDeviceQueryScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java index 23481d498661d..49e22fab60832 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; @@ -75,8 +76,8 @@ public List getOutputColumnNames() { } @Override - public R accept(final PlanVisitor visitor, final C context) { - return visitor.visitTableNodeLocationAdd(this, context); + public R accept(final IPlanVisitor visitor, final C context) { + return ((IQueryPlanVisitor) visitor).visitTableNodeLocationAdd(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableSchemaQueryWriteVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableSchemaQueryWriteVisitor.java index c2ff3820cbad3..fbe5a1ffc2efc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableSchemaQueryWriteVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableSchemaQueryWriteVisitor.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.commons.consensus.ConsensusGroupId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.executor.RegionExecutionResult; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TableDeviceSourceNode; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/AdaptivePlanOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/AdaptivePlanOptimizer.java index 1cbe076077e64..efe9ec0018b4a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/AdaptivePlanOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/AdaptivePlanOptimizer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java index 4011370adc7b1..22bf7a65c9215 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java index 002e59f124c9f..125f5e988529d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java index ac2f640087354..2446b9841be5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java @@ -99,7 +99,6 @@ import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_PRECEDING; import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.ReservedIdentifiers.reserved; import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.SqlFormatter.formatName; import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.SqlFormatter.formatSql; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/update/GeneralRegionAttributeSecurityService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/update/GeneralRegionAttributeSecurityService.java index 408cc1215900c..58a688e35c29f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/update/GeneralRegionAttributeSecurityService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/update/GeneralRegionAttributeSecurityService.java @@ -36,13 +36,13 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.db.protocol.client.dn.DnToDnInternalServiceAsyncRequestManager; import org.apache.iotdb.db.protocol.client.dn.DnToDnRequestType; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeCommitUpdateNode; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; import org.apache.iotdb.db.schemaengine.schemaregion.impl.SchemaRegionMemoryImpl; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java index eb37cb1d5d21b..9e23f3c6970d4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java @@ -64,6 +64,7 @@ import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.quota.ExceedQuotaException; import org.apache.iotdb.db.exception.runtime.TableLostRuntimeException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource.Status; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResourceManager; @@ -77,7 +78,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.metric.QueryResourceMetricSet; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.ContinuousSameSearchIndexSeparatorNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertMultiTabletsNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachineTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachineTest.java index 7a77eada418ce..0b3a44008935f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachineTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachineTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; 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 aaed795151859..666f8010ab849 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 @@ -30,9 +30,9 @@ import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.SessionInfo; 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; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionTestUtil.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionTestUtil.java index 8a24133d4531f..921093c37e4d3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionTestUtil.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionTestUtil.java @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilterFactory; import org.apache.iotdb.commons.schema.filter.impl.DeviceFilterUtil; import org.apache.iotdb.commons.schema.template.Template; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; 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/test/java/org/apache/iotdb/db/pipe/consensus/DeletionRecoverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionRecoverTest.java index b69f2d85ef750..b0f0572667ccc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionRecoverTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionRecoverTest.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResourceManager; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.AbstractDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionResourceTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionResourceTest.java index 8b4ace5ec2210..372400b897bcb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionResourceTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionResourceTest.java @@ -30,6 +30,7 @@ import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskSourceRuntimeEnvironment; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource.Status; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResourceManager; @@ -38,7 +39,6 @@ import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionHybridSource; import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionSource; import org.apache.iotdb.db.pipe.source.dataregion.realtime.listener.PipeInsertionDataNodeListener; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.AbstractDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java index 740b5fbbc0f51..ff3f47ac9c9af 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java @@ -27,10 +27,10 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.auth.AuthorityChecker; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tablet.parser.TabletInsertionEventTreePatternParser; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertRowNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/sink/PipeDataNodeThriftRequestTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/sink/PipeDataNodeThriftRequestTest.java index 1263e83ae08ec..662ae9a2099ee 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/sink/PipeDataNodeThriftRequestTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/sink/PipeDataNodeThriftRequestTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.sink.payload.thrift.response.PipeTransferFilePieceResp; import org.apache.iotdb.commons.schema.SchemaConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.processor.twostage.exchange.payload.CombineRequest; import org.apache.iotdb.db.pipe.processor.twostage.state.CountState; import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferDataNodeHandshakeV1Req; @@ -39,7 +40,6 @@ import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFilePieceReq; import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFilePieceWithModReq; import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTsFileSealReq; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateAlignedTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java index d01351ce60adc..cbbf95db5a8b0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.source.schemaregion.IoTDBSchemaRegionSource; 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.write.RelationalDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; 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/pipe/source/PipePlanTreePatternParseVisitorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTreePatternParseVisitorTest.java index 8aebe3ea0f78b..55f80d4feaf35 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTreePatternParseVisitorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTreePatternParseVisitorTest.java @@ -27,8 +27,8 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.UnionIoTDBTreePattern; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.source.schemaregion.IoTDBSchemaRegionSource; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.BatchActivateTemplateNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipeRealtimeExtractTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipeRealtimeExtractTest.java index 9e07e91e9839b..5ad4b8d991e23 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipeRealtimeExtractTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipeRealtimeExtractTest.java @@ -28,12 +28,12 @@ import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskSourceRuntimeEnvironment; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionHybridSource; import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionLogSource; import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionSource; import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionTsFileSource; import org.apache.iotdb.db.pipe.source.dataregion.realtime.listener.PipeInsertionDataNodeListener; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/SchemaRegionListeningQueueTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/SchemaRegionListeningQueueTest.java index 504fd608522bb..2f9a7c4c804c1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/SchemaRegionListeningQueueTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/SchemaRegionListeningQueueTest.java @@ -25,9 +25,9 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.queue.ConcurrentIterableLinkedQueue; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedWritePlanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java index c24fd3dac57d3..d1b4a8d2d7b72 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutorTest.java index a06eaea6b33ba..22b021b7424a0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutorTest.java @@ -26,8 +26,8 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.consensus.IConsensus; import org.apache.iotdb.consensus.exception.ConsensusException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.protocol.thrift.impl.DataNodeRegionManager; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.schemaengine.SchemaEngine; import org.apache.iotdb.db.schemaengine.template.ClusterTemplateManager; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java index 4d9edecf00cf3..d3f7d67a0ef01 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.CountAccumulator; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.operator.process.AggregationMergeSortOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java index 9a47b9fbeb3ee..68bf828c69a62 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.process.AggregationOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesAggregationScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java index 983847dde219c..2be569433ecc9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesAggregationScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java index ee3c544656b71..43f3e8185f82c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java index 581beb079d2de..1d51a91c29ef2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java @@ -22,9 +22,9 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.CteScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.utils.cte.CteDataStore; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java index 082cf34448558..f5082267a6cce 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.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.AlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.DeviceIteratorScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java index f7fe5fcf367d3..4390c01113606 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -40,7 +41,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.ColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java index 007cdbb8dcdcd..71ec08672b14a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java @@ -21,6 +21,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.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.process.DeviceViewOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java index a5f30cf6d611b..7d77c3e25dbf3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.source.ExchangeOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java index 6dc276c8be6ff..3cac464320062 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.fill.filter.FixedIntervalFillFilter; import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.IntPreviousFill; import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import com.google.common.collect.ImmutableList; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java index dce46430a51ed..3ddbdf417d06e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.process.join.HorizontallyConcatOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesAggregationScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java index 5e4fa5ad9f96e..139fd668f4d20 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java @@ -20,6 +20,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryMergeOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.tsfile.exception.write.WriteProcessException; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java index fe96135ac9d31..d7bef9d86bf76 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; import org.apache.iotdb.db.queryengine.execution.operator.process.last.UpdateLastCacheOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesAggregationScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryTreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryTreeSortOperatorTest.java index 3493fefb4408b..ff03ca9367f0b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryTreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryTreeSortOperatorTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; import org.apache.iotdb.db.queryengine.execution.operator.process.last.UpdateLastCacheOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesAggregationScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java index e72e5e45a33ad..ace1aad41cd92 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; 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 2d0c1bf543c37..0394d03adf75e 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.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -46,7 +47,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java index 01a0052950349..253ba133dc5b7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.schema.table.column.TagColumnSchema; import org.apache.iotdb.commons.schema.table.column.TimeColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -40,7 +41,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.planner.TableOperatorGenerator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java index a10f26a8b6e08..109d1e48b5de9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index ae1b9458f0311..39eaf7d6be3e0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -76,7 +77,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.window.WindowParameter; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java index 5b45158716ec6..93e3fbce9525c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -44,7 +45,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.window.TimeWindowParameter; import org.apache.iotdb.db.queryengine.execution.operator.window.VariationWindowParameter; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowParameter; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java index df3fc3318c7f2..b66ee86cb64e5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesAggregationScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java index c61829e626614..e22486c5147bc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java index 36da80e4729fe..012361b80ab04 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java @@ -21,6 +21,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.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java index c0b44f6cf01ad..96150dd727a0d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.process.SlidingWindowAggregationOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesAggregationScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java index 77a0456c9ddd5..c949dc504c9de 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.TreeSortOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java index 044f99b8b8812..03154d821435c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.NodeRef; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.input.QueryDataSetInputLayer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java index 4b4d08f558ebb..e10ebcdd06333 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -37,7 +38,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.ColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java index 02c2e95b7ee60..778c381a581cc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.fill.identity.IdentityLinearFill; import org.apache.iotdb.db.queryengine.execution.operator.process.fill.linear.FloatLinearFill; import org.apache.iotdb.db.queryengine.execution.operator.process.fill.linear.LinearFill; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import com.google.common.collect.ImmutableList; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java index 94d47c14f00bc..e3fa166ee3e11 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java @@ -23,6 +23,7 @@ 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.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java index 59bf0292d7e8e..9632664eaf3f6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java @@ -24,6 +24,7 @@ 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.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -40,7 +41,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java index 0282c00a5bc06..8c83f40bdb53c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; import org.apache.iotdb.db.queryengine.execution.operator.process.last.UpdateLastCacheOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesAggregationScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java index 21ee785aa3308..4e979bb2fec45 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeToTableViewAdaptorOperator; import org.apache.iotdb.db.queryengine.plan.planner.TableOperatorGenerator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java index f6cdd59d9376b..192d3e31798be 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java index cb5d9ea5c8710..730b4fb99f98c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java index eb3f8489957db..85c9f6d330714 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java index 3b66e6d40d92a..9f9c7472bdc72 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java index 5ccfbfb568f80..0621dd3291c1c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java index 2f673e24cf6d5..27d87edee18c7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java index cdf58eb7681c8..f03968167cd1a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java index 9c40227661d02..5c5a19845866f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.WindowFunction; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank.RankFunction; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java index 1bbf05f7679b9..c4c9644be48ed 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java index d49186fb98484..350962529fe08 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ITimeSeriesSchemaInfo; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java index 3bdd80a3c1b53..1d2fe58b93f46 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java @@ -20,6 +20,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ISchemaInfo; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ITimeSeriesSchemaInfo; 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 75d450430add6..09ca7b0047886 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 @@ -25,6 +25,7 @@ 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.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.SchemaSourceFactory; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; 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.info.ITimeSeriesSchemaInfo; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java index 443c7fe846d03..8bf1042abd46d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java index 12e295d191aba..1d659e32dc126 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator; import org.apache.iotdb.db.queryengine.plan.planner.TableOperatorGenerator; 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.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java index d0e644eec963f..30625a830d744 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.AbstractTableScanOperatorParameter; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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 9b25ae7787feb..c981e8319849c 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 @@ -22,9 +22,9 @@ 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.db.node_commons.plan.planner.plan.node.PlanNodeId; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ColumnInjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java index 6f488dcafcda5..27b14d88d90a3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java @@ -30,6 +30,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; @@ -38,7 +39,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.TreeModelTimePredicate; 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.process.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java index 4162f24846bd5..7d53390c9d715 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java @@ -26,6 +26,7 @@ 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.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -44,7 +45,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.memory.ConsumeChildrenOneByOnePipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; 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.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java index 75467533b8ead..86417f583df7d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java @@ -24,6 +24,7 @@ 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.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java index 203ccf3f3303c..6cbc927190cc9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java @@ -23,13 +23,13 @@ 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.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryCollectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryMergeNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java index ec99453147592..3b7f343aeb156 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java @@ -26,11 +26,11 @@ import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; 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.process.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanGraphPrinterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanGraphPrinterTest.java index 19db60271bc7a..841aa19929010 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanGraphPrinterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanGraphPrinterTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/load/LoadTsFileNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/load/LoadTsFileNodeTest.java index a22ab8f6739ae..5e382a83fd624 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/load/LoadTsFileNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/load/LoadTsFileNodeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.load; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadSingleTsFileNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePieceNode; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java index 48c8dc290574a..4c37f42f47f03 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java @@ -22,7 +22,7 @@ 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.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.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.metadata.read.DeviceSchemaFetchScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java index df356f41c93c7..585a2fcf7c1b4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java @@ -22,11 +22,11 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesSchemaScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/NodeManagementMemoryMergeNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/NodeManagementMemoryMergeNodeSerdeTest.java index 7b12f6d1dd713..8756aef558363 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/NodeManagementMemoryMergeNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/NodeManagementMemoryMergeNodeSerdeTest.java @@ -25,11 +25,11 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.node.MNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodeManagementMemoryMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsConvertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsCountNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java index 1b772aae5b448..7f60a1a3df3b6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java @@ -23,7 +23,7 @@ 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.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.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.metadata.read.PathsUsingTemplateScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaCountNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaCountNodeSerdeTest.java index 11cd1f75f5ffc..a391754164595 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaCountNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaCountNodeSerdeTest.java @@ -22,11 +22,11 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesCountNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.LevelTimeSeriesCountNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java index d33cbb95f2adf..e388084e61f15 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java @@ -22,7 +22,7 @@ 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.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.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.metadata.read.SchemaFetchMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SeriesSchemaFetchScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java index 5b72db254b0aa..06d22fa26d8fb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java @@ -22,7 +22,7 @@ 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.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.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.metadata.read.SeriesSchemaFetchScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java index 07761c29b02ca..4899b3e4c0e5b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java @@ -22,11 +22,11 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TimeSeriesSchemaScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java index 94bba57a611bf..199d35b7d49d3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java @@ -25,8 +25,8 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java index f6add9efe89bd..8de5400db616b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.pipe.PipeEnrichedDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java index 3c709af7a5288..d27ee2b4ae75f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.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.pipe.PipeEnrichedInsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java index bd7527c153baa..975e7428ddca9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java @@ -22,8 +22,8 @@ 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.node_commons.plan.planner.plan.node.PlanNodeId; 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.metadata.write.DeleteTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedNonWritePlanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java index df7c7e8f2c4a8..9f87417b35986 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.pipe; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.metadata.write.InternalBatchActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedWritePlanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java index 6dcf512e15286..86bc0f13f65e6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.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.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/DeviceViewNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/DeviceViewNodeSerdeTest.java index 264cb2aa0b66f..3c6134dc23dbe 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/DeviceViewNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/DeviceViewNodeSerdeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/ExchangeNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/ExchangeNodeSerdeTest.java index a66fe4be15f24..39f73813ba2f2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/ExchangeNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/ExchangeNodeSerdeTest.java @@ -20,11 +20,11 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java index 3594ead5b0e73..9c6211bc61290 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.FillDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java index 998df88719b41..887f3b261d463 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java @@ -20,12 +20,12 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java index 93a4d30d23122..10f9b3d08b09b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.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.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java index 779f18f964c00..a146a6a934755 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java @@ -22,10 +22,10 @@ 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.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByTagNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java index 8c048814d0d54..b9480fe6c2200 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewIntoNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.IntoNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.DeviceViewIntoPathDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/LimitNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/LimitNodeSerdeTest.java index 1687b3658874a..f3d8f0b1bdc2f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/LimitNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/LimitNodeSerdeTest.java @@ -20,8 +20,8 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/OffsetNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/OffsetNodeSerdeTest.java index a418d7f73b6a7..098b1bec8ea19 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/OffsetNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/OffsetNodeSerdeTest.java @@ -20,8 +20,8 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SingleDeviceViewNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SingleDeviceViewNodeSerdeTest.java index cf95180339c7a..745ecf2c35e81 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SingleDeviceViewNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SingleDeviceViewNodeSerdeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleDeviceViewNode; import org.apache.tsfile.file.metadata.IDeviceID; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SortNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SortNodeSerdeTest.java index e43d44d06ba8f..b7fdf1d9175fc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SortNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SortNodeSerdeTest.java @@ -20,8 +20,8 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java index b2743223e5c42..d4f9fa1d7b550 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java @@ -20,9 +20,9 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; 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.process.join.FullOuterTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.InnerTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.LeftOuterTimeJoinNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java index baf95593e3730..92829ef5b38ef 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; 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.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/IdentitySinkNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/IdentitySinkNodeSerdeTest.java index 5d2cdd8d798b5..087be3cdfd698 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/IdentitySinkNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/IdentitySinkNodeSerdeTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.mpp.rpc.thrift.TFragmentInstanceId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/ShuffleSinkHandleNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/ShuffleSinkHandleNodeSerdeTest.java index 9963572729b22..1e8aa6a2cbc9d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/ShuffleSinkHandleNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/ShuffleSinkHandleNodeSerdeTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.ShuffleSinkNode; import org.apache.iotdb.mpp.rpc.thrift.TFragmentInstanceId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java index 2929ea8eaff9a..25d86e17887ec 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java index ce4d62056a8a1..820fa8aace59d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java index e3f781453d4cb..b5603719c3519 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.LastQueryScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowDiskUsageNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowQueriesNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java index ec77a59da2844..e6283f3518292 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.write; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.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.write.ContinuousSameSearchIndexSeparatorNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALByteBufferForTest; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java index 78d0b4349deef..858a0290e323b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.write.DeleteDataNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java index 215e71c8a809a..e462cfba31c78 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.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.write.InsertMultiTabletsNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java index 523b061428241..4c77ec58e7ee2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.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.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALByteBufferForTest; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java index 1fcc77a3f01ce..2c124062c445d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.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.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java index 692d96e950692..9056c2164a1c3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.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.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsOfOneDeviceNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java index 420b7e7b73fd9..665f5f1df4cf8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.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.write.InsertTabletNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java index 8d23bc848b9eb..42b13c08f159e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java @@ -35,8 +35,8 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertMultiTabletsNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java index e51a8b99db91d..69cef259c51d5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.write; import org.apache.iotdb.commons.consensus.index.impl.IoTProgressIndex; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.storageengine.dataregion.modification.DeletionPredicate; import org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.And; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java index 6f133757a89cf..b9d38cfd35744 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; 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 1b178b50449da..436f9736d192f 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; 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 4b0136d892327..f2d7f4ccf68da 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 @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java index 35b1d06517744..7b9b9b4cc1cfe 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; 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.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Measure; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java index a80095458a942..fe164740d3bb6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.schema.table.column.FieldColumnSchema; import org.apache.iotdb.commons.schema.table.column.TagColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java index 22a2d6cdc461f..810045cc8cbc9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java @@ -43,9 +43,9 @@ import org.apache.iotdb.db.consensus.statemachine.dataregion.IoTConsensusDataRegionStateMachine; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.load.LoadFileException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.protocol.thrift.impl.DataNodeInternalRPCServiceImpl; import org.apache.iotdb.db.protocol.thrift.impl.DataNodeRegionManager; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateAlignedTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateMultiTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateTimeSeriesNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java index 0cb7143e708ab..e2959f4e89e95 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java @@ -37,9 +37,9 @@ import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.exception.WriteProcessRejectException; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java index afd7ed608eadb..267d58a8739ef 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java @@ -34,10 +34,10 @@ import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.exception.query.OutOfTTLException; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.statement.metadata.SetTTLStatement; import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowTTLStatement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java index ead500524e550..c03994df5100d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java @@ -26,8 +26,8 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.StorageEngineException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.db.storageengine.dataregion.compaction.AbstractCompactionTest; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java index d65400144137a..38300811c74b0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java @@ -26,8 +26,8 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.StorageEngineException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.db.storageengine.dataregion.compaction.AbstractCompactionTest; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java index f3eac89e50289..942c45e78cf5c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java @@ -24,7 +24,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataRegionException; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.storageengine.buffer.BloomFilterCache; import org.apache.iotdb.db.storageengine.buffer.ChunkCache; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java index 2c9a87a4465bf..11125e7a1b662 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java @@ -24,7 +24,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataRegionException; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.storageengine.buffer.BloomFilterCache; import org.apache.iotdb.db.storageengine.buffer.ChunkCache; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandlerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandlerTest.java index cedc288a2a9b5..cfb1c5341a9d2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandlerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandlerTest.java @@ -31,7 +31,7 @@ import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.TsFileProcessorException; import org.apache.iotdb.db.exception.WriteProcessException; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemTableTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemTableTestUtils.java index 88dc12d8e0d3f..a3c992c16d3bf 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemTableTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemTableTestUtils.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.WriteProcessException; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java index 7fb46b14cf2b2..78a1daaacaa03 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java @@ -29,6 +29,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -43,7 +44,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.execution.schedule.IDriverScheduler; import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.schemaengine.schemaregion.utils.ResourceByPathUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessorTest.java index 86c10932e04a0..a3668a33ed946 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessorTest.java @@ -30,9 +30,9 @@ import org.apache.iotdb.db.exception.DataRegionException; import org.apache.iotdb.db.exception.TsFileProcessorException; import org.apache.iotdb.db.exception.WriteProcessException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManagerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManagerTest.java index 6dd98a05bf631..2c08900003cf6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManagerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManagerTest.java @@ -25,7 +25,7 @@ import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.allocation.ElasticStrategy; import org.apache.iotdb.db.storageengine.dataregion.wal.node.WALNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java index 2e68d8f55322a..bad49f715acb6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java index 4d08b1f1cf177..3e0ccbbdea3c9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.node.IWALNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALFileUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java index b60d83aef9c17..932efe73fa554 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.node.IWALNode; import org.apache.iotdb.db.storageengine.dataregion.wal.node.WALNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java index 663646a8f2907..b095fd8ce7b7e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.node.IWALNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALFileUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java index 04a33a5f80d86..7f66ad9b5668a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.io.WALReader; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALFileUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java index 3a4cb319bdabe..aac39f47e5b60 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java index 688e5df205c4e..2b43b3e896112 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java @@ -26,8 +26,8 @@ import org.apache.iotdb.consensus.iot.log.ConsensusReqReader; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALFakeNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALFakeNodeTest.java index ca448f2386b7a..c0b162e6a4e82 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALFakeNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALFakeNodeTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.storageengine.dataregion.wal.node; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java index 3706eeb388fbf..e03ff250928bf 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java @@ -24,7 +24,7 @@ import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.db.storageengine.dataregion.DataRegionTest; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java index c132d268c7d30..2fbbeb3e62d3d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java @@ -26,7 +26,7 @@ import org.apache.iotdb.consensus.iot.log.ConsensusReqReader; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java index 2482690628377..046797f3c3f81 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java @@ -28,7 +28,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRepairWriterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRepairWriterTest.java index 5c1df08a7a222..8fac39c7de842 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRepairWriterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRepairWriterTest.java @@ -20,7 +20,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntry; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java index 42cbf6eed79c7..b629ccb701113 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java index 69a693d0ff759..f0f4d9fb94471 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java @@ -26,7 +26,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataRegionException; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/trigger/executor/TriggerExecuteTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/trigger/executor/TriggerExecuteTest.java index 1c05cc21c3e00..9453e52f5c257 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/trigger/executor/TriggerExecuteTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/trigger/executor/TriggerExecuteTest.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.trigger.TriggerInformation; import org.apache.iotdb.confignode.rpc.thrift.TTriggerState; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.trigger.service.TriggerManagementService; import org.apache.iotdb.trigger.api.Trigger; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/MemUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/MemUtilsTest.java index efe132318d8ea..acc7147359f49 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/MemUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/MemUtilsTest.java @@ -20,7 +20,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.tsfile.common.conf.TSFileConfig; From 85a66124ec6588be8f1dc5ccdec60270f7f540bd Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Fri, 10 Apr 2026 18:33:23 +0800 Subject: [PATCH 02/45] refactor TableOperatorGenerator --- .../plan/planner/plan/node/IPlanVisitor.java | 4 + .../DataNodeTableOperatorGenerator.java | 2073 +++++++++++++++++ .../plan/planner/LocalExecutionPlanner.java | 2 +- .../plan/planner/TableOperatorGenerator.java | 2045 +--------------- .../plan/planner/plan/node/PlanVisitor.java | 6 - 5 files changed, 2099 insertions(+), 2031 deletions(-) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java index 4a82f59756d0f..515598edc053b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java @@ -18,5 +18,9 @@ public interface IPlanVisitor { + default R process(PlanNode node, C context) { + return node.accept(this, context); + } + R visitPlan(PlanNode node, C context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java new file mode 100644 index 0000000000000..ea084f3679ea9 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -0,0 +1,2073 @@ +/* + * 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.planner; + +import org.apache.iotdb.common.rpc.thrift.TEndPoint; +import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.path.PartialPath; +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.exception.sql.SemanticException; +import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; +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; +import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; +import org.apache.iotdb.db.queryengine.execution.exchange.MPPDataExchangeManager; +import org.apache.iotdb.db.queryengine.execution.exchange.MPPDataExchangeService; +import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; +import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; +import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; +import org.apache.iotdb.db.queryengine.execution.exchange.sink.ShuffleSinkHandle; +import org.apache.iotdb.db.queryengine.execution.exchange.source.ISourceHandle; +import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; +import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; +import org.apache.iotdb.db.queryengine.execution.operator.EmptyDataOperator; +import org.apache.iotdb.db.queryengine.execution.operator.ExplainAnalyzeOperator; +import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.queryengine.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.db.queryengine.execution.operator.process.LimitOperator; +import org.apache.iotdb.db.queryengine.execution.operator.process.OffsetOperator; +import org.apache.iotdb.db.queryengine.execution.operator.process.TableIntoOperator; +import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.TableCopyToOperator; +import org.apache.iotdb.db.queryengine.execution.operator.process.join.FullOuterTimeJoinOperator; +import org.apache.iotdb.db.queryengine.execution.operator.process.join.InnerTimeJoinOperator; +import org.apache.iotdb.db.queryengine.execution.operator.process.join.TableLeftOuterTimeJoinOperator; +import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; +import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.ColumnMerger; +import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; +import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; +import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; +import org.apache.iotdb.db.queryengine.execution.operator.schema.CountMergeOperator; +import org.apache.iotdb.db.queryengine.execution.operator.schema.SchemaCountOperator; +import org.apache.iotdb.db.queryengine.execution.operator.schema.SchemaQueryScanOperator; +import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DevicePredicateFilter; +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.AbstractDataSourceOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.ExchangeOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractAggTableScanOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.DefaultAggTableScanOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.DeviceIteratorScanOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.InformationSchemaTableScanOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.LastQueryAggTableScanOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeAlignedDeviceViewAggregationScanOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeAlignedDeviceViewScanOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeNonAlignedDeviceViewAggregationScanOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeToTableViewAdaptorOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastDescAccumulator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.db.queryengine.execution.relational.ColumnTransformerBuilder; +import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; +import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.ConvertPredicateToTimeFilterVisitor; +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.NonAlignedDeviceEntry; +import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; +import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceSchemaCache; +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.ir.IrUtils; +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.AggregationTreeDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AlignedAggregationTreeDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; +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.ExplainAnalyzeNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.NonAlignedAggregationTreeDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeAlignedDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; +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.sql.ast.Expression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; +import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; +import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; +import org.apache.iotdb.db.utils.TimestampPrecisionUtils; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import org.apache.tsfile.common.conf.TSFileDescriptor; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.IDeviceID; +import org.apache.tsfile.read.TimeValuePair; +import org.apache.tsfile.read.common.TimeRange; +import org.apache.tsfile.read.common.type.BinaryType; +import org.apache.tsfile.read.common.type.BlobType; +import org.apache.tsfile.read.common.type.BooleanType; +import org.apache.tsfile.read.common.type.ObjectType; +import org.apache.tsfile.read.common.type.Type; +import org.apache.tsfile.read.common.type.TypeFactory; +import org.apache.tsfile.read.filter.basic.Filter; +import org.apache.tsfile.utils.Pair; +import org.apache.tsfile.utils.RamUsageEstimator; +import org.apache.tsfile.utils.TsPrimitiveType; +import org.apache.tsfile.write.schema.IMeasurementSchema; +import org.apache.tsfile.write.schema.MeasurementSchema; + +import javax.validation.constraints.NotNull; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.OptionalLong; +import java.util.Set; +import java.util.stream.Collectors; + +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; +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.sink.IdentitySinkOperator.DELIMITER_BETWEEN_ID; +import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DOWNSTREAM_PLAN_NODE_ID; +import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.constructAlignedPath; +import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.InformationSchemaContentSupplierFactory.getSupplier; +import static org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils.convertPredicateToFilter; +import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.isFilterGtOrGe; +import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions.updateFilterUsingTTL; +import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_PRIMITIVE_TYPE; +import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; +import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.db.utils.constant.SqlConstant.AVG; +import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT; +import static org.apache.iotdb.db.utils.constant.SqlConstant.EXTREME; +import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; +import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; +import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_AGGREGATION; +import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_BY_AGGREGATION; +import static org.apache.iotdb.db.utils.constant.SqlConstant.MAX; +import static org.apache.iotdb.db.utils.constant.SqlConstant.MIN; +import static org.apache.iotdb.db.utils.constant.SqlConstant.SUM; +import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; + +public class DataNodeTableOperatorGenerator extends TableOperatorGenerator { + + private static final MPPDataExchangeManager MPP_DATA_EXCHANGE_MANAGER = + MPPDataExchangeService.getInstance().getMPPDataExchangeManager(); + + public DataNodeTableOperatorGenerator(Metadata metadata) { + super(metadata); + } + + @Override + public Operator visitIdentitySink(IdentitySinkNode node, LocalExecutionPlanContext context) { + context.addExchangeSumNum(1); + OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext( + context.getNextOperatorId(), + node.getPlanNodeId(), + IdentitySinkOperator.class.getSimpleName()); + String downStreamPlanNodeId = + node.getDownStreamChannelLocationList().stream() + .map(DownStreamChannelLocation::getRemotePlanNodeId) + .collect(Collectors.joining(DELIMITER_BETWEEN_ID)); + if (!downStreamPlanNodeId.isEmpty()) { + operatorContext.recordSpecifiedInfo(DOWNSTREAM_PLAN_NODE_ID, downStreamPlanNodeId); + } + checkArgument( + MPP_DATA_EXCHANGE_MANAGER != null, "MPP_DATA_EXCHANGE_MANAGER should not be null"); + FragmentInstanceId localInstanceId = context.getInstanceContext().getId(); + DownStreamChannelIndex downStreamChannelIndex = new DownStreamChannelIndex(0); + ISinkHandle sinkHandle = + MPP_DATA_EXCHANGE_MANAGER.createShuffleSinkHandle( + node.getDownStreamChannelLocationList(), + downStreamChannelIndex, + ShuffleSinkHandle.ShuffleStrategyEnum.PLAIN, + localInstanceId.toThrift(), + node.getPlanNodeId().getId(), + context.getInstanceContext()); + + if (node.getChildren().size() == 1) { + Operator child = node.getChildren().get(0).accept(this, context); + List children = new ArrayList<>(1); + children.add(child); + sinkHandle.setMaxBytesCanReserve(context.getMaxBytesOneHandleCanReserve()); + context.getDriverContext().setSink(sinkHandle); + return new IdentitySinkOperator( + operatorContext, children, downStreamChannelIndex, sinkHandle); + } else { + throw new IllegalStateException( + "IdentitySinkNode should only have one child in table model."); + } + } + + @Override + public Operator visitTableExchange(ExchangeNode node, LocalExecutionPlanContext context) { + OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext( + context.getNextOperatorId(), + node.getPlanNodeId(), + ExchangeOperator.class.getSimpleName()); + + FragmentInstanceId localInstanceId = context.getInstanceContext().getId(); + FragmentInstanceId remoteInstanceId = node.getUpstreamInstanceId(); + + TEndPoint upstreamEndPoint = node.getUpstreamEndpoint(); + boolean isSameNode = isSameNode(upstreamEndPoint); + ISourceHandle sourceHandle = + isSameNode + ? MPP_DATA_EXCHANGE_MANAGER.createLocalSourceHandleForFragment( + localInstanceId.toThrift(), + node.getPlanNodeId().getId(), + node.getUpstreamPlanNodeId().getId(), + remoteInstanceId.toThrift(), + node.getIndexOfUpstreamSinkHandle(), + context.getInstanceContext()::failed) + : MPP_DATA_EXCHANGE_MANAGER.createSourceHandle( + localInstanceId.toThrift(), + node.getPlanNodeId().getId(), + node.getIndexOfUpstreamSinkHandle(), + upstreamEndPoint, + remoteInstanceId.toThrift(), + context.getInstanceContext()::failed); + if (!isSameNode) { + context.addExchangeSumNum(1); + } + sourceHandle.setMaxBytesCanReserve(context.getMaxBytesOneHandleCanReserve()); + ExchangeOperator exchangeOperator = + new ExchangeOperator(operatorContext, sourceHandle, node.getUpstreamPlanNodeId()); + context.addExchangeOperator(exchangeOperator); + return exchangeOperator; + } + + @Override + public Operator visitTreeNonAlignedDeviceViewScan( + TreeNonAlignedDeviceViewScanNode node, LocalExecutionPlanContext context) { + + boolean containsFieldColumn = false; + for (Map.Entry entry : node.getAssignments().entrySet()) { + if (entry.getValue().getColumnCategory() == FIELD) { + containsFieldColumn = true; + break; + } + } + TsTable tsTable = + DataNodeTableCache.getInstance() + .getTable( + node.getQualifiedObjectName().getDatabaseName(), + node.getQualifiedObjectName().getObjectName()); + if (!containsFieldColumn) { + Map newAssignments = new LinkedHashMap<>(node.getAssignments()); + for (TsTableColumnSchema columnSchema : tsTable.getColumnList()) { + if (columnSchema.getColumnCategory() == FIELD) { + newAssignments.put( + new Symbol(columnSchema.getColumnName()), + new ColumnSchema( + columnSchema.getColumnName(), + TypeFactory.getType(columnSchema.getDataType()), + false, + columnSchema.getColumnCategory())); + containsFieldColumn = true; + } + } + node.setAssignments(newAssignments); + } + // For non-aligned series, scan cannot be performed when no field columns + // can be obtained, so an empty result set is returned. + if (!containsFieldColumn || node.getDeviceEntries().isEmpty()) { + OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext( + context.getNextOperatorId(), + node.getPlanNodeId(), + EmptyDataOperator.class.getSimpleName()); + return new EmptyDataOperator(operatorContext); + } + String treePrefixPath = DataNodeTreeViewSchemaUtils.getPrefixPath(tsTable); + IDeviceID.TreeDeviceIdColumnValueExtractor extractor = + TableOperatorGenerator.createTreeDeviceIdColumnValueExtractor(treePrefixPath); + long viewTTL = tsTable.getCachedTableTTL(); + + DeviceIteratorScanOperator.TreeNonAlignedDeviceViewScanParameters parameter = + constructTreeNonAlignedDeviceViewScanOperatorParameter( + node, + context, + TreeNonAlignedDeviceViewScanNode.class.getSimpleName(), + node.getMeasurementColumnNameMap(), + extractor, + viewTTL); + + DeviceIteratorScanOperator treeNonAlignedDeviceIteratorScanOperator = + new DeviceIteratorScanOperator( + parameter.context, parameter.deviceEntries, parameter.generator); + addSource( + treeNonAlignedDeviceIteratorScanOperator, + context, + node, + parameter.measurementColumnNames, + parameter.measurementSchemas, + parameter.allSensors, + TreeNonAlignedDeviceViewScanNode.class.getSimpleName()); + + if (!parameter.generator.keepOffsetAndLimitOperatorAfterDeviceIterator()) { + return treeNonAlignedDeviceIteratorScanOperator; + } + Operator operator = treeNonAlignedDeviceIteratorScanOperator; + if (node.getPushDownOffset() > 0) { + operator = new OffsetOperator(parameter.context, node.getPushDownOffset(), operator); + } + if (node.getPushDownLimit() > 0) { + operator = new LimitOperator(parameter.context, node.getPushDownLimit(), operator); + } + return operator; + } + + private DeviceIteratorScanOperator.TreeNonAlignedDeviceViewScanParameters + constructTreeNonAlignedDeviceViewScanOperatorParameter( + TreeNonAlignedDeviceViewScanNode node, + LocalExecutionPlanContext context, + String className, + Map fieldColumnsRenameMap, + IDeviceID.TreeDeviceIdColumnValueExtractor extractor, + long viewTTL) { + if (node.isPushLimitToEachDevice() && node.getPushDownOffset() > 0) { + throw new IllegalArgumentException( + "PushDownOffset should not be set when isPushLimitToEachDevice is true."); + } + CommonTableScanOperatorParameters commonParameter = + new CommonTableScanOperatorParameters(node, fieldColumnsRenameMap, true); + List measurementSchemas = commonParameter.measurementSchemas; + List measurementSchemaIndex2Symbols = commonParameter.measurementSchemaIndex2Symbol; + List measurementColumnNames = commonParameter.measurementColumnNames; + List fullColumnSchemas = commonParameter.columnSchemas; + List symbolInputs = commonParameter.symbolInputs; + int[] columnsIndexArray = commonParameter.columnsIndexArray; + + boolean isSingleColumn = measurementSchemas.size() == 1; + + OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext(context.getNextOperatorId(), node.getPlanNodeId(), className); + + Set allSensors = new HashSet<>(measurementColumnNames); + + DeviceIteratorScanOperator.DeviceChildOperatorTreeGenerator deviceChildOperatorTreeGenerator = + new DeviceIteratorScanOperator.DeviceChildOperatorTreeGenerator() { + + private Operator operator; + private List seriesScanOptionsList; + private List seriesScanOperators; + private FilterAndProjectOperator filterAndProjectOperator; + private OffsetOperator reuseOffsetOperator; + private LimitOperator reuseLimitOperator; + private Operator startCloseInternalOperator; + + private List cannotPushDownConjuncts; + private boolean removeUpperOffsetAndLimitOperator; + + private final long INSTANCE_SIZE = + RamUsageEstimator.shallowSizeOfInstance(this.getClass()); + + @Override + public long ramBytesUsed() { + return INSTANCE_SIZE + + (seriesScanOptionsList == null + ? 0L + : seriesScanOptionsList.stream() + .mapToLong(seriesScanOption -> seriesScanOption.ramBytesUsed()) + .sum()); + } + + @Override + public boolean keepOffsetAndLimitOperatorAfterDeviceIterator() { + calculateSeriesScanOptionsList(); + return !removeUpperOffsetAndLimitOperator && !node.isPushLimitToEachDevice(); + } + + @Override + public void generateCurrentDeviceOperatorTree( + DeviceEntry deviceEntry, boolean needAdaptor) { + calculateSeriesScanOptionsList(); + if (needAdaptor) { + operator = constructTreeToTableViewAdaptorOperator(deviceEntry); + } else { + seriesScanOperators = new ArrayList<>(measurementSchemas.size()); + operator = constructAndJoinScanOperators(deviceEntry); + } + boolean needToPruneColumn = + node.getAssignments().size() != node.getOutputSymbols().size(); + if (isSingleColumn) { + operator = needToPruneColumn ? getFilterAndProjectOperator(operator) : operator; + return; + } + if (!cannotPushDownConjuncts.isEmpty() || needToPruneColumn) { + operator = getFilterAndProjectOperator(operator); + } + if (!node.isPushLimitToEachDevice() || removeUpperOffsetAndLimitOperator) { + return; + } + if (node.getPushDownLimit() > 0) { + operator = new LimitOperator(operatorContext, node.getPushDownLimit(), operator); + } + } + + private void calculateSeriesScanOptionsList() { + if (seriesScanOptionsList != null) { + return; + } + seriesScanOptionsList = new ArrayList<>(measurementSchemas.size()); + cannotPushDownConjuncts = new ArrayList<>(); + Map> pushDownConjunctsForEachMeasurement = new HashMap<>(); + if (node.getPushDownPredicate() != null) { + List conjuncts = IrUtils.extractConjuncts(node.getPushDownPredicate()); + for (Expression conjunct : conjuncts) { + Set symbols = SymbolsExtractor.extractUnique(conjunct); + boolean containsMultiDataSource = symbols.size() > 1; + if (containsMultiDataSource) { + cannotPushDownConjuncts.add(conjunct); + continue; + } + Symbol symbol = symbols.iterator().next(); + pushDownConjunctsForEachMeasurement + .computeIfAbsent(symbol, k -> new ArrayList<>()) + .add(conjunct); + } + } + + // Using getSeriesScanOptionsBuilder to create SeriesScanBuilder will cause multiple + // calls to setTimeFilterForTableModel and generate a deeply nested Or filter. + // Therefore, a separate setting is made here + Filter timeFilter = null; + if (node.getTimePredicate().isPresent()) { + Expression timePredicate = node.getTimePredicate().get(); + timeFilter = + timePredicate.accept( + new ConvertPredicateToTimeFilterVisitor( + context.getZoneId(), TimestampPrecisionUtils.currPrecision), + null); + context + .getDriverContext() + .getFragmentInstanceContext() + .setTimeFilterForTableModel(timeFilter); + } + + boolean canPushDownLimit = cannotPushDownConjuncts.isEmpty(); + // only use full outer time join + boolean canPushDownLimitToAllSeriesScanOptions = + canPushDownLimit && pushDownConjunctsForEachMeasurement.isEmpty(); + // the left child of LeftOuterTimeJoinOperator is SeriesScanOperator + boolean pushDownOffsetAndLimitToLeftChildSeriesScanOperator = + canPushDownLimit && pushDownConjunctsForEachMeasurement.size() == 1; + // the left child of LeftOuterTimeJoinOperator is InnerTimeJoinOperator + boolean pushDownOffsetAndLimitAfterInnerJoinOperator = + canPushDownLimit && pushDownConjunctsForEachMeasurement.size() > 1; + removeUpperOffsetAndLimitOperator = + pushDownOffsetAndLimitToLeftChildSeriesScanOperator + || pushDownOffsetAndLimitAfterInnerJoinOperator + || isSingleColumn; + for (Symbol symbol : measurementSchemaIndex2Symbols) { + List pushDownPredicatesForCurrentMeasurement = + pushDownConjunctsForEachMeasurement.get(symbol); + Expression pushDownPredicateForCurrentMeasurement = + isSingleColumn + ? node.getPushDownPredicate() + : (pushDownPredicatesForCurrentMeasurement == null + ? null + : IrUtils.combineConjuncts(pushDownPredicatesForCurrentMeasurement)); + SeriesScanOptions.Builder builder = new SeriesScanOptions.Builder(); + // time filter may be stateful, so we need to copy it + builder.withGlobalTimeFilter(timeFilter == null ? null : timeFilter.copy()); + builder.withIsTableViewForTreeModel(true).withAllSensors(allSensors); + if (pushDownPredicateForCurrentMeasurement != null) { + builder.withPushDownFilter( + convertPredicateToFilter( + pushDownPredicateForCurrentMeasurement, + Collections.singletonMap(symbol.getName(), 0), + commonParameter.columnSchemaMap, + commonParameter.timeColumnName, + context.getZoneId(), + TimestampPrecisionUtils.currPrecision)); + } + if (isSingleColumn + || (pushDownOffsetAndLimitToLeftChildSeriesScanOperator + && pushDownPredicateForCurrentMeasurement != null)) { + builder.withPushDownLimit(node.getPushDownLimit()); + builder.withPushLimitToEachDevice(node.isPushLimitToEachDevice()); + } + + // In the case of single column, both offset and limit are pushed down to the + // SeriesScanOperator + if (!isSingleColumn && canPushDownLimitToAllSeriesScanOptions) { + builder.withPushDownLimit(node.getPushDownLimit() + node.getPushDownOffset()); + } + if (isSingleColumn + || (pushDownOffsetAndLimitToLeftChildSeriesScanOperator + && pushDownPredicateForCurrentMeasurement != null)) { + builder.withPushDownOffset( + node.isPushLimitToEachDevice() ? 0 : node.getPushDownOffset()); + } + SeriesScanOptions options = builder.build(); + options.setTTLForTableView(viewTTL); + seriesScanOptionsList.add(options); + } + } + + private Operator constructTreeToTableViewAdaptorOperator(DeviceEntry deviceEntry) { + seriesScanOperators = new ArrayList<>(measurementSchemas.size()); + operator = constructAndJoinScanOperators(deviceEntry); + return new TreeToTableViewAdaptorOperator( + operatorContext, + deviceEntry, + columnsIndexArray, + fullColumnSchemas, + operator, + extractor); + } + + private Operator constructAndJoinScanOperators(DeviceEntry deviceEntry) { + List childrenWithPushDownPredicate = new ArrayList<>(); + List innerJoinDataTypeList = new ArrayList<>(); + List childrenWithoutPushDownPredicate = new ArrayList<>(); + List fullOuterTimeJoinDataTypeList = new ArrayList<>(); + Map leftOuterJoinColumnIndexMap = new HashMap<>(); + for (int i = 0; i < measurementSchemas.size(); i++) { + IMeasurementSchema measurementSchema = measurementSchemas.get(i); + NonAlignedFullPath path = + new NonAlignedFullPath(deviceEntry.getDeviceID(), measurementSchema); + SeriesScanOptions seriesScanOptions = seriesScanOptionsList.get(i); + Operator seriesScanOperator = + new SeriesScanOperator( + operatorContext, + node.getPlanNodeId(), + path, + node.getScanOrder(), + seriesScanOptions); + seriesScanOperators.add(seriesScanOperator); + if (seriesScanOptions.getPushDownFilter() != null) { + childrenWithPushDownPredicate.add(seriesScanOperator); + innerJoinDataTypeList.add(measurementSchema.getType()); + leftOuterJoinColumnIndexMap.put( + new InputLocation(0, childrenWithPushDownPredicate.size() - 1), i); + } else { + childrenWithoutPushDownPredicate.add(seriesScanOperator); + fullOuterTimeJoinDataTypeList.add(measurementSchema.getType()); + leftOuterJoinColumnIndexMap.put( + new InputLocation(1, childrenWithoutPushDownPredicate.size() - 1), i); + } + } + Operator leftChild = + generateInnerTimeJoinOperator(childrenWithPushDownPredicate, innerJoinDataTypeList); + Operator rightChild = + generateFullOuterTimeJoinOperator( + childrenWithoutPushDownPredicate, fullOuterTimeJoinDataTypeList); + return generateLeftOuterTimeJoinOperator( + leftChild, + rightChild, + childrenWithPushDownPredicate.size(), + leftOuterJoinColumnIndexMap, + IMeasurementSchema.getDataTypeList(measurementSchemas)); + } + + private Operator generateInnerTimeJoinOperator( + List operators, List dataTypes) { + if (operators.isEmpty()) { + return null; + } + if (operators.size() == 1) { + return operators.get(0); + } + Map outputColumnMap = new HashMap<>(); + for (int i = 0; i < operators.size(); i++) { + outputColumnMap.put(new InputLocation(i, 0), i); + } + Operator currentOperator = + new InnerTimeJoinOperator( + operatorContext, + operators, + dataTypes, + node.getScanOrder() == Ordering.ASC + ? new AscTimeComparator() + : new DescTimeComparator(), + outputColumnMap); + boolean addOffsetAndLimitOperatorAfterLeftChild = + operators.size() > 1 && cannotPushDownConjuncts.isEmpty(); + if (addOffsetAndLimitOperatorAfterLeftChild) { + if (node.getPushDownOffset() > 0) { + currentOperator = getReuseOffsetOperator(currentOperator); + } + if (node.getPushDownLimit() > 0) { + currentOperator = getReuseLimitOperator(currentOperator); + } + } + return currentOperator; + } + + private Operator generateFullOuterTimeJoinOperator( + List operators, List dataTypes) { + if (operators.isEmpty()) { + return null; + } + if (operators.size() == 1) { + return operators.get(0); + } + List columnMergers = new ArrayList<>(operators.size()); + for (int i = 0; i < operators.size(); i++) { + columnMergers.add( + new SingleColumnMerger( + new InputLocation(i, 0), + node.getScanOrder() == Ordering.ASC + ? new AscTimeComparator() + : new DescTimeComparator())); + } + return new FullOuterTimeJoinOperator( + operatorContext, + operators, + node.getScanOrder(), + dataTypes, + columnMergers, + node.getScanOrder() == Ordering.ASC + ? new AscTimeComparator() + : new DescTimeComparator()); + } + + private Operator generateLeftOuterTimeJoinOperator( + Operator left, + Operator right, + int leftColumnCount, + Map outputColumnMap, + List dataTypes) { + if (left == null) { + return right; + } else if (right == null) { + return left; + } else { + return new TableLeftOuterTimeJoinOperator( + operatorContext, + left, + right, + leftColumnCount, + outputColumnMap, + dataTypes, + node.getScanOrder() == Ordering.ASC + ? new AscTimeComparator() + : new DescTimeComparator()); + } + } + + private Operator getReuseOffsetOperator(Operator child) { + this.reuseOffsetOperator = + reuseOffsetOperator == null + ? new OffsetOperator(operatorContext, node.getPushDownOffset(), child) + : new OffsetOperator(reuseOffsetOperator, child); + return this.reuseOffsetOperator; + } + + private Operator getReuseLimitOperator(Operator child) { + this.reuseLimitOperator = + reuseLimitOperator == null + ? new LimitOperator(operatorContext, node.getPushDownLimit(), child) + : new LimitOperator(reuseLimitOperator, child); + return this.reuseLimitOperator; + } + + private Operator getFilterAndProjectOperator(Operator childOperator) { + startCloseInternalOperator = childOperator; + if (filterAndProjectOperator != null) { + return new FilterAndProjectOperator(filterAndProjectOperator, childOperator); + } + List inputDataTypeList = new ArrayList<>(fullColumnSchemas.size()); + Map> symbolInputLocationMap = + new HashMap<>(fullColumnSchemas.size()); + for (int i = 0; i < fullColumnSchemas.size(); i++) { + ColumnSchema columnSchema = fullColumnSchemas.get(i); + symbolInputLocationMap + .computeIfAbsent( + new Symbol(symbolInputs.get(i).getName()), key -> new ArrayList<>()) + .add(new InputLocation(0, i)); + inputDataTypeList.add(getTSDataType(columnSchema.getType())); + } + Expression combinedCannotPushDownPredicates = + cannotPushDownConjuncts.isEmpty() + ? null + : IrUtils.combineConjuncts(cannotPushDownConjuncts); + filterAndProjectOperator = + (FilterAndProjectOperator) + DataNodeTableOperatorGenerator.this.constructFilterAndProjectOperator( + Optional.ofNullable(combinedCannotPushDownPredicates), + childOperator, + node.getOutputSymbols().stream() + .map(Symbol::toSymbolReference) + .toArray(Expression[]::new), + inputDataTypeList, + symbolInputLocationMap, + node.getPlanNodeId(), + context); + return filterAndProjectOperator; + } + + @Override + public Operator getCurrentDeviceRootOperator() { + return operator; + } + + @Override + public List getCurrentDeviceDataSourceOperators() { + return seriesScanOperators; + } + + @Override + public Operator getCurrentDeviceStartCloseOperator() { + return startCloseInternalOperator == null ? operator : startCloseInternalOperator; + } + }; + + return new DeviceIteratorScanOperator.TreeNonAlignedDeviceViewScanParameters( + allSensors, + operatorContext, + node.getDeviceEntries(), + measurementColumnNames, + measurementSchemas, + deviceChildOperatorTreeGenerator); + } + + private static class CommonTableScanOperatorParameters { + + List outputColumnNames; + List columnSchemas; + List symbolInputs; + int[] columnsIndexArray; + Map columnSchemaMap; + Map tagAndAttributeColumnsIndexMap; + List measurementColumnNames; + Map measurementColumnsIndexMap; + String timeColumnName; + List measurementSchemas; + List measurementSchemaIndex2Symbol; + int measurementColumnCount; + int idx; + + private CommonTableScanOperatorParameters( + DeviceTableScanNode node, + Map fieldColumnsRenameMap, + boolean keepNonOutputMeasurementColumns) { + outputColumnNames = node.getOutputSymbols(); + int outputColumnCount = + keepNonOutputMeasurementColumns ? node.getAssignments().size() : outputColumnNames.size(); + columnSchemas = new ArrayList<>(outputColumnCount); + symbolInputs = new ArrayList<>(outputColumnCount); + columnsIndexArray = new int[outputColumnCount]; + columnSchemaMap = node.getAssignments(); + tagAndAttributeColumnsIndexMap = node.getTagAndAttributeIndexMap(); + measurementColumnNames = new ArrayList<>(); + measurementColumnsIndexMap = new HashMap<>(); + measurementSchemas = new ArrayList<>(); + measurementSchemaIndex2Symbol = new ArrayList<>(); + measurementColumnCount = 0; + idx = 0; + + boolean addedTimeColumn = false; + for (Symbol columnName : outputColumnNames) { + ColumnSchema schema = + requireNonNull(columnSchemaMap.get(columnName), columnName + " is null"); + + symbolInputs.add(columnName); + switch (schema.getColumnCategory()) { + case TAG: + case ATTRIBUTE: + columnsIndexArray[idx++] = + requireNonNull( + tagAndAttributeColumnsIndexMap.get(columnName), columnName + " is null"); + columnSchemas.add(schema); + break; + case FIELD: + columnsIndexArray[idx++] = measurementColumnCount; + measurementColumnCount++; + + String realMeasurementName = + fieldColumnsRenameMap.getOrDefault(schema.getName(), schema.getName()); + + measurementColumnNames.add(realMeasurementName); + measurementSchemas.add( + new MeasurementSchema(realMeasurementName, getTSDataType(schema.getType()))); + measurementSchemaIndex2Symbol.add(columnName); + columnSchemas.add(schema); + measurementColumnsIndexMap.put(columnName.getName(), measurementColumnCount - 1); + break; + case TIME: + columnsIndexArray[idx++] = -1; + columnSchemas.add(schema); + timeColumnName = columnName.getName(); + addedTimeColumn = true; + break; + default: + throw new IllegalArgumentException( + "Unexpected column category: " + schema.getColumnCategory()); + } + } + Set outputSet = new HashSet<>(outputColumnNames); + for (Map.Entry entry : node.getAssignments().entrySet()) { + if (!outputSet.contains(entry.getKey()) && entry.getValue().getColumnCategory() == FIELD) { + if (keepNonOutputMeasurementColumns) { + columnSchemas.add(entry.getValue()); + columnsIndexArray[idx++] = measurementColumnCount; + symbolInputs.add(entry.getKey()); + } + measurementColumnCount++; + String realMeasurementName = + fieldColumnsRenameMap.getOrDefault( + entry.getValue().getName(), entry.getValue().getName()); + + measurementColumnNames.add(realMeasurementName); + measurementSchemas.add( + new MeasurementSchema( + realMeasurementName, getTSDataType(entry.getValue().getType()))); + measurementSchemaIndex2Symbol.add(entry.getKey()); + measurementColumnsIndexMap.put(entry.getKey().getName(), measurementColumnCount - 1); + } else if (entry.getValue().getColumnCategory() == TIME) { + timeColumnName = entry.getKey().getName(); + // for non aligned series table view scan, here the time column will not be obtained + // through this structure, but we need to ensure that the length of columnSchemas is + // consistent with the length of columnsIndexArray + if (keepNonOutputMeasurementColumns && !addedTimeColumn) { + columnSchemas.add(entry.getValue()); + columnsIndexArray[idx++] = -1; + symbolInputs.add(entry.getKey()); + } + } + } + } + } + + @Override + public Operator visitTreeAlignedDeviceViewScan( + TreeAlignedDeviceViewScanNode node, LocalExecutionPlanContext context) { + QualifiedObjectName qualifiedObjectName = node.getQualifiedObjectName(); + TsTable tsTable = + DataNodeTableCache.getInstance() + .getTable(qualifiedObjectName.getDatabaseName(), qualifiedObjectName.getObjectName()); + IDeviceID.TreeDeviceIdColumnValueExtractor idColumnValueExtractor = + createTreeDeviceIdColumnValueExtractor(DataNodeTreeViewSchemaUtils.getPrefixPath(tsTable)); + + AbstractTableScanOperator.AbstractTableScanOperatorParameter parameter = + constructAbstractTableScanOperatorParameter( + node, + context, + TreeAlignedDeviceViewScanOperator.class.getSimpleName(), + node.getMeasurementColumnNameMap(), + tsTable.getCachedTableTTL()); + + TreeAlignedDeviceViewScanOperator treeAlignedDeviceViewScanOperator = + new TreeAlignedDeviceViewScanOperator(parameter, idColumnValueExtractor); + + addSource( + treeAlignedDeviceViewScanOperator, + context, + node, + parameter.measurementColumnNames, + parameter.measurementSchemas, + parameter.allSensors, + TreeAlignedDeviceViewScanNode.class.getSimpleName()); + + return treeAlignedDeviceViewScanOperator; + } + + private void addSource( + AbstractDataSourceOperator sourceOperator, + LocalExecutionPlanContext context, + DeviceTableScanNode node, + List measurementColumnNames, + List measurementSchemas, + Set allSensors, + String planNodeName) { + + ((DataDriverContext) context.getDriverContext()).addSourceOperator(sourceOperator); + + for (int i = 0, size = node.getDeviceEntries().size(); i < size; i++) { + DeviceEntry deviceEntry = node.getDeviceEntries().get(i); + if (deviceEntry == null) { + throw new IllegalStateException( + "Device entries of index " + i + " in " + planNodeName + " is empty"); + } + if (deviceEntry instanceof NonAlignedDeviceEntry) { + for (IMeasurementSchema schema : measurementSchemas) { + NonAlignedFullPath nonAlignedFullPath = + new NonAlignedFullPath(deviceEntry.getDeviceID(), schema); + ((DataDriverContext) context.getDriverContext()).addPath(nonAlignedFullPath); + } + } else { + AlignedFullPath alignedPath = + constructAlignedPath( + deviceEntry, measurementColumnNames, measurementSchemas, allSensors); + ((DataDriverContext) context.getDriverContext()).addPath(alignedPath); + } + } + + context.getDriverContext().setInputDriver(true); + } + + private AbstractTableScanOperator.AbstractTableScanOperatorParameter + constructAbstractTableScanOperatorParameter( + DeviceTableScanNode node, + LocalExecutionPlanContext context, + String className, + Map fieldColumnsRenameMap, + long viewTTL) { + + CommonTableScanOperatorParameters commonParameter = + new CommonTableScanOperatorParameters(node, fieldColumnsRenameMap, false); + List measurementSchemas = commonParameter.measurementSchemas; + List measurementColumnNames = commonParameter.measurementColumnNames; + List columnSchemas = commonParameter.columnSchemas; + int[] columnsIndexArray = commonParameter.columnsIndexArray; + SeriesScanOptions seriesScanOptions = + buildSeriesScanOptions( + context, + commonParameter.columnSchemaMap, + measurementColumnNames, + commonParameter.measurementColumnsIndexMap, + commonParameter.timeColumnName, + node.getTimePredicate(), + node.getPushDownLimit(), + node.getPushDownOffset(), + node.isPushLimitToEachDevice(), + node.getPushDownPredicate()); + seriesScanOptions.setTTLForTableView(viewTTL); + seriesScanOptions.setIsTableViewForTreeModel(node instanceof TreeDeviceViewScanNode); + + OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext(context.getNextOperatorId(), node.getPlanNodeId(), className); + + int maxTsBlockLineNum = TSFileDescriptor.getInstance().getConfig().getMaxTsBlockLineNumber(); + if (context.getTypeProvider().getTemplatedInfo() != null) { + maxTsBlockLineNum = + (int) + Math.min( + context.getTypeProvider().getTemplatedInfo().getLimitValue(), maxTsBlockLineNum); + } + + Set allSensors = new HashSet<>(measurementColumnNames); + // for time column + allSensors.add(""); + + return new AbstractTableScanOperator.AbstractTableScanOperatorParameter( + allSensors, + operatorContext, + node.getPlanNodeId(), + columnSchemas, + columnsIndexArray, + node.getDeviceEntries(), + node.getScanOrder(), + seriesScanOptions, + measurementColumnNames, + measurementSchemas, + maxTsBlockLineNum); + } + + // used for TableScanOperator + private AbstractTableScanOperator.AbstractTableScanOperatorParameter + constructAbstractTableScanOperatorParameter( + DeviceTableScanNode node, LocalExecutionPlanContext context) { + return constructAbstractTableScanOperatorParameter( + node, + context, + TableScanOperator.class.getSimpleName(), + Collections.emptyMap(), + Long.MAX_VALUE); + } + + @Override + public Operator visitTreeDeviceViewScan( + TreeDeviceViewScanNode node, LocalExecutionPlanContext context) { + if (node.getDeviceEntries().isEmpty() || node.getTreeDBName() == null) { + OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext( + context.getNextOperatorId(), + node.getPlanNodeId(), + EmptyDataOperator.class.getSimpleName()); + return new EmptyDataOperator(operatorContext); + } + throw new IllegalArgumentException("Valid TreeDeviceViewScanNode is not expected here."); + } + + @Override + public Operator visitDeviceTableScan( + DeviceTableScanNode node, LocalExecutionPlanContext context) { + + AbstractTableScanOperator.AbstractTableScanOperatorParameter parameter = + constructAbstractTableScanOperatorParameter(node, context); + + TableScanOperator tableScanOperator = new TableScanOperator(parameter); + + context.getInstanceContext().collectTable(node.getQualifiedObjectName().getObjectName()); + addSource( + tableScanOperator, + context, + node, + parameter.measurementColumnNames, + parameter.measurementSchemas, + parameter.allSensors, + DeviceTableScanNode.class.getSimpleName()); + + return tableScanOperator; + } + + private SeriesScanOptions.Builder getSeriesScanOptionsBuilder( + LocalExecutionPlanContext context, @NotNull Expression timePredicate) { + SeriesScanOptions.Builder scanOptionsBuilder = new SeriesScanOptions.Builder(); + + Filter timeFilter = + timePredicate.accept( + new ConvertPredicateToTimeFilterVisitor( + context.getZoneId(), TimestampPrecisionUtils.currPrecision), + null); + context.getDriverContext().getFragmentInstanceContext().setTimeFilterForTableModel(timeFilter); + // time filter may be stateful, so we need to copy it + scanOptionsBuilder.withGlobalTimeFilter(timeFilter.copy()); + + return scanOptionsBuilder; + } + + @Override + public Operator visitInformationSchemaTableScan( + final InformationSchemaTableScanNode node, final LocalExecutionPlanContext context) { + final OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext( + context.getNextOperatorId(), + node.getPlanNodeId(), + InformationSchemaTableScanOperator.class.getSimpleName()); + + final List dataTypes = + node.getOutputSymbols().stream() + .map(symbol -> getTSDataType(context.getTypeProvider().getTableModelType(symbol))) + .collect(Collectors.toList()); + + return new InformationSchemaTableScanOperator( + operatorContext, + node.getPlanNodeId(), + getSupplier( + operatorContext, + dataTypes, + context + .getDriverContext() + .getFragmentInstanceContext() + .getSessionInfo() + .getUserEntity(), + node)); + } + + @Override + public Operator visitCountMerge( + final CountSchemaMergeNode node, final LocalExecutionPlanContext context) { + final OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext( + context.getNextOperatorId(), + node.getPlanNodeId(), + CountMergeOperator.class.getSimpleName()); + final List children = new ArrayList<>(node.getChildren().size()); + for (final PlanNode child : node.getChildren()) { + children.add(this.process(child, context)); + } + return new CountMergeOperator(operatorContext, children); + } + + @Override + public Operator visitTableDeviceFetch( + final TableDeviceFetchNode node, final LocalExecutionPlanContext context) { + final OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext( + context.getNextOperatorId(), + node.getPlanNodeId(), + SchemaQueryScanOperator.class.getSimpleName()); + return new SchemaQueryScanOperator<>( + node.getPlanNodeId(), + operatorContext, + SchemaSourceFactory.getTableDeviceFetchSource( + node.getDatabase(), + node.getTableName(), + node.getDeviceIdList(), + node.getColumnHeaderList())); + } + + @Override + public Operator visitTableDeviceQueryScan( + final TableDeviceQueryScanNode node, final LocalExecutionPlanContext context) { + // Query scan use filterNode directly + final TsTable table = + DataNodeTableCache.getInstance().getTable(node.getDatabase(), node.getTableName()); + final SchemaQueryScanOperator operator = + new SchemaQueryScanOperator<>( + node.getPlanNodeId(), + context + .getDriverContext() + .addOperatorContext( + context.getNextOperatorId(), + node.getPlanNodeId(), + SchemaQueryScanOperator.class.getSimpleName()), + SchemaSourceFactory.getTableDeviceQuerySource( + node.getDatabase(), + table, + node.getTagDeterminedFilterList(), + node.getColumnHeaderList(), + node.getColumnHeaderList().stream() + .map(columnHeader -> table.getColumnSchema(columnHeader.getColumnName())) + .collect(Collectors.toList()), + null, + node.isNeedAligned())); + operator.setLimit(node.getLimit()); + return operator; + } + + @Override + public Operator visitTableDeviceQueryCount( + final TableDeviceQueryCountNode node, final LocalExecutionPlanContext context) { + final String database = node.getDatabase(); + final TsTable table = DataNodeTableCache.getInstance().getTable(database, node.getTableName()); + final List columnSchemaList = + node.getColumnHeaderList().stream() + .map(columnHeader -> table.getColumnSchema(columnHeader.getColumnName())) + .collect(Collectors.toList()); + + // In "count" we have to reuse filter operator per "next" + final List filterLeafColumnTransformerList = new ArrayList<>(); + FragmentInstanceContext fragmentInstanceContext = + context.getDriverContext().getFragmentInstanceContext(); + return new SchemaCountOperator<>( + node.getPlanNodeId(), + context + .getDriverContext() + .addOperatorContext( + context.getNextOperatorId(), + node.getPlanNodeId(), + SchemaCountOperator.class.getSimpleName()), + SchemaSourceFactory.getTableDeviceQuerySource( + database, + table, + node.getTagDeterminedFilterList(), + node.getColumnHeaderList(), + columnSchemaList, + Objects.nonNull(node.getTagFuzzyPredicate()) + ? new DevicePredicateFilter( + filterLeafColumnTransformerList, + new ColumnTransformerBuilder() + .process( + node.getTagFuzzyPredicate(), + new ColumnTransformerBuilder.Context( + fragmentInstanceContext.getSessionInfo(), + filterLeafColumnTransformerList, + makeLayout(Collections.singletonList(node)), + new HashMap<>(), + ImmutableMap.of(), + ImmutableList.of(), + ImmutableList.of(), + 0, + context.getTypeProvider(), + metadata, + fragmentInstanceContext)), + columnSchemaList, + database, + table) + : null, + false)); + } + + @Override + public Operator visitAggregationTreeDeviceViewScan( + AggregationTreeDeviceViewScanNode node, LocalExecutionPlanContext context) { + throw new UnsupportedOperationException( + "The AggregationTreeDeviceViewScanNode should has been transferred to its child class node"); + } + + @Override + public Operator visitAlignedAggregationTreeDeviceViewScan( + AlignedAggregationTreeDeviceViewScanNode node, LocalExecutionPlanContext context) { + QualifiedObjectName qualifiedObjectName = node.getQualifiedObjectName(); + TsTable tsTable = + DataNodeTableCache.getInstance() + .getTable(qualifiedObjectName.getDatabaseName(), qualifiedObjectName.getObjectName()); + IDeviceID.TreeDeviceIdColumnValueExtractor idColumnValueExtractor = + createTreeDeviceIdColumnValueExtractor(DataNodeTreeViewSchemaUtils.getPrefixPath(tsTable)); + + AbstractAggTableScanOperator.AbstractAggTableScanOperatorParameter parameter = + constructAbstractAggTableScanOperatorParameter( + node, + context, + TreeAlignedDeviceViewAggregationScanOperator.class.getSimpleName(), + node.getMeasurementColumnNameMap(), + tsTable.getCachedTableTTL()); + + TreeAlignedDeviceViewAggregationScanOperator treeAlignedDeviceViewAggregationScanOperator = + new TreeAlignedDeviceViewAggregationScanOperator(parameter, idColumnValueExtractor); + + addSource( + treeAlignedDeviceViewAggregationScanOperator, + context, + node, + parameter.getMeasurementColumnNames(), + parameter.getMeasurementSchemas(), + parameter.getAllSensors(), + AlignedAggregationTreeDeviceViewScanNode.class.getSimpleName()); + return treeAlignedDeviceViewAggregationScanOperator; + } + + @Override + public Operator visitNonAlignedAggregationTreeDeviceViewScan( + NonAlignedAggregationTreeDeviceViewScanNode node, LocalExecutionPlanContext context) { + QualifiedObjectName qualifiedObjectName = node.getQualifiedObjectName(); + TsTable tsTable = + DataNodeTableCache.getInstance() + .getTable(qualifiedObjectName.getDatabaseName(), qualifiedObjectName.getObjectName()); + IDeviceID.TreeDeviceIdColumnValueExtractor idColumnValueExtractor = + createTreeDeviceIdColumnValueExtractor(DataNodeTreeViewSchemaUtils.getPrefixPath(tsTable)); + + AbstractAggTableScanOperator.AbstractAggTableScanOperatorParameter parameter = + constructAbstractAggTableScanOperatorParameter( + node, + context, + TreeNonAlignedDeviceViewAggregationScanOperator.class.getSimpleName(), + node.getMeasurementColumnNameMap(), + tsTable.getCachedTableTTL()); + + // construct source operator (generator) + TreeNonAlignedDeviceViewScanNode scanNode = + new TreeNonAlignedDeviceViewScanNode( + node.getPlanNodeId(), + node.getQualifiedObjectName(), + // the outputSymbols of TreeNonAlignedDeviceViewAggregationScanOperator is not equals + // with TreeNonAlignedDeviceViewScanNode + parameter.getOutputSymbols(), + node.getAssignments(), + node.getDeviceEntries(), + node.getTagAndAttributeIndexMap(), + node.getScanOrder(), + node.getTimePredicate().orElse(null), + node.getPushDownPredicate(), + node.getPushDownLimit(), + node.getPushDownOffset(), + node.isPushLimitToEachDevice(), + true, + node.getTreeDBName(), + node.getMeasurementColumnNameMap()); + + Operator sourceOperator = visitTreeNonAlignedDeviceViewScan(scanNode, context); + if (!(sourceOperator instanceof EmptyDataOperator)) { + // Use deviceChildOperatorTreeGenerator directly, we will control switch of devices in + // TreeNonAlignedDeviceViewAggregationScanOperator + TreeNonAlignedDeviceViewAggregationScanOperator aggTableScanOperator = + new TreeNonAlignedDeviceViewAggregationScanOperator( + parameter, + idColumnValueExtractor, + ((DeviceIteratorScanOperator) sourceOperator).getDeviceChildOperatorTreeGenerator()); + + addSource( + aggTableScanOperator, + context, + node, + parameter.getMeasurementColumnNames(), + parameter.getMeasurementSchemas(), + parameter.getAllSensors(), + NonAlignedAggregationTreeDeviceViewScanNode.class.getSimpleName()); + return aggTableScanOperator; + } else { + // source data is empty, return directly + return sourceOperator; + } + } + + private AbstractAggTableScanOperator.AbstractAggTableScanOperatorParameter + constructAbstractAggTableScanOperatorParameter( + AggregationTableScanNode node, + LocalExecutionPlanContext context, + String className, + Map fieldColumnsRenameMap, + long tableViewTTL) { + + List measurementColumnNames = new ArrayList<>(); + List measurementSchemas = new ArrayList<>(); + Map measurementColumnsIndexMap = new HashMap<>(); + + List aggregators = new ArrayList<>(node.getAggregations().size()); + List aggregatorInputChannels = + new ArrayList<>( + (int) + node.getAggregations().values().stream() + .mapToLong(aggregation -> aggregation.getArguments().size()) + .sum()); + int aggDistinctArgumentCount = + (int) + node.getAggregations().values().stream() + .flatMap(aggregation -> aggregation.getArguments().stream()) + .map(Symbol::from) + .distinct() + .count(); + List aggColumnSchemas = new ArrayList<>(aggDistinctArgumentCount); + Map aggColumnLayout = new HashMap<>(aggDistinctArgumentCount); + int[] aggColumnsIndexArray = new int[aggDistinctArgumentCount]; + + List outputSymbols = new ArrayList<>(); + + String timeColumnName = null; + int channel = 0; + int measurementColumnCount = 0; + for (Map.Entry entry : node.getAggregations().entrySet()) { + for (Expression argument : entry.getValue().getArguments()) { + Symbol symbol = Symbol.from(argument); + ColumnSchema schema = + requireNonNull(node.getAssignments().get(symbol), symbol + " is null"); + if (!aggColumnLayout.containsKey(symbol)) { + switch (schema.getColumnCategory()) { + case TAG: + case ATTRIBUTE: + aggColumnsIndexArray[channel] = + requireNonNull( + node.getTagAndAttributeIndexMap().get(symbol), symbol + " is null"); + break; + case FIELD: + aggColumnsIndexArray[channel] = measurementColumnCount; + measurementColumnCount++; + String realMeasurementName = + fieldColumnsRenameMap.getOrDefault(schema.getName(), schema.getName()); + measurementColumnNames.add(realMeasurementName); + measurementSchemas.add( + new MeasurementSchema(realMeasurementName, getTSDataType(schema.getType()))); + measurementColumnsIndexMap.put(symbol.getName(), measurementColumnCount - 1); + outputSymbols.add(symbol); + break; + case TIME: + aggColumnsIndexArray[channel] = -1; + timeColumnName = symbol.getName(); + break; + default: + throw new IllegalArgumentException( + "Unexpected column category: " + schema.getColumnCategory()); + } + + aggColumnSchemas.add(schema); + aggregatorInputChannels.add(channel); + aggColumnLayout.put(symbol, channel++); + } else { + aggregatorInputChannels.add(aggColumnLayout.get(symbol)); + } + } + } + + for (Map.Entry entry : node.getAssignments().entrySet()) { + if (!aggColumnLayout.containsKey(entry.getKey()) + && entry.getValue().getColumnCategory() == FIELD) { + measurementColumnCount++; + String realMeasurementName = + fieldColumnsRenameMap.getOrDefault( + entry.getValue().getName(), entry.getValue().getName()); + measurementColumnNames.add(realMeasurementName); + measurementSchemas.add( + new MeasurementSchema(realMeasurementName, getTSDataType(entry.getValue().getType()))); + measurementColumnsIndexMap.put(entry.getKey().getName(), measurementColumnCount - 1); + } else if (entry.getValue().getColumnCategory() == TIME) { + timeColumnName = entry.getKey().getName(); + } + } + + boolean[] ret = checkStatisticAndScanOrder(node, timeColumnName); + boolean canUseStatistic = ret[0]; + boolean scanAscending = ret[1]; + + for (Map.Entry entry : node.getAggregations().entrySet()) { + aggregators.add( + buildAggregator( + aggColumnLayout, + entry.getKey(), + entry.getValue(), + node.getStep(), + context.getTypeProvider(), + scanAscending, + true, + timeColumnName, + measurementColumnsIndexMap.keySet())); + } + + ITableTimeRangeIterator timeRangeIterator = null; + List groupingKeySchemas = null; + int[] groupingKeyIndex = null; + if (!node.getGroupingKeys().isEmpty()) { + groupingKeySchemas = new ArrayList<>(node.getGroupingKeys().size()); + groupingKeyIndex = new int[node.getGroupingKeys().size()]; + for (int i = 0; i < node.getGroupingKeys().size(); i++) { + Symbol groupingKey = node.getGroupingKeys().get(i); + + if (node.getTagAndAttributeIndexMap().containsKey(groupingKey)) { + groupingKeySchemas.add(node.getAssignments().get(groupingKey)); + groupingKeyIndex[i] = node.getTagAndAttributeIndexMap().get(groupingKey); + } else { + if (node.getProjection() != null + && !node.getProjection().getMap().isEmpty() + && node.getProjection().contains(groupingKey)) { + FunctionCall dateBinFunc = (FunctionCall) node.getProjection().get(groupingKey); + List arguments = dateBinFunc.getArguments(); + DateBinFunctionColumnTransformer dateBinTransformer = + new DateBinFunctionColumnTransformer( + TIMESTAMP, + ((LongLiteral) arguments.get(0)).getParsedValue(), + ((LongLiteral) arguments.get(1)).getParsedValue(), + null, + ((LongLiteral) arguments.get(3)).getParsedValue(), + context.getZoneId()); + timeRangeIterator = new TableDateBinTimeRangeIterator(dateBinTransformer); + } else { + throw new IllegalStateException( + "grouping key must be ID or Attribute in AggregationTableScan"); + } + } + } + } + if (timeRangeIterator == null) { + if (node.getGroupingKeys().isEmpty()) { + // global aggregation, has no group by, output init value if no data + timeRangeIterator = + new TableSingleTimeWindowIterator(new TimeRange(Long.MIN_VALUE, Long.MAX_VALUE)); + } else { + // aggregation with group by, only has data the result will not be empty + timeRangeIterator = new TableSingleTimeWindowIterator(); + } + } + + final OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext(context.getNextOperatorId(), node.getPlanNodeId(), className); + SeriesScanOptions seriesScanOptions = + buildSeriesScanOptions( + context, + node.getAssignments(), + measurementColumnNames, + measurementColumnsIndexMap, + timeColumnName, + node.getTimePredicate(), + node.getPushDownLimit(), + node.getPushDownOffset(), + node.isPushLimitToEachDevice(), + node.getPushDownPredicate()); + seriesScanOptions.setTTLForTableView(tableViewTTL); + seriesScanOptions.setIsTableViewForTreeModel(node instanceof AggregationTreeDeviceViewScanNode); + + Set allSensors = new HashSet<>(measurementColumnNames); + allSensors.add(""); // for time column + context.getDriverContext().setInputDriver(true); + + return new AbstractAggTableScanOperator.AbstractAggTableScanOperatorParameter( + node.getPlanNodeId(), + operatorContext, + aggColumnSchemas, + aggColumnsIndexArray, + node.getDeviceEntries(), + node.getDeviceEntries().size(), + seriesScanOptions, + measurementColumnNames, + allSensors, + measurementSchemas, + aggregators, + groupingKeySchemas, + groupingKeyIndex, + timeRangeIterator, + scanAscending, + canUseStatistic, + aggregatorInputChannels, + timeColumnName, + outputSymbols); + } + + // used for AggregationTableScanNode + private AbstractAggTableScanOperator.AbstractAggTableScanOperatorParameter + constructAbstractAggTableScanOperatorParameter( + AggregationTableScanNode node, LocalExecutionPlanContext context) { + return constructAbstractAggTableScanOperatorParameter( + node, + context, + AbstractAggTableScanOperator.class.getSimpleName(), + Collections.emptyMap(), + Long.MAX_VALUE); + } + + @Override + public Operator visitAggregationTableScan( + AggregationTableScanNode node, LocalExecutionPlanContext context) { + + AbstractAggTableScanOperator.AbstractAggTableScanOperatorParameter parameter = + constructAbstractAggTableScanOperatorParameter(node, context); + + OptimizeType optimizeType = + canUseLastCacheOptimize( + parameter.getTableAggregators(), node, parameter.getTimeColumnName()); + if (optimizeType != OptimizeType.NOOP) { + return constructLastQueryAggTableScanOperator( + node, parameter, optimizeType == OptimizeType.LAST_ROW, context); + } else { + DefaultAggTableScanOperator aggTableScanOperator = new DefaultAggTableScanOperator(parameter); + + context.getInstanceContext().collectTable(node.getQualifiedObjectName().getObjectName()); + addSource( + aggTableScanOperator, + context, + node, + parameter.getMeasurementColumnNames(), + parameter.getMeasurementSchemas(), + parameter.getAllSensors(), + AggregationTableScanNode.class.getSimpleName()); + return aggTableScanOperator; + } + } + + private LastQueryAggTableScanOperator constructLastQueryAggTableScanOperator( + AggregationTableScanNode node, + AbstractAggTableScanOperator.AbstractAggTableScanOperatorParameter parameter, + boolean isLastRowOptimize, + LocalExecutionPlanContext context) { + List hitCachesIndexes = new ArrayList<>(); + List> lastRowCacheResults = null; + List lastValuesCacheResults = null; + List cachedDeviceEntries = new ArrayList<>(); + List unCachedDeviceEntries = new ArrayList<>(); + long tableTTL = + DataNodeTTLCache.getInstance() + .getTTLForTable( + node.getQualifiedObjectName().getDatabaseName(), + node.getQualifiedObjectName().getObjectName()); + Filter updateTimeFilter = + updateFilterUsingTTL(parameter.getSeriesScanOptions().getGlobalTimeFilter(), tableTTL); + if (isLastRowOptimize) { + lastRowCacheResults = new ArrayList<>(); + for (int i = 0; i < node.getDeviceEntries().size(); i++) { + Optional> lastByResult = + TableDeviceSchemaCache.getInstance() + .getLastRow( + node.getQualifiedObjectName().getDatabaseName(), + node.getDeviceEntries().get(i).getDeviceID(), + "", + parameter.getMeasurementColumnNames()); + boolean allHitCache = true; + if (lastByResult.isPresent() && lastByResult.get().getLeft().isPresent()) { + for (int j = 0; j < lastByResult.get().getRight().length; j++) { + TsPrimitiveType tsPrimitiveType = lastByResult.get().getRight()[j]; + if (tsPrimitiveType == null + || (updateTimeFilter != null + && !LastQueryUtil.satisfyFilter( + updateTimeFilter, + new TimeValuePair( + lastByResult.get().getLeft().getAsLong(), tsPrimitiveType)))) { + // the process logic is different from tree model which examine if + // `isFilterGtOrGe(seriesScanOptions.getGlobalTimeFilter())`, set + // `lastByResult.get().getRight()[j] = EMPTY_PRIMITIVE_TYPE`, + // but it should skip in table model + allHitCache = false; + break; + } + } + } else { + allHitCache = false; + } + + DeviceEntry deviceEntry = node.getDeviceEntries().get(i); + if (!allHitCache) { + AlignedFullPath alignedPath = + constructAlignedPath( + deviceEntry, + parameter.getMeasurementColumnNames(), + parameter.getMeasurementSchemas(), + parameter.getAllSensors()); + ((DataDriverContext) context.getDriverContext()).addPath(alignedPath); + unCachedDeviceEntries.add(deviceEntry); + addUncachedDeviceToContext(node, context, deviceEntry); + + // last cache updateColumns need to put "" as time column + String[] updateColumns = new String[parameter.getMeasurementColumnNames().size() + 1]; + updateColumns[0] = ""; + for (int j = 1; j < updateColumns.length; j++) { + updateColumns[j] = parameter.getMeasurementColumnNames().get(j - 1); + } + TableDeviceSchemaCache.getInstance() + .initOrInvalidateLastCache( + node.getQualifiedObjectName().getDatabaseName(), + deviceEntry.getDeviceID(), + updateColumns, + false); + } else { + hitCachesIndexes.add(i); + lastRowCacheResults.add(lastByResult.get()); + cachedDeviceEntries.add(deviceEntry); + decreaseDeviceCount(node, context, deviceEntry); + } + } + } else { + // LAST_VALUES optimize + lastValuesCacheResults = new ArrayList<>(); + int measurementSize = parameter.getMeasurementColumnNames().size(); + // We don't init time if the last cache will not be updated in process of operator + boolean needInitTime = + parameter.getTableAggregators().stream() + .anyMatch( + aggregator -> + aggregator.getAccumulator() instanceof LastDescAccumulator + && !((LastDescAccumulator) aggregator.getAccumulator()) + .isMeasurementColumn()); + // When we need last cache of Time column if: + // 1. query is group by (we need last cache of Time to help judge if there is no data in + // device) + // 2. last(time), last(device) or last(attribute) occurs + boolean needTime = !node.getGroupingKeys().isEmpty() || needInitTime; + String[] targetColumns; + + if (needTime) { + targetColumns = new String[measurementSize + 1]; + // put time column in the last for convenience of later processing + targetColumns[targetColumns.length - 1] = ""; + } else { + targetColumns = new String[measurementSize]; + } + + for (int j = 0; j < measurementSize; j++) { + targetColumns[j] = parameter.getMeasurementColumnNames().get(j); + } + + for (int i = 0; i < node.getDeviceEntries().size(); i++) { + TimeValuePair[] lastResult = + TableDeviceSchemaCache.getInstance() + .getLastEntries( + node.getQualifiedObjectName().getDatabaseName(), + node.getDeviceEntries().get(i).getDeviceID(), + targetColumns); + boolean allHitCache = true; + if (lastResult != null) { + for (TimeValuePair timeValuePair : lastResult) { + if (timeValuePair == null || timeValuePair.getValue() == null) { + allHitCache = false; + break; + } + + if (updateTimeFilter != null + && !LastQueryUtil.satisfyFilter( + parameter.getSeriesScanOptions().getGlobalTimeFilter(), timeValuePair)) { + if (isFilterGtOrGe(updateTimeFilter)) { + // it means there is no data meets Filter + timeValuePair.setValue(EMPTY_PRIMITIVE_TYPE); + } else { + allHitCache = false; + break; + } + } + } + } else { + allHitCache = false; + } + + DeviceEntry deviceEntry = node.getDeviceEntries().get(i); + if (!allHitCache) { + AlignedFullPath alignedPath = + constructAlignedPath( + deviceEntry, + parameter.getMeasurementColumnNames(), + parameter.getMeasurementSchemas(), + parameter.getAllSensors()); + ((DataDriverContext) context.getDriverContext()).addPath(alignedPath); + unCachedDeviceEntries.add(deviceEntry); + addUncachedDeviceToContext(node, context, deviceEntry); + + TableDeviceSchemaCache.getInstance() + .initOrInvalidateLastCache( + node.getQualifiedObjectName().getDatabaseName(), + deviceEntry.getDeviceID(), + needInitTime || node.getGroupingKeys().isEmpty() + ? targetColumns + : Arrays.copyOfRange(targetColumns, 0, targetColumns.length - 1), + false); + } else { + hitCachesIndexes.add(i); + lastValuesCacheResults.add(lastResult); + cachedDeviceEntries.add(deviceEntry); + decreaseDeviceCount(node, context, deviceEntry); + } + } + } + + parameter.setDeviceEntries(unCachedDeviceEntries); + + // context add TableLastQueryOperator + LastQueryAggTableScanOperator lastQueryOperator = + new LastQueryAggTableScanOperator( + parameter, + cachedDeviceEntries, + node.getQualifiedObjectName(), + hitCachesIndexes, + lastRowCacheResults, + lastValuesCacheResults, + node.getDeviceCountMap(), + context.getInstanceContext().getDataNodeQueryContext()); + + ((DataDriverContext) context.getDriverContext()).addSourceOperator(lastQueryOperator); + parameter + .getOperatorContext() + .setOperatorType(LastQueryAggTableScanOperator.class.getSimpleName()); + return lastQueryOperator; + } + + private void addUncachedDeviceToContext( + AggregationTableScanNode node, LocalExecutionPlanContext context, DeviceEntry deviceEntry) { + boolean deviceInMultiRegion = + node.getDeviceCountMap() != null && node.getDeviceCountMap().containsKey(deviceEntry); + if (!deviceInMultiRegion) { + return; + } + + context.dataNodeQueryContext.lock(true); + try { + context.dataNodeQueryContext.addUnCachedDeviceIfAbsent( + node.getQualifiedObjectName(), deviceEntry, node.getDeviceCountMap().get(deviceEntry)); + } finally { + context.dataNodeQueryContext.unLock(true); + } + } + + /** + * Decrease the device count when its last cache was hit. Notice that the count can also be zero + * after decrease, we need to update last cache if needed. + */ + private void decreaseDeviceCount( + AggregationTableScanNode node, LocalExecutionPlanContext context, DeviceEntry deviceEntry) { + boolean deviceInMultiRegion = + node.getDeviceCountMap() != null && node.getDeviceCountMap().containsKey(deviceEntry); + if (!deviceInMultiRegion) { + return; + } + + context.dataNodeQueryContext.lock(true); + try { + context.dataNodeQueryContext.decreaseDeviceAndMayUpdateLastCache( + node.getQualifiedObjectName(), deviceEntry, node.getDeviceCountMap().get(deviceEntry)); + } finally { + context.dataNodeQueryContext.unLock(true); + } + } + + private SeriesScanOptions buildSeriesScanOptions( + LocalExecutionPlanContext context, + Map columnSchemaMap, + List measurementColumnNames, + Map measurementColumnsIndexMap, + String timeColumnName, + Optional timePredicate, + long pushDownLimit, + long pushDownOffset, + boolean pushLimitToEachDevice, + Expression pushDownPredicate) { + SeriesScanOptions.Builder scanOptionsBuilder = + timePredicate + .map(expression -> getSeriesScanOptionsBuilder(context, expression)) + .orElseGet(SeriesScanOptions.Builder::new); + scanOptionsBuilder.withPushDownLimit(pushDownLimit); + scanOptionsBuilder.withPushDownOffset(pushDownOffset); + scanOptionsBuilder.withPushLimitToEachDevice(pushLimitToEachDevice); + scanOptionsBuilder.withAllSensors(new HashSet<>(measurementColumnNames)); + if (pushDownPredicate != null) { + scanOptionsBuilder.withPushDownFilter( + convertPredicateToFilter( + pushDownPredicate, + measurementColumnsIndexMap, + columnSchemaMap, + timeColumnName, + context.getZoneId(), + TimestampPrecisionUtils.currPrecision)); + } + return scanOptionsBuilder.build(); + } + + @Override + public Operator visitExplainAnalyze(ExplainAnalyzeNode node, LocalExecutionPlanContext context) { + Operator operator = node.getChild().accept(this, context); + OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext( + context.getNextOperatorId(), + node.getPlanNodeId(), + ExplainAnalyzeOperator.class.getSimpleName()); + return new ExplainAnalyzeOperator( + operatorContext, operator, node.getQueryId(), node.isVerbose(), node.getTimeout()); + } + + @Override + public Operator visitCopyTo(CopyToNode node, LocalExecutionPlanContext context) { + PlanNode childNode = node.getChild(); + + List innerQueryOutputSymbols = node.getInnerQueryOutputSymbols(); + List childOutputSymbols = childNode.getOutputSymbols(); + Map childOutputSymbolsIndexMap = new HashMap<>(childOutputSymbols.size()); + for (int i = 0; i < childOutputSymbols.size(); i++) { + childOutputSymbolsIndexMap.put(childOutputSymbols.get(i), i); + } + int[] columnIndex2TsBlockColumnIndexList = new int[innerQueryOutputSymbols.size()]; + for (int i = 0; i < innerQueryOutputSymbols.size(); i++) { + int index = childOutputSymbolsIndexMap.get(innerQueryOutputSymbols.get(i)); + columnIndex2TsBlockColumnIndexList[i] = index; + } + + Operator operator = childNode.accept(this, context); + + OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext( + context.getNextOperatorId(), + node.getPlanNodeId(), + TableCopyToOperator.class.getSimpleName()); + return new TableCopyToOperator( + operatorContext, + operator, + node.getTargetFilePath(), + node.getCopyToOptions(), + node.getInnerQueryDatasetHeader().getColumnHeaders(), + columnIndex2TsBlockColumnIndexList); + } + + @Override + public Operator visitInto(IntoNode node, LocalExecutionPlanContext context) { + Operator child = node.getChild().accept(this, context); + OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext( + context.getNextOperatorId(), + node.getPlanNodeId(), + TableIntoOperator.class.getSimpleName()); + + PartialPath targetTable = new PartialPath(node.getTable(), false); + + Map tsDataTypeMap = new LinkedHashMap<>(); + Map inputLocationMap = new LinkedHashMap<>(); + List inputColumnTypes = new ArrayList<>(); + List inputColumnCategories = new ArrayList<>(); + + List originColumns = node.getColumns(); + List originInputColumnNames = node.getNeededInputColumnNames(); + int size = originColumns.size(); + List inputColumns = new ArrayList<>(size); + + List childOutputName = node.getChild().getOutputSymbols(); + Map map = new HashMap<>(childOutputName.size()); + for (int i = 0; i < size; i++) { + map.put(childOutputName.get(i), i); + inputColumns.add(null); + } + for (int i = 0; i < size; i++) { + int index = map.get(originInputColumnNames.get(i)); + inputColumns.set(index, originColumns.get(i)); + } + ColumnSchema timeColumnOfTargetTable = null; + for (int i = 0; i < inputColumns.size(); i++) { + String columnName = inputColumns.get(i).getName(); + inputLocationMap.put(columnName, new InputLocation(0, i)); + + TsTableColumnCategory columnCategory = inputColumns.get(i).getColumnCategory(); + if (columnCategory == TIME) { + if (timeColumnOfTargetTable == null) { + timeColumnOfTargetTable = inputColumns.get(i); + } else { + throw new SemanticException("Multiple columns with TIME category found"); + } + continue; + } + + TSDataType columnType = InternalTypeManager.getTSDataType(inputColumns.get(i).getType()); + tsDataTypeMap.put(columnName, columnType); + inputColumnTypes.add(columnType); + inputColumnCategories.add(columnCategory); + } + if (timeColumnOfTargetTable == null) { + throw new SemanticException("Missing TIME category column"); + } + + long statementSizePerLine = + OperatorGeneratorUtil.calculateStatementSizePerLine(inputColumnTypes); + + return new TableIntoOperator( + operatorContext, + child, + node.getDatabase(), + targetTable, + inputColumnTypes, + inputColumnCategories, + inputLocationMap, + tsDataTypeMap, + true, + FragmentInstanceManager.getInstance().getIntoOperationExecutor(), + statementSizePerLine, + timeColumnOfTargetTable); + } + + private boolean[] checkStatisticAndScanOrder( + AggregationTableScanNode node, String timeColumnName) { + boolean canUseStatistic = true; + int ascendingCount = 0, descendingCount = 0; + + for (Map.Entry entry : node.getAggregations().entrySet()) { + AggregationNode.Aggregation aggregation = entry.getValue(); + String funcName = aggregation.getResolvedFunction().getSignature().getName(); + Symbol argument = Symbol.from(aggregation.getArguments().get(0)); + Type argumentType = node.getAssignments().get(argument).getType(); + + switch (funcName) { + case COUNT: + case AVG: + case SUM: + case EXTREME: + break; + case MAX: + case MIN: + if (BlobType.BLOB.equals(argumentType) + || ObjectType.OBJECT.equals(argumentType) + || BinaryType.TEXT.equals(argumentType) + || BooleanType.BOOLEAN.equals(argumentType)) { + canUseStatistic = false; + } + break; + case FIRST_AGGREGATION: + case LAST_AGGREGATION: + case LAST_BY_AGGREGATION: + case FIRST_BY_AGGREGATION: + if (FIRST_AGGREGATION.equals(funcName) || FIRST_BY_AGGREGATION.equals(funcName)) { + ascendingCount++; + } else { + descendingCount++; + } + + // first/last/first_by/last_by aggregation with BLOB or OBJECT type can not use statistics + if (BlobType.BLOB.equals(argumentType) || ObjectType.OBJECT.equals(argumentType)) { + canUseStatistic = false; + break; + } + + // first and last, the second argument has to be the time column + if (FIRST_AGGREGATION.equals(funcName) || LAST_AGGREGATION.equals(funcName)) { + if (!isTimeColumn(aggregation.getArguments().get(1), timeColumnName)) { + canUseStatistic = false; + break; + } + } + + // first_by and last_by, the second argument has to be the time column + if (FIRST_BY_AGGREGATION.equals(funcName) || LAST_BY_AGGREGATION.equals(funcName)) { + if (!isTimeColumn(aggregation.getArguments().get(2), timeColumnName)) { + canUseStatistic = false; + break; + } + } + + // only last_by(time, x) or last_by(x,time) can use statistic + if ((LAST_BY_AGGREGATION.equals(funcName) || FIRST_BY_AGGREGATION.equals(funcName)) + && !isTimeColumn(aggregation.getArguments().get(0), timeColumnName) + && !isTimeColumn(aggregation.getArguments().get(1), timeColumnName)) { + canUseStatistic = false; + } + break; + default: + canUseStatistic = false; + } + } + + boolean isAscending = node.getScanOrder().isAscending(); + boolean groupByDateBin = node.getProjection() != null && !node.getProjection().isEmpty(); + // only in non-groupByDateBin situation can change the scan order + if (!groupByDateBin) { + if (ascendingCount >= descendingCount) { + node.setScanOrder(Ordering.ASC); + isAscending = true; + } else { + node.setScanOrder(Ordering.DESC); + isAscending = false; + } + } + return new boolean[] {canUseStatistic, isAscending}; + } + + private OptimizeType canUseLastCacheOptimize( + List aggregators, AggregationTableScanNode node, String timeColumnName) { + if (!CommonDescriptor.getInstance().getConfig().isLastCacheEnable() || aggregators.isEmpty()) { + return OptimizeType.NOOP; + } + + // has value filter, can not optimize + if (node.getPushDownPredicate() != null) { + return OptimizeType.NOOP; + } + + // has date_bin, can not optimize + if (!node.getGroupingKeys().isEmpty() + && node.getProjection() != null + && !node.getProjection().getMap().isEmpty()) { + return OptimizeType.NOOP; + } + + // if the timeColumnName is null, the param of function is just a timestamp column other than + // the time column + if (timeColumnName == null || !checkOrderColumnIsTime(node.getAggregations(), timeColumnName)) { + return OptimizeType.NOOP; + } + + if (canUseLastRowOptimize(aggregators)) { + return OptimizeType.LAST_ROW; + } + + if (canUseLastValuesOptimize(aggregators)) { + return OptimizeType.LAST_VALUES; + } + + return OptimizeType.NOOP; + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java index 8e43e4507de89..e1d6cb79adbe5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java @@ -182,7 +182,7 @@ private Operator generateOperator( break; case TABLE: instanceContext.setIgnoreAllNullRows(false); - root = node.accept(new TableOperatorGenerator(metadata), context); + root = node.accept(new DataNodeTableOperatorGenerator(metadata), context); break; default: throw new IllegalArgumentException(String.format("Unknown sql dialect: %s", sqlDialect)); 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 e219a8168af89..36f4f9dc78926 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 @@ -19,34 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.planner; -import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.path.AlignedFullPath; -import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; -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.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; -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; -import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; -import org.apache.iotdb.db.queryengine.execution.exchange.MPPDataExchangeManager; -import org.apache.iotdb.db.queryengine.execution.exchange.MPPDataExchangeService; -import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; -import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; -import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; -import org.apache.iotdb.db.queryengine.execution.exchange.sink.ShuffleSinkHandle; -import org.apache.iotdb.db.queryengine.execution.exchange.source.ISourceHandle; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; -import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; -import org.apache.iotdb.db.queryengine.execution.operator.EmptyDataOperator; -import org.apache.iotdb.db.queryengine.execution.operator.ExplainAnalyzeOperator; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.AssignUniqueIdOperator; @@ -59,7 +38,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.PatternRecognitionOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.PreviousFillWithGroupOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.TableFillOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.TableIntoOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.TableLinearFillOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.TableLinearFillWithGroupOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.TableMergeSortOperator; @@ -67,7 +45,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.TableStreamSortOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.TableTopKOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.ValuesOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.TableCopyToOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; import org.apache.iotdb.db.queryengine.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.BinaryConstantFill; @@ -82,16 +59,8 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.FullOuterTimeJoinOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.InnerTimeJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.TableLeftOuterTimeJoinOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.ColumnMerger; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; -import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.LogicalIndexNavigation; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternAggregationTracker; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternAggregator; @@ -112,34 +81,14 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate.AggregationWindowFunction; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate.WindowAggregator; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.queryengine.execution.operator.schema.CountMergeOperator; -import org.apache.iotdb.db.queryengine.execution.operator.schema.SchemaCountOperator; -import org.apache.iotdb.db.queryengine.execution.operator.schema.SchemaQueryScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DevicePredicateFilter; -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.AbstractDataSourceOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.ExchangeOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractAggTableScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AsofMergeSortLeftJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.CteScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.DefaultAggTableScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.DeviceIteratorScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.InformationSchemaTableScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.LastQueryAggTableScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.MarkDistinctOperator; 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.MergeSortLeftJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.MergeSortSemiJoinOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeAlignedDeviceViewAggregationScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeAlignedDeviceViewScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeNonAlignedDeviceViewAggregationScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeToTableViewAdaptorOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastByDescAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastDescAccumulator; @@ -152,24 +101,13 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; import org.apache.iotdb.db.queryengine.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; 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.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.ConvertPredicateToTimeFilterVisitor; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionKind; -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.NonAlignedDeviceEntry; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceSchemaCache; import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToBlobLiteralVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToBooleanLiteralVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToDateLiteralVisitor; @@ -182,32 +120,20 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; 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.ir.IrUtils; 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.AggregationTreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AlignedAggregationTreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; -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.GroupNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode; 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; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Measure; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.NonAlignedAggregationTreeDeviceViewScanNode; 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.PatternRecognitionNode; @@ -221,16 +147,10 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeAlignedDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; -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.rowpattern.AggregationLabelSet; import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.AggregationValuePointer; import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ClassifierValuePointer; @@ -242,19 +162,11 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ValuePointer; 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; 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.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; 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.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; -import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; -import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; -import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; @@ -271,34 +183,18 @@ import org.apache.tsfile.file.metadata.idcolumn.FourOrHigherLevelDBExtractor; import org.apache.tsfile.file.metadata.idcolumn.ThreeLevelDBExtractor; import org.apache.tsfile.file.metadata.idcolumn.TwoLevelDBExtractor; -import org.apache.tsfile.read.TimeValuePair; -import org.apache.tsfile.read.common.TimeRange; import org.apache.tsfile.read.common.block.column.BinaryColumn; import org.apache.tsfile.read.common.block.column.BooleanColumn; import org.apache.tsfile.read.common.block.column.DoubleColumn; import org.apache.tsfile.read.common.block.column.FloatColumn; import org.apache.tsfile.read.common.block.column.IntColumn; import org.apache.tsfile.read.common.block.column.LongColumn; -import org.apache.tsfile.read.common.type.BinaryType; -import org.apache.tsfile.read.common.type.BlobType; -import org.apache.tsfile.read.common.type.BooleanType; -import org.apache.tsfile.read.common.type.ObjectType; import org.apache.tsfile.read.common.type.Type; -import org.apache.tsfile.read.common.type.TypeFactory; -import org.apache.tsfile.read.filter.basic.Filter; import org.apache.tsfile.utils.Binary; -import org.apache.tsfile.utils.Pair; -import org.apache.tsfile.utils.RamUsageEstimator; -import org.apache.tsfile.utils.TsPrimitiveType; -import org.apache.tsfile.write.schema.IMeasurementSchema; -import org.apache.tsfile.write.schema.MeasurementSchema; - -import javax.validation.constraints.NotNull; import java.io.File; import java.util.AbstractMap; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; @@ -306,10 +202,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.OptionalInt; -import java.util.OptionalLong; import java.util.Set; import java.util.function.BiFunction; import java.util.stream.Collectors; @@ -320,56 +214,39 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; -import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; -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.process.rowpattern.PhysicalValuePointer.CLASSIFIER; import static org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; -import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DELIMITER_BETWEEN_ID; -import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DOWNSTREAM_PLAN_NODE_ID; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.constructAlignedPath; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.InformationSchemaContentSupplierFactory.getSupplier; import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory.createAccumulator; import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory.createBuiltinAccumulator; import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; -import static org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils.convertPredicateToFilter; import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.IDENTITY_FILL; import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.UNKNOWN_DATATYPE; import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.getLinearFill; import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.getPreviousFill; -import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.isFilterGtOrGe; -import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions.updateFilterUsingTTL; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_PRIMITIVE_TYPE; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.DESC_NULLS_LAST; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch.ONE; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition.LAST; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; -import static org.apache.iotdb.db.utils.constant.SqlConstant.AVG; -import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT; -import static org.apache.iotdb.db.utils.constant.SqlConstant.EXTREME; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_BY_AGGREGATION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.MAX; -import static org.apache.iotdb.db.utils.constant.SqlConstant.MIN; -import static org.apache.iotdb.db.utils.constant.SqlConstant.SUM; import static org.apache.tsfile.read.common.type.LongType.INT64; import static org.apache.tsfile.read.common.type.StringType.STRING; import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; /** This Visitor is responsible for transferring Table PlanNode Tree to Table Operator Tree. */ -public class TableOperatorGenerator extends PlanVisitor { +public class TableOperatorGenerator + implements IQueryPlanVisitor { - private final Metadata metadata; + protected final Metadata metadata; public TableOperatorGenerator(Metadata metadata) { this.metadata = metadata; @@ -380,694 +257,6 @@ public Operator visitPlan(PlanNode node, LocalExecutionPlanContext context) { throw new UnsupportedOperationException("should call the concrete visitXX() method"); } - private static final MPPDataExchangeManager MPP_DATA_EXCHANGE_MANAGER = - MPPDataExchangeService.getInstance().getMPPDataExchangeManager(); - - @Override - public Operator visitIdentitySink(IdentitySinkNode node, LocalExecutionPlanContext context) { - context.addExchangeSumNum(1); - OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - IdentitySinkOperator.class.getSimpleName()); - String downStreamPlanNodeId = - node.getDownStreamChannelLocationList().stream() - .map(DownStreamChannelLocation::getRemotePlanNodeId) - .collect(Collectors.joining(DELIMITER_BETWEEN_ID)); - if (!downStreamPlanNodeId.isEmpty()) { - operatorContext.recordSpecifiedInfo(DOWNSTREAM_PLAN_NODE_ID, downStreamPlanNodeId); - } - checkArgument( - MPP_DATA_EXCHANGE_MANAGER != null, "MPP_DATA_EXCHANGE_MANAGER should not be null"); - FragmentInstanceId localInstanceId = context.getInstanceContext().getId(); - DownStreamChannelIndex downStreamChannelIndex = new DownStreamChannelIndex(0); - ISinkHandle sinkHandle = - MPP_DATA_EXCHANGE_MANAGER.createShuffleSinkHandle( - node.getDownStreamChannelLocationList(), - downStreamChannelIndex, - ShuffleSinkHandle.ShuffleStrategyEnum.PLAIN, - localInstanceId.toThrift(), - node.getPlanNodeId().getId(), - context.getInstanceContext()); - - if (node.getChildren().size() == 1) { - Operator child = node.getChildren().get(0).accept(this, context); - List children = new ArrayList<>(1); - children.add(child); - sinkHandle.setMaxBytesCanReserve(context.getMaxBytesOneHandleCanReserve()); - context.getDriverContext().setSink(sinkHandle); - return new IdentitySinkOperator( - operatorContext, children, downStreamChannelIndex, sinkHandle); - } else { - throw new IllegalStateException( - "IdentitySinkNode should only have one child in table model."); - } - } - - @Override - public Operator visitTableExchange(ExchangeNode node, LocalExecutionPlanContext context) { - OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - ExchangeOperator.class.getSimpleName()); - - FragmentInstanceId localInstanceId = context.getInstanceContext().getId(); - FragmentInstanceId remoteInstanceId = node.getUpstreamInstanceId(); - - TEndPoint upstreamEndPoint = node.getUpstreamEndpoint(); - boolean isSameNode = isSameNode(upstreamEndPoint); - ISourceHandle sourceHandle = - isSameNode - ? MPP_DATA_EXCHANGE_MANAGER.createLocalSourceHandleForFragment( - localInstanceId.toThrift(), - node.getPlanNodeId().getId(), - node.getUpstreamPlanNodeId().getId(), - remoteInstanceId.toThrift(), - node.getIndexOfUpstreamSinkHandle(), - context.getInstanceContext()::failed) - : MPP_DATA_EXCHANGE_MANAGER.createSourceHandle( - localInstanceId.toThrift(), - node.getPlanNodeId().getId(), - node.getIndexOfUpstreamSinkHandle(), - upstreamEndPoint, - remoteInstanceId.toThrift(), - context.getInstanceContext()::failed); - if (!isSameNode) { - context.addExchangeSumNum(1); - } - sourceHandle.setMaxBytesCanReserve(context.getMaxBytesOneHandleCanReserve()); - ExchangeOperator exchangeOperator = - new ExchangeOperator(operatorContext, sourceHandle, node.getUpstreamPlanNodeId()); - context.addExchangeOperator(exchangeOperator); - return exchangeOperator; - } - - @Override - public Operator visitTreeNonAlignedDeviceViewScan( - TreeNonAlignedDeviceViewScanNode node, LocalExecutionPlanContext context) { - - boolean containsFieldColumn = false; - for (Map.Entry entry : node.getAssignments().entrySet()) { - if (entry.getValue().getColumnCategory() == FIELD) { - containsFieldColumn = true; - break; - } - } - TsTable tsTable = - DataNodeTableCache.getInstance() - .getTable( - node.getQualifiedObjectName().getDatabaseName(), - node.getQualifiedObjectName().getObjectName()); - if (!containsFieldColumn) { - Map newAssignments = new LinkedHashMap<>(node.getAssignments()); - for (TsTableColumnSchema columnSchema : tsTable.getColumnList()) { - if (columnSchema.getColumnCategory() == FIELD) { - newAssignments.put( - new Symbol(columnSchema.getColumnName()), - new ColumnSchema( - columnSchema.getColumnName(), - TypeFactory.getType(columnSchema.getDataType()), - false, - columnSchema.getColumnCategory())); - containsFieldColumn = true; - } - } - node.setAssignments(newAssignments); - } - // For non-aligned series, scan cannot be performed when no field columns - // can be obtained, so an empty result set is returned. - if (!containsFieldColumn || node.getDeviceEntries().isEmpty()) { - OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - EmptyDataOperator.class.getSimpleName()); - return new EmptyDataOperator(operatorContext); - } - String treePrefixPath = DataNodeTreeViewSchemaUtils.getPrefixPath(tsTable); - IDeviceID.TreeDeviceIdColumnValueExtractor extractor = - TableOperatorGenerator.createTreeDeviceIdColumnValueExtractor(treePrefixPath); - long viewTTL = tsTable.getCachedTableTTL(); - - DeviceIteratorScanOperator.TreeNonAlignedDeviceViewScanParameters parameter = - constructTreeNonAlignedDeviceViewScanOperatorParameter( - node, - context, - TreeNonAlignedDeviceViewScanNode.class.getSimpleName(), - node.getMeasurementColumnNameMap(), - extractor, - viewTTL); - - DeviceIteratorScanOperator treeNonAlignedDeviceIteratorScanOperator = - new DeviceIteratorScanOperator( - parameter.context, parameter.deviceEntries, parameter.generator); - addSource( - treeNonAlignedDeviceIteratorScanOperator, - context, - node, - parameter.measurementColumnNames, - parameter.measurementSchemas, - parameter.allSensors, - TreeNonAlignedDeviceViewScanNode.class.getSimpleName()); - - if (!parameter.generator.keepOffsetAndLimitOperatorAfterDeviceIterator()) { - return treeNonAlignedDeviceIteratorScanOperator; - } - Operator operator = treeNonAlignedDeviceIteratorScanOperator; - if (node.getPushDownOffset() > 0) { - operator = new OffsetOperator(parameter.context, node.getPushDownOffset(), operator); - } - if (node.getPushDownLimit() > 0) { - operator = new LimitOperator(parameter.context, node.getPushDownLimit(), operator); - } - return operator; - } - - private DeviceIteratorScanOperator.TreeNonAlignedDeviceViewScanParameters - constructTreeNonAlignedDeviceViewScanOperatorParameter( - TreeNonAlignedDeviceViewScanNode node, - LocalExecutionPlanContext context, - String className, - Map fieldColumnsRenameMap, - IDeviceID.TreeDeviceIdColumnValueExtractor extractor, - long viewTTL) { - if (node.isPushLimitToEachDevice() && node.getPushDownOffset() > 0) { - throw new IllegalArgumentException( - "PushDownOffset should not be set when isPushLimitToEachDevice is true."); - } - CommonTableScanOperatorParameters commonParameter = - new CommonTableScanOperatorParameters(node, fieldColumnsRenameMap, true); - List measurementSchemas = commonParameter.measurementSchemas; - List measurementSchemaIndex2Symbols = commonParameter.measurementSchemaIndex2Symbol; - List measurementColumnNames = commonParameter.measurementColumnNames; - List fullColumnSchemas = commonParameter.columnSchemas; - List symbolInputs = commonParameter.symbolInputs; - int[] columnsIndexArray = commonParameter.columnsIndexArray; - - boolean isSingleColumn = measurementSchemas.size() == 1; - - OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext(context.getNextOperatorId(), node.getPlanNodeId(), className); - - Set allSensors = new HashSet<>(measurementColumnNames); - - DeviceIteratorScanOperator.DeviceChildOperatorTreeGenerator deviceChildOperatorTreeGenerator = - new DeviceIteratorScanOperator.DeviceChildOperatorTreeGenerator() { - - private Operator operator; - private List seriesScanOptionsList; - private List seriesScanOperators; - private FilterAndProjectOperator filterAndProjectOperator; - private OffsetOperator reuseOffsetOperator; - private LimitOperator reuseLimitOperator; - private Operator startCloseInternalOperator; - - private List cannotPushDownConjuncts; - private boolean removeUpperOffsetAndLimitOperator; - - private final long INSTANCE_SIZE = - RamUsageEstimator.shallowSizeOfInstance(this.getClass()); - - @Override - public long ramBytesUsed() { - return INSTANCE_SIZE - + (seriesScanOptionsList == null - ? 0L - : seriesScanOptionsList.stream() - .mapToLong(seriesScanOption -> seriesScanOption.ramBytesUsed()) - .sum()); - } - - @Override - public boolean keepOffsetAndLimitOperatorAfterDeviceIterator() { - calculateSeriesScanOptionsList(); - return !removeUpperOffsetAndLimitOperator && !node.isPushLimitToEachDevice(); - } - - @Override - public void generateCurrentDeviceOperatorTree( - DeviceEntry deviceEntry, boolean needAdaptor) { - calculateSeriesScanOptionsList(); - if (needAdaptor) { - operator = constructTreeToTableViewAdaptorOperator(deviceEntry); - } else { - seriesScanOperators = new ArrayList<>(measurementSchemas.size()); - operator = constructAndJoinScanOperators(deviceEntry); - } - boolean needToPruneColumn = - node.getAssignments().size() != node.getOutputSymbols().size(); - if (isSingleColumn) { - operator = needToPruneColumn ? getFilterAndProjectOperator(operator) : operator; - return; - } - if (!cannotPushDownConjuncts.isEmpty() || needToPruneColumn) { - operator = getFilterAndProjectOperator(operator); - } - if (!node.isPushLimitToEachDevice() || removeUpperOffsetAndLimitOperator) { - return; - } - if (node.getPushDownLimit() > 0) { - operator = new LimitOperator(operatorContext, node.getPushDownLimit(), operator); - } - } - - private void calculateSeriesScanOptionsList() { - if (seriesScanOptionsList != null) { - return; - } - seriesScanOptionsList = new ArrayList<>(measurementSchemas.size()); - cannotPushDownConjuncts = new ArrayList<>(); - Map> pushDownConjunctsForEachMeasurement = new HashMap<>(); - if (node.getPushDownPredicate() != null) { - List conjuncts = IrUtils.extractConjuncts(node.getPushDownPredicate()); - for (Expression conjunct : conjuncts) { - Set symbols = SymbolsExtractor.extractUnique(conjunct); - boolean containsMultiDataSource = symbols.size() > 1; - if (containsMultiDataSource) { - cannotPushDownConjuncts.add(conjunct); - continue; - } - Symbol symbol = symbols.iterator().next(); - pushDownConjunctsForEachMeasurement - .computeIfAbsent(symbol, k -> new ArrayList<>()) - .add(conjunct); - } - } - - // Using getSeriesScanOptionsBuilder to create SeriesScanBuilder will cause multiple - // calls to setTimeFilterForTableModel and generate a deeply nested Or filter. - // Therefore, a separate setting is made here - Filter timeFilter = null; - if (node.getTimePredicate().isPresent()) { - Expression timePredicate = node.getTimePredicate().get(); - timeFilter = - timePredicate.accept( - new ConvertPredicateToTimeFilterVisitor( - context.getZoneId(), TimestampPrecisionUtils.currPrecision), - null); - context - .getDriverContext() - .getFragmentInstanceContext() - .setTimeFilterForTableModel(timeFilter); - } - - boolean canPushDownLimit = cannotPushDownConjuncts.isEmpty(); - // only use full outer time join - boolean canPushDownLimitToAllSeriesScanOptions = - canPushDownLimit && pushDownConjunctsForEachMeasurement.isEmpty(); - // the left child of LeftOuterTimeJoinOperator is SeriesScanOperator - boolean pushDownOffsetAndLimitToLeftChildSeriesScanOperator = - canPushDownLimit && pushDownConjunctsForEachMeasurement.size() == 1; - // the left child of LeftOuterTimeJoinOperator is InnerTimeJoinOperator - boolean pushDownOffsetAndLimitAfterInnerJoinOperator = - canPushDownLimit && pushDownConjunctsForEachMeasurement.size() > 1; - removeUpperOffsetAndLimitOperator = - pushDownOffsetAndLimitToLeftChildSeriesScanOperator - || pushDownOffsetAndLimitAfterInnerJoinOperator - || isSingleColumn; - for (Symbol symbol : measurementSchemaIndex2Symbols) { - List pushDownPredicatesForCurrentMeasurement = - pushDownConjunctsForEachMeasurement.get(symbol); - Expression pushDownPredicateForCurrentMeasurement = - isSingleColumn - ? node.getPushDownPredicate() - : (pushDownPredicatesForCurrentMeasurement == null - ? null - : IrUtils.combineConjuncts(pushDownPredicatesForCurrentMeasurement)); - SeriesScanOptions.Builder builder = new SeriesScanOptions.Builder(); - // time filter may be stateful, so we need to copy it - builder.withGlobalTimeFilter(timeFilter == null ? null : timeFilter.copy()); - builder.withIsTableViewForTreeModel(true).withAllSensors(allSensors); - if (pushDownPredicateForCurrentMeasurement != null) { - builder.withPushDownFilter( - convertPredicateToFilter( - pushDownPredicateForCurrentMeasurement, - Collections.singletonMap(symbol.getName(), 0), - commonParameter.columnSchemaMap, - commonParameter.timeColumnName, - context.getZoneId(), - TimestampPrecisionUtils.currPrecision)); - } - if (isSingleColumn - || (pushDownOffsetAndLimitToLeftChildSeriesScanOperator - && pushDownPredicateForCurrentMeasurement != null)) { - builder.withPushDownLimit(node.getPushDownLimit()); - builder.withPushLimitToEachDevice(node.isPushLimitToEachDevice()); - } - - // In the case of single column, both offset and limit are pushed down to the - // SeriesScanOperator - if (!isSingleColumn && canPushDownLimitToAllSeriesScanOptions) { - builder.withPushDownLimit(node.getPushDownLimit() + node.getPushDownOffset()); - } - if (isSingleColumn - || (pushDownOffsetAndLimitToLeftChildSeriesScanOperator - && pushDownPredicateForCurrentMeasurement != null)) { - builder.withPushDownOffset( - node.isPushLimitToEachDevice() ? 0 : node.getPushDownOffset()); - } - SeriesScanOptions options = builder.build(); - options.setTTLForTableView(viewTTL); - seriesScanOptionsList.add(options); - } - } - - private Operator constructTreeToTableViewAdaptorOperator(DeviceEntry deviceEntry) { - seriesScanOperators = new ArrayList<>(measurementSchemas.size()); - operator = constructAndJoinScanOperators(deviceEntry); - return new TreeToTableViewAdaptorOperator( - operatorContext, - deviceEntry, - columnsIndexArray, - fullColumnSchemas, - operator, - extractor); - } - - private Operator constructAndJoinScanOperators(DeviceEntry deviceEntry) { - List childrenWithPushDownPredicate = new ArrayList<>(); - List innerJoinDataTypeList = new ArrayList<>(); - List childrenWithoutPushDownPredicate = new ArrayList<>(); - List fullOuterTimeJoinDataTypeList = new ArrayList<>(); - Map leftOuterJoinColumnIndexMap = new HashMap<>(); - for (int i = 0; i < measurementSchemas.size(); i++) { - IMeasurementSchema measurementSchema = measurementSchemas.get(i); - NonAlignedFullPath path = - new NonAlignedFullPath(deviceEntry.getDeviceID(), measurementSchema); - SeriesScanOptions seriesScanOptions = seriesScanOptionsList.get(i); - Operator seriesScanOperator = - new SeriesScanOperator( - operatorContext, - node.getPlanNodeId(), - path, - node.getScanOrder(), - seriesScanOptions); - seriesScanOperators.add(seriesScanOperator); - if (seriesScanOptions.getPushDownFilter() != null) { - childrenWithPushDownPredicate.add(seriesScanOperator); - innerJoinDataTypeList.add(measurementSchema.getType()); - leftOuterJoinColumnIndexMap.put( - new InputLocation(0, childrenWithPushDownPredicate.size() - 1), i); - } else { - childrenWithoutPushDownPredicate.add(seriesScanOperator); - fullOuterTimeJoinDataTypeList.add(measurementSchema.getType()); - leftOuterJoinColumnIndexMap.put( - new InputLocation(1, childrenWithoutPushDownPredicate.size() - 1), i); - } - } - Operator leftChild = - generateInnerTimeJoinOperator(childrenWithPushDownPredicate, innerJoinDataTypeList); - Operator rightChild = - generateFullOuterTimeJoinOperator( - childrenWithoutPushDownPredicate, fullOuterTimeJoinDataTypeList); - return generateLeftOuterTimeJoinOperator( - leftChild, - rightChild, - childrenWithPushDownPredicate.size(), - leftOuterJoinColumnIndexMap, - IMeasurementSchema.getDataTypeList(measurementSchemas)); - } - - private Operator generateInnerTimeJoinOperator( - List operators, List dataTypes) { - if (operators.isEmpty()) { - return null; - } - if (operators.size() == 1) { - return operators.get(0); - } - Map outputColumnMap = new HashMap<>(); - for (int i = 0; i < operators.size(); i++) { - outputColumnMap.put(new InputLocation(i, 0), i); - } - Operator currentOperator = - new InnerTimeJoinOperator( - operatorContext, - operators, - dataTypes, - node.getScanOrder() == Ordering.ASC - ? new AscTimeComparator() - : new DescTimeComparator(), - outputColumnMap); - boolean addOffsetAndLimitOperatorAfterLeftChild = - operators.size() > 1 && cannotPushDownConjuncts.isEmpty(); - if (addOffsetAndLimitOperatorAfterLeftChild) { - if (node.getPushDownOffset() > 0) { - currentOperator = getReuseOffsetOperator(currentOperator); - } - if (node.getPushDownLimit() > 0) { - currentOperator = getReuseLimitOperator(currentOperator); - } - } - return currentOperator; - } - - private Operator generateFullOuterTimeJoinOperator( - List operators, List dataTypes) { - if (operators.isEmpty()) { - return null; - } - if (operators.size() == 1) { - return operators.get(0); - } - List columnMergers = new ArrayList<>(operators.size()); - for (int i = 0; i < operators.size(); i++) { - columnMergers.add( - new SingleColumnMerger( - new InputLocation(i, 0), - node.getScanOrder() == Ordering.ASC - ? new AscTimeComparator() - : new DescTimeComparator())); - } - return new FullOuterTimeJoinOperator( - operatorContext, - operators, - node.getScanOrder(), - dataTypes, - columnMergers, - node.getScanOrder() == Ordering.ASC - ? new AscTimeComparator() - : new DescTimeComparator()); - } - - private Operator generateLeftOuterTimeJoinOperator( - Operator left, - Operator right, - int leftColumnCount, - Map outputColumnMap, - List dataTypes) { - if (left == null) { - return right; - } else if (right == null) { - return left; - } else { - return new TableLeftOuterTimeJoinOperator( - operatorContext, - left, - right, - leftColumnCount, - outputColumnMap, - dataTypes, - node.getScanOrder() == Ordering.ASC - ? new AscTimeComparator() - : new DescTimeComparator()); - } - } - - private Operator getReuseOffsetOperator(Operator child) { - this.reuseOffsetOperator = - reuseOffsetOperator == null - ? new OffsetOperator(operatorContext, node.getPushDownOffset(), child) - : new OffsetOperator(reuseOffsetOperator, child); - return this.reuseOffsetOperator; - } - - private Operator getReuseLimitOperator(Operator child) { - this.reuseLimitOperator = - reuseLimitOperator == null - ? new LimitOperator(operatorContext, node.getPushDownLimit(), child) - : new LimitOperator(reuseLimitOperator, child); - return this.reuseLimitOperator; - } - - private Operator getFilterAndProjectOperator(Operator childOperator) { - startCloseInternalOperator = childOperator; - if (filterAndProjectOperator != null) { - return new FilterAndProjectOperator(filterAndProjectOperator, childOperator); - } - List inputDataTypeList = new ArrayList<>(fullColumnSchemas.size()); - Map> symbolInputLocationMap = - new HashMap<>(fullColumnSchemas.size()); - for (int i = 0; i < fullColumnSchemas.size(); i++) { - ColumnSchema columnSchema = fullColumnSchemas.get(i); - symbolInputLocationMap - .computeIfAbsent( - new Symbol(symbolInputs.get(i).getName()), key -> new ArrayList<>()) - .add(new InputLocation(0, i)); - inputDataTypeList.add(getTSDataType(columnSchema.getType())); - } - Expression combinedCannotPushDownPredicates = - cannotPushDownConjuncts.isEmpty() - ? null - : IrUtils.combineConjuncts(cannotPushDownConjuncts); - filterAndProjectOperator = - (FilterAndProjectOperator) - TableOperatorGenerator.this.constructFilterAndProjectOperator( - Optional.ofNullable(combinedCannotPushDownPredicates), - childOperator, - node.getOutputSymbols().stream() - .map(Symbol::toSymbolReference) - .toArray(Expression[]::new), - inputDataTypeList, - symbolInputLocationMap, - node.getPlanNodeId(), - context); - return filterAndProjectOperator; - } - - @Override - public Operator getCurrentDeviceRootOperator() { - return operator; - } - - @Override - public List getCurrentDeviceDataSourceOperators() { - return seriesScanOperators; - } - - @Override - public Operator getCurrentDeviceStartCloseOperator() { - return startCloseInternalOperator == null ? operator : startCloseInternalOperator; - } - }; - - return new DeviceIteratorScanOperator.TreeNonAlignedDeviceViewScanParameters( - allSensors, - operatorContext, - node.getDeviceEntries(), - measurementColumnNames, - measurementSchemas, - deviceChildOperatorTreeGenerator); - } - - private static class CommonTableScanOperatorParameters { - - List outputColumnNames; - List columnSchemas; - List symbolInputs; - int[] columnsIndexArray; - Map columnSchemaMap; - Map tagAndAttributeColumnsIndexMap; - List measurementColumnNames; - Map measurementColumnsIndexMap; - String timeColumnName; - List measurementSchemas; - List measurementSchemaIndex2Symbol; - int measurementColumnCount; - int idx; - - private CommonTableScanOperatorParameters( - DeviceTableScanNode node, - Map fieldColumnsRenameMap, - boolean keepNonOutputMeasurementColumns) { - outputColumnNames = node.getOutputSymbols(); - int outputColumnCount = - keepNonOutputMeasurementColumns ? node.getAssignments().size() : outputColumnNames.size(); - columnSchemas = new ArrayList<>(outputColumnCount); - symbolInputs = new ArrayList<>(outputColumnCount); - columnsIndexArray = new int[outputColumnCount]; - columnSchemaMap = node.getAssignments(); - tagAndAttributeColumnsIndexMap = node.getTagAndAttributeIndexMap(); - measurementColumnNames = new ArrayList<>(); - measurementColumnsIndexMap = new HashMap<>(); - measurementSchemas = new ArrayList<>(); - measurementSchemaIndex2Symbol = new ArrayList<>(); - measurementColumnCount = 0; - idx = 0; - - boolean addedTimeColumn = false; - for (Symbol columnName : outputColumnNames) { - ColumnSchema schema = - requireNonNull(columnSchemaMap.get(columnName), columnName + " is null"); - - symbolInputs.add(columnName); - switch (schema.getColumnCategory()) { - case TAG: - case ATTRIBUTE: - columnsIndexArray[idx++] = - requireNonNull( - tagAndAttributeColumnsIndexMap.get(columnName), columnName + " is null"); - columnSchemas.add(schema); - break; - case FIELD: - columnsIndexArray[idx++] = measurementColumnCount; - measurementColumnCount++; - - String realMeasurementName = - fieldColumnsRenameMap.getOrDefault(schema.getName(), schema.getName()); - - measurementColumnNames.add(realMeasurementName); - measurementSchemas.add( - new MeasurementSchema(realMeasurementName, getTSDataType(schema.getType()))); - measurementSchemaIndex2Symbol.add(columnName); - columnSchemas.add(schema); - measurementColumnsIndexMap.put(columnName.getName(), measurementColumnCount - 1); - break; - case TIME: - columnsIndexArray[idx++] = -1; - columnSchemas.add(schema); - timeColumnName = columnName.getName(); - addedTimeColumn = true; - break; - default: - throw new IllegalArgumentException( - "Unexpected column category: " + schema.getColumnCategory()); - } - } - Set outputSet = new HashSet<>(outputColumnNames); - for (Map.Entry entry : node.getAssignments().entrySet()) { - if (!outputSet.contains(entry.getKey()) && entry.getValue().getColumnCategory() == FIELD) { - if (keepNonOutputMeasurementColumns) { - columnSchemas.add(entry.getValue()); - columnsIndexArray[idx++] = measurementColumnCount; - symbolInputs.add(entry.getKey()); - } - measurementColumnCount++; - String realMeasurementName = - fieldColumnsRenameMap.getOrDefault( - entry.getValue().getName(), entry.getValue().getName()); - - measurementColumnNames.add(realMeasurementName); - measurementSchemas.add( - new MeasurementSchema( - realMeasurementName, getTSDataType(entry.getValue().getType()))); - measurementSchemaIndex2Symbol.add(entry.getKey()); - measurementColumnsIndexMap.put(entry.getKey().getName(), measurementColumnCount - 1); - } else if (entry.getValue().getColumnCategory() == TIME) { - timeColumnName = entry.getKey().getName(); - // for non aligned series table view scan, here the time column will not be obtained - // through this structure, but we need to ensure that the length of columnSchemas is - // consistent with the length of columnsIndexArray - if (keepNonOutputMeasurementColumns && !addedTimeColumn) { - columnSchemas.add(entry.getValue()); - columnsIndexArray[idx++] = -1; - symbolInputs.add(entry.getKey()); - } - } - } - } - } - public static IDeviceID.TreeDeviceIdColumnValueExtractor createTreeDeviceIdColumnValueExtractor( String treeDBName) { try { @@ -1091,145 +280,6 @@ public static IDeviceID.TreeDeviceIdColumnValueExtractor createTreeDeviceIdColum } } - @Override - public Operator visitTreeAlignedDeviceViewScan( - TreeAlignedDeviceViewScanNode node, LocalExecutionPlanContext context) { - QualifiedObjectName qualifiedObjectName = node.getQualifiedObjectName(); - TsTable tsTable = - DataNodeTableCache.getInstance() - .getTable(qualifiedObjectName.getDatabaseName(), qualifiedObjectName.getObjectName()); - IDeviceID.TreeDeviceIdColumnValueExtractor idColumnValueExtractor = - createTreeDeviceIdColumnValueExtractor(DataNodeTreeViewSchemaUtils.getPrefixPath(tsTable)); - - AbstractTableScanOperator.AbstractTableScanOperatorParameter parameter = - constructAbstractTableScanOperatorParameter( - node, - context, - TreeAlignedDeviceViewScanOperator.class.getSimpleName(), - node.getMeasurementColumnNameMap(), - tsTable.getCachedTableTTL()); - - TreeAlignedDeviceViewScanOperator treeAlignedDeviceViewScanOperator = - new TreeAlignedDeviceViewScanOperator(parameter, idColumnValueExtractor); - - addSource( - treeAlignedDeviceViewScanOperator, - context, - node, - parameter.measurementColumnNames, - parameter.measurementSchemas, - parameter.allSensors, - TreeAlignedDeviceViewScanNode.class.getSimpleName()); - - return treeAlignedDeviceViewScanOperator; - } - - private void addSource( - AbstractDataSourceOperator sourceOperator, - LocalExecutionPlanContext context, - DeviceTableScanNode node, - List measurementColumnNames, - List measurementSchemas, - Set allSensors, - String planNodeName) { - - ((DataDriverContext) context.getDriverContext()).addSourceOperator(sourceOperator); - - for (int i = 0, size = node.getDeviceEntries().size(); i < size; i++) { - DeviceEntry deviceEntry = node.getDeviceEntries().get(i); - if (deviceEntry == null) { - throw new IllegalStateException( - "Device entries of index " + i + " in " + planNodeName + " is empty"); - } - if (deviceEntry instanceof NonAlignedDeviceEntry) { - for (IMeasurementSchema schema : measurementSchemas) { - NonAlignedFullPath nonAlignedFullPath = - new NonAlignedFullPath(deviceEntry.getDeviceID(), schema); - ((DataDriverContext) context.getDriverContext()).addPath(nonAlignedFullPath); - } - } else { - AlignedFullPath alignedPath = - constructAlignedPath( - deviceEntry, measurementColumnNames, measurementSchemas, allSensors); - ((DataDriverContext) context.getDriverContext()).addPath(alignedPath); - } - } - - context.getDriverContext().setInputDriver(true); - } - - private AbstractTableScanOperator.AbstractTableScanOperatorParameter - constructAbstractTableScanOperatorParameter( - DeviceTableScanNode node, - LocalExecutionPlanContext context, - String className, - Map fieldColumnsRenameMap, - long viewTTL) { - - CommonTableScanOperatorParameters commonParameter = - new CommonTableScanOperatorParameters(node, fieldColumnsRenameMap, false); - List measurementSchemas = commonParameter.measurementSchemas; - List measurementColumnNames = commonParameter.measurementColumnNames; - List columnSchemas = commonParameter.columnSchemas; - int[] columnsIndexArray = commonParameter.columnsIndexArray; - SeriesScanOptions seriesScanOptions = - buildSeriesScanOptions( - context, - commonParameter.columnSchemaMap, - measurementColumnNames, - commonParameter.measurementColumnsIndexMap, - commonParameter.timeColumnName, - node.getTimePredicate(), - node.getPushDownLimit(), - node.getPushDownOffset(), - node.isPushLimitToEachDevice(), - node.getPushDownPredicate()); - seriesScanOptions.setTTLForTableView(viewTTL); - seriesScanOptions.setIsTableViewForTreeModel(node instanceof TreeDeviceViewScanNode); - - OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext(context.getNextOperatorId(), node.getPlanNodeId(), className); - - int maxTsBlockLineNum = TSFileDescriptor.getInstance().getConfig().getMaxTsBlockLineNumber(); - if (context.getTypeProvider().getTemplatedInfo() != null) { - maxTsBlockLineNum = - (int) - Math.min( - context.getTypeProvider().getTemplatedInfo().getLimitValue(), maxTsBlockLineNum); - } - - Set allSensors = new HashSet<>(measurementColumnNames); - // for time column - allSensors.add(""); - - return new AbstractTableScanOperator.AbstractTableScanOperatorParameter( - allSensors, - operatorContext, - node.getPlanNodeId(), - columnSchemas, - columnsIndexArray, - node.getDeviceEntries(), - node.getScanOrder(), - seriesScanOptions, - measurementColumnNames, - measurementSchemas, - maxTsBlockLineNum); - } - - // used for TableScanOperator - private AbstractTableScanOperator.AbstractTableScanOperatorParameter - constructAbstractTableScanOperatorParameter( - DeviceTableScanNode node, LocalExecutionPlanContext context) { - return constructAbstractTableScanOperatorParameter( - node, - context, - TableScanOperator.class.getSimpleName(), - Collections.emptyMap(), - Long.MAX_VALUE); - } - @Override public Operator visitCteScan(CteScanNode node, LocalExecutionPlanContext context) { OperatorContext operatorContext = @@ -1246,44 +296,6 @@ public Operator visitCteScan(CteScanNode node, LocalExecutionPlanContext context context.getFragmentInstanceId().getQueryId()); } - @Override - public Operator visitTreeDeviceViewScan( - TreeDeviceViewScanNode node, LocalExecutionPlanContext context) { - if (node.getDeviceEntries().isEmpty() || node.getTreeDBName() == null) { - OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - EmptyDataOperator.class.getSimpleName()); - return new EmptyDataOperator(operatorContext); - } - throw new IllegalArgumentException("Valid TreeDeviceViewScanNode is not expected here."); - } - - @Override - public Operator visitDeviceTableScan( - DeviceTableScanNode node, LocalExecutionPlanContext context) { - - AbstractTableScanOperator.AbstractTableScanOperatorParameter parameter = - constructAbstractTableScanOperatorParameter(node, context); - - TableScanOperator tableScanOperator = new TableScanOperator(parameter); - - context.getInstanceContext().collectTable(node.getQualifiedObjectName().getObjectName()); - addSource( - tableScanOperator, - context, - node, - parameter.measurementColumnNames, - parameter.measurementSchemas, - parameter.allSensors, - DeviceTableScanNode.class.getSimpleName()); - - return tableScanOperator; - } - public static Map> makeLayout(final List children) { final Map> outputMappings = new LinkedHashMap<>(); int tsBlockIndex = 0; @@ -1300,7 +312,7 @@ public static Map> makeLayout(final List c return outputMappings; } - private ImmutableMap makeLayoutFromOutputSymbols(List outputSymbols) { + protected ImmutableMap makeLayoutFromOutputSymbols(List outputSymbols) { if (outputSymbols == null) { return ImmutableMap.of(); } @@ -1313,52 +325,6 @@ private ImmutableMap makeLayoutFromOutputSymbols(List o return outputMappings.buildOrThrow(); } - private SeriesScanOptions.Builder getSeriesScanOptionsBuilder( - LocalExecutionPlanContext context, @NotNull Expression timePredicate) { - SeriesScanOptions.Builder scanOptionsBuilder = new SeriesScanOptions.Builder(); - - Filter timeFilter = - timePredicate.accept( - new ConvertPredicateToTimeFilterVisitor( - context.getZoneId(), TimestampPrecisionUtils.currPrecision), - null); - context.getDriverContext().getFragmentInstanceContext().setTimeFilterForTableModel(timeFilter); - // time filter may be stateful, so we need to copy it - scanOptionsBuilder.withGlobalTimeFilter(timeFilter.copy()); - - return scanOptionsBuilder; - } - - @Override - public Operator visitInformationSchemaTableScan( - final InformationSchemaTableScanNode node, final LocalExecutionPlanContext context) { - final OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - InformationSchemaTableScanOperator.class.getSimpleName()); - - final List dataTypes = - node.getOutputSymbols().stream() - .map(symbol -> getTSDataType(context.getTypeProvider().getTableModelType(symbol))) - .collect(Collectors.toList()); - - return new InformationSchemaTableScanOperator( - operatorContext, - node.getPlanNodeId(), - getSupplier( - operatorContext, - dataTypes, - context - .getDriverContext() - .getFragmentInstanceContext() - .getSessionInfo() - .getUserEntity(), - node)); - } - @Override public Operator visitFilter(FilterNode node, LocalExecutionPlanContext context) { TypeProvider typeProvider = context.getTypeProvider(); @@ -1377,7 +343,7 @@ public Operator visitFilter(FilterNode node, LocalExecutionPlanContext context) context); } - private Operator constructFilterAndProjectOperator( + protected Operator constructFilterAndProjectOperator( Optional predicate, Operator inputOperator, Expression[] projectExpressions, @@ -1990,13 +956,13 @@ public Operator visitTopK(TopKNode node, LocalExecutionPlanContext context) { node.isChildrenDataInOrder()); } - private List getOutputColumnTypes(PlanNode node, TypeProvider typeProvider) { + protected List getOutputColumnTypes(PlanNode node, TypeProvider typeProvider) { return node.getOutputSymbols().stream() .map(s -> getTSDataType(typeProvider.getTableModelType(s))) .collect(Collectors.toList()); } - private void genSortInformation( + protected void genSortInformation( List outputSymbols, OrderingScheme orderingScheme, List sortItemIndexList, @@ -2306,7 +1272,7 @@ public Operator visitJoin(JoinNode node, LocalExecutionPlanContext context) { throw new IllegalStateException("Unsupported join type: " + node.getJoinType()); } - private void semanticCheckForJoin(JoinNode node) { + protected void semanticCheckForJoin(JoinNode node) { try { checkArgument( !node.getFilter().isPresent() || node.getFilter().get().equals(TRUE_LITERAL), @@ -2321,7 +1287,7 @@ private void semanticCheckForJoin(JoinNode node) { } } - private BiFunction buildUpdateLastRowFunction(Type joinKeyType) { + protected BiFunction buildUpdateLastRowFunction(Type joinKeyType) { switch (joinKeyType.getTypeEnum()) { case INT32: return (inputColumn, rowIndex) -> @@ -2409,7 +1375,7 @@ public Operator visitSemiJoin(SemiJoinNode node, LocalExecutionPlanContext conte dataTypes); } - private void checkIfJoinKeyTypeMatches(Type leftJoinKeyType, Type rightJoinKeyType) { + protected void checkIfJoinKeyTypeMatches(Type leftJoinKeyType, Type rightJoinKeyType) { if (leftJoinKeyType != rightJoinKeyType) { throw new SemanticException( "Join key type mismatch. Left join key type: " @@ -2448,125 +1414,6 @@ public Operator visitAssignUniqueId(AssignUniqueId node, LocalExecutionPlanConte return new AssignUniqueIdOperator(operatorContext, child); } - @Override - public Operator visitCountMerge( - final CountSchemaMergeNode node, final LocalExecutionPlanContext context) { - final OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - CountMergeOperator.class.getSimpleName()); - final List children = new ArrayList<>(node.getChildren().size()); - for (final PlanNode child : node.getChildren()) { - children.add(this.process(child, context)); - } - return new CountMergeOperator(operatorContext, children); - } - - @Override - public Operator visitTableDeviceFetch( - final TableDeviceFetchNode node, final LocalExecutionPlanContext context) { - final OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - SchemaQueryScanOperator.class.getSimpleName()); - return new SchemaQueryScanOperator<>( - node.getPlanNodeId(), - operatorContext, - SchemaSourceFactory.getTableDeviceFetchSource( - node.getDatabase(), - node.getTableName(), - node.getDeviceIdList(), - node.getColumnHeaderList())); - } - - @Override - public Operator visitTableDeviceQueryScan( - final TableDeviceQueryScanNode node, final LocalExecutionPlanContext context) { - // Query scan use filterNode directly - final TsTable table = - DataNodeTableCache.getInstance().getTable(node.getDatabase(), node.getTableName()); - final SchemaQueryScanOperator operator = - new SchemaQueryScanOperator<>( - node.getPlanNodeId(), - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - SchemaQueryScanOperator.class.getSimpleName()), - SchemaSourceFactory.getTableDeviceQuerySource( - node.getDatabase(), - table, - node.getTagDeterminedFilterList(), - node.getColumnHeaderList(), - node.getColumnHeaderList().stream() - .map(columnHeader -> table.getColumnSchema(columnHeader.getColumnName())) - .collect(Collectors.toList()), - null, - node.isNeedAligned())); - operator.setLimit(node.getLimit()); - return operator; - } - - @Override - public Operator visitTableDeviceQueryCount( - final TableDeviceQueryCountNode node, final LocalExecutionPlanContext context) { - final String database = node.getDatabase(); - final TsTable table = DataNodeTableCache.getInstance().getTable(database, node.getTableName()); - final List columnSchemaList = - node.getColumnHeaderList().stream() - .map(columnHeader -> table.getColumnSchema(columnHeader.getColumnName())) - .collect(Collectors.toList()); - - // In "count" we have to reuse filter operator per "next" - final List filterLeafColumnTransformerList = new ArrayList<>(); - FragmentInstanceContext fragmentInstanceContext = - context.getDriverContext().getFragmentInstanceContext(); - return new SchemaCountOperator<>( - node.getPlanNodeId(), - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - SchemaCountOperator.class.getSimpleName()), - SchemaSourceFactory.getTableDeviceQuerySource( - database, - table, - node.getTagDeterminedFilterList(), - node.getColumnHeaderList(), - columnSchemaList, - Objects.nonNull(node.getTagFuzzyPredicate()) - ? new DevicePredicateFilter( - filterLeafColumnTransformerList, - new ColumnTransformerBuilder() - .process( - node.getTagFuzzyPredicate(), - new ColumnTransformerBuilder.Context( - fragmentInstanceContext.getSessionInfo(), - filterLeafColumnTransformerList, - makeLayout(Collections.singletonList(node)), - new HashMap<>(), - ImmutableMap.of(), - ImmutableList.of(), - ImmutableList.of(), - 0, - context.getTypeProvider(), - metadata, - fragmentInstanceContext)), - columnSchemaList, - database, - table) - : null, - false)); - } - @Override public Operator visitAggregation(AggregationNode node, LocalExecutionPlanContext context) { @@ -2614,7 +1461,7 @@ private Operator planGlobalAggregation( } // timeColumnName and measurementColumnNames will only be set for AggTableScan. - private TableAggregator buildAggregator( + protected TableAggregator buildAggregator( Map childLayout, Symbol symbol, AggregationNode.Aggregation aggregation, @@ -2661,7 +1508,7 @@ private TableAggregator buildAggregator( maskChannel); } - private Operator planGroupByAggregation( + protected Operator planGroupByAggregation( AggregationNode node, Operator child, TypeProvider typeProvider, @@ -2792,7 +1639,7 @@ private Operator planGroupByAggregation( Long.MAX_VALUE); } - private Comparator genGroupKeyComparator( + protected Comparator genGroupKeyComparator( List groupTypes, List groupByChannels) { return getComparatorForTable( // SortOrder is not sensitive here, the comparator is just used to judge equality. @@ -2801,7 +1648,7 @@ private Comparator genGroupKeyComparator( groupTypes.stream().map(InternalTypeManager::getTSDataType).collect(Collectors.toList())); } - private static List getChannelsForSymbols( + protected static List getChannelsForSymbols( List symbols, Map layout) { ImmutableList.Builder builder = ImmutableList.builder(); for (Symbol symbol : symbols) { @@ -2810,7 +1657,7 @@ private static List getChannelsForSymbols( return builder.build(); } - private GroupedAggregator buildGroupByAggregator( + protected GroupedAggregator buildGroupByAggregator( Map childLayout, Symbol symbol, AggregationNode.Aggregation aggregation, @@ -2850,661 +1697,6 @@ private GroupedAggregator buildGroupByAggregator( maskChannel); } - @Override - public Operator visitAggregationTreeDeviceViewScan( - AggregationTreeDeviceViewScanNode node, LocalExecutionPlanContext context) { - throw new UnsupportedOperationException( - "The AggregationTreeDeviceViewScanNode should has been transferred to its child class node"); - } - - @Override - public Operator visitAlignedAggregationTreeDeviceViewScan( - AlignedAggregationTreeDeviceViewScanNode node, LocalExecutionPlanContext context) { - QualifiedObjectName qualifiedObjectName = node.getQualifiedObjectName(); - TsTable tsTable = - DataNodeTableCache.getInstance() - .getTable(qualifiedObjectName.getDatabaseName(), qualifiedObjectName.getObjectName()); - IDeviceID.TreeDeviceIdColumnValueExtractor idColumnValueExtractor = - createTreeDeviceIdColumnValueExtractor(DataNodeTreeViewSchemaUtils.getPrefixPath(tsTable)); - - AbstractAggTableScanOperator.AbstractAggTableScanOperatorParameter parameter = - constructAbstractAggTableScanOperatorParameter( - node, - context, - TreeAlignedDeviceViewAggregationScanOperator.class.getSimpleName(), - node.getMeasurementColumnNameMap(), - tsTable.getCachedTableTTL()); - - TreeAlignedDeviceViewAggregationScanOperator treeAlignedDeviceViewAggregationScanOperator = - new TreeAlignedDeviceViewAggregationScanOperator(parameter, idColumnValueExtractor); - - addSource( - treeAlignedDeviceViewAggregationScanOperator, - context, - node, - parameter.getMeasurementColumnNames(), - parameter.getMeasurementSchemas(), - parameter.getAllSensors(), - AlignedAggregationTreeDeviceViewScanNode.class.getSimpleName()); - return treeAlignedDeviceViewAggregationScanOperator; - } - - @Override - public Operator visitNonAlignedAggregationTreeDeviceViewScan( - NonAlignedAggregationTreeDeviceViewScanNode node, LocalExecutionPlanContext context) { - QualifiedObjectName qualifiedObjectName = node.getQualifiedObjectName(); - TsTable tsTable = - DataNodeTableCache.getInstance() - .getTable(qualifiedObjectName.getDatabaseName(), qualifiedObjectName.getObjectName()); - IDeviceID.TreeDeviceIdColumnValueExtractor idColumnValueExtractor = - createTreeDeviceIdColumnValueExtractor(DataNodeTreeViewSchemaUtils.getPrefixPath(tsTable)); - - AbstractAggTableScanOperator.AbstractAggTableScanOperatorParameter parameter = - constructAbstractAggTableScanOperatorParameter( - node, - context, - TreeNonAlignedDeviceViewAggregationScanOperator.class.getSimpleName(), - node.getMeasurementColumnNameMap(), - tsTable.getCachedTableTTL()); - - // construct source operator (generator) - TreeNonAlignedDeviceViewScanNode scanNode = - new TreeNonAlignedDeviceViewScanNode( - node.getPlanNodeId(), - node.getQualifiedObjectName(), - // the outputSymbols of TreeNonAlignedDeviceViewAggregationScanOperator is not equals - // with TreeNonAlignedDeviceViewScanNode - parameter.getOutputSymbols(), - node.getAssignments(), - node.getDeviceEntries(), - node.getTagAndAttributeIndexMap(), - node.getScanOrder(), - node.getTimePredicate().orElse(null), - node.getPushDownPredicate(), - node.getPushDownLimit(), - node.getPushDownOffset(), - node.isPushLimitToEachDevice(), - true, - node.getTreeDBName(), - node.getMeasurementColumnNameMap()); - - Operator sourceOperator = visitTreeNonAlignedDeviceViewScan(scanNode, context); - if (!(sourceOperator instanceof EmptyDataOperator)) { - // Use deviceChildOperatorTreeGenerator directly, we will control switch of devices in - // TreeNonAlignedDeviceViewAggregationScanOperator - TreeNonAlignedDeviceViewAggregationScanOperator aggTableScanOperator = - new TreeNonAlignedDeviceViewAggregationScanOperator( - parameter, - idColumnValueExtractor, - ((DeviceIteratorScanOperator) sourceOperator).getDeviceChildOperatorTreeGenerator()); - - addSource( - aggTableScanOperator, - context, - node, - parameter.getMeasurementColumnNames(), - parameter.getMeasurementSchemas(), - parameter.getAllSensors(), - NonAlignedAggregationTreeDeviceViewScanNode.class.getSimpleName()); - return aggTableScanOperator; - } else { - // source data is empty, return directly - return sourceOperator; - } - } - - private AbstractAggTableScanOperator.AbstractAggTableScanOperatorParameter - constructAbstractAggTableScanOperatorParameter( - AggregationTableScanNode node, - LocalExecutionPlanContext context, - String className, - Map fieldColumnsRenameMap, - long tableViewTTL) { - - List measurementColumnNames = new ArrayList<>(); - List measurementSchemas = new ArrayList<>(); - Map measurementColumnsIndexMap = new HashMap<>(); - - List aggregators = new ArrayList<>(node.getAggregations().size()); - List aggregatorInputChannels = - new ArrayList<>( - (int) - node.getAggregations().values().stream() - .mapToLong(aggregation -> aggregation.getArguments().size()) - .sum()); - int aggDistinctArgumentCount = - (int) - node.getAggregations().values().stream() - .flatMap(aggregation -> aggregation.getArguments().stream()) - .map(Symbol::from) - .distinct() - .count(); - List aggColumnSchemas = new ArrayList<>(aggDistinctArgumentCount); - Map aggColumnLayout = new HashMap<>(aggDistinctArgumentCount); - int[] aggColumnsIndexArray = new int[aggDistinctArgumentCount]; - - List outputSymbols = new ArrayList<>(); - - String timeColumnName = null; - int channel = 0; - int measurementColumnCount = 0; - for (Map.Entry entry : node.getAggregations().entrySet()) { - for (Expression argument : entry.getValue().getArguments()) { - Symbol symbol = Symbol.from(argument); - ColumnSchema schema = - requireNonNull(node.getAssignments().get(symbol), symbol + " is null"); - if (!aggColumnLayout.containsKey(symbol)) { - switch (schema.getColumnCategory()) { - case TAG: - case ATTRIBUTE: - aggColumnsIndexArray[channel] = - requireNonNull( - node.getTagAndAttributeIndexMap().get(symbol), symbol + " is null"); - break; - case FIELD: - aggColumnsIndexArray[channel] = measurementColumnCount; - measurementColumnCount++; - String realMeasurementName = - fieldColumnsRenameMap.getOrDefault(schema.getName(), schema.getName()); - measurementColumnNames.add(realMeasurementName); - measurementSchemas.add( - new MeasurementSchema(realMeasurementName, getTSDataType(schema.getType()))); - measurementColumnsIndexMap.put(symbol.getName(), measurementColumnCount - 1); - outputSymbols.add(symbol); - break; - case TIME: - aggColumnsIndexArray[channel] = -1; - timeColumnName = symbol.getName(); - break; - default: - throw new IllegalArgumentException( - "Unexpected column category: " + schema.getColumnCategory()); - } - - aggColumnSchemas.add(schema); - aggregatorInputChannels.add(channel); - aggColumnLayout.put(symbol, channel++); - } else { - aggregatorInputChannels.add(aggColumnLayout.get(symbol)); - } - } - } - - for (Map.Entry entry : node.getAssignments().entrySet()) { - if (!aggColumnLayout.containsKey(entry.getKey()) - && entry.getValue().getColumnCategory() == FIELD) { - measurementColumnCount++; - String realMeasurementName = - fieldColumnsRenameMap.getOrDefault( - entry.getValue().getName(), entry.getValue().getName()); - measurementColumnNames.add(realMeasurementName); - measurementSchemas.add( - new MeasurementSchema(realMeasurementName, getTSDataType(entry.getValue().getType()))); - measurementColumnsIndexMap.put(entry.getKey().getName(), measurementColumnCount - 1); - } else if (entry.getValue().getColumnCategory() == TIME) { - timeColumnName = entry.getKey().getName(); - } - } - - boolean[] ret = checkStatisticAndScanOrder(node, timeColumnName); - boolean canUseStatistic = ret[0]; - boolean scanAscending = ret[1]; - - for (Map.Entry entry : node.getAggregations().entrySet()) { - aggregators.add( - buildAggregator( - aggColumnLayout, - entry.getKey(), - entry.getValue(), - node.getStep(), - context.getTypeProvider(), - scanAscending, - true, - timeColumnName, - measurementColumnsIndexMap.keySet())); - } - - ITableTimeRangeIterator timeRangeIterator = null; - List groupingKeySchemas = null; - int[] groupingKeyIndex = null; - if (!node.getGroupingKeys().isEmpty()) { - groupingKeySchemas = new ArrayList<>(node.getGroupingKeys().size()); - groupingKeyIndex = new int[node.getGroupingKeys().size()]; - for (int i = 0; i < node.getGroupingKeys().size(); i++) { - Symbol groupingKey = node.getGroupingKeys().get(i); - - if (node.getTagAndAttributeIndexMap().containsKey(groupingKey)) { - groupingKeySchemas.add(node.getAssignments().get(groupingKey)); - groupingKeyIndex[i] = node.getTagAndAttributeIndexMap().get(groupingKey); - } else { - if (node.getProjection() != null - && !node.getProjection().getMap().isEmpty() - && node.getProjection().contains(groupingKey)) { - FunctionCall dateBinFunc = (FunctionCall) node.getProjection().get(groupingKey); - List arguments = dateBinFunc.getArguments(); - DateBinFunctionColumnTransformer dateBinTransformer = - new DateBinFunctionColumnTransformer( - TIMESTAMP, - ((LongLiteral) arguments.get(0)).getParsedValue(), - ((LongLiteral) arguments.get(1)).getParsedValue(), - null, - ((LongLiteral) arguments.get(3)).getParsedValue(), - context.getZoneId()); - timeRangeIterator = new TableDateBinTimeRangeIterator(dateBinTransformer); - } else { - throw new IllegalStateException( - "grouping key must be ID or Attribute in AggregationTableScan"); - } - } - } - } - if (timeRangeIterator == null) { - if (node.getGroupingKeys().isEmpty()) { - // global aggregation, has no group by, output init value if no data - timeRangeIterator = - new TableSingleTimeWindowIterator(new TimeRange(Long.MIN_VALUE, Long.MAX_VALUE)); - } else { - // aggregation with group by, only has data the result will not be empty - timeRangeIterator = new TableSingleTimeWindowIterator(); - } - } - - final OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext(context.getNextOperatorId(), node.getPlanNodeId(), className); - SeriesScanOptions seriesScanOptions = - buildSeriesScanOptions( - context, - node.getAssignments(), - measurementColumnNames, - measurementColumnsIndexMap, - timeColumnName, - node.getTimePredicate(), - node.getPushDownLimit(), - node.getPushDownOffset(), - node.isPushLimitToEachDevice(), - node.getPushDownPredicate()); - seriesScanOptions.setTTLForTableView(tableViewTTL); - seriesScanOptions.setIsTableViewForTreeModel(node instanceof AggregationTreeDeviceViewScanNode); - - Set allSensors = new HashSet<>(measurementColumnNames); - allSensors.add(""); // for time column - context.getDriverContext().setInputDriver(true); - - return new AbstractAggTableScanOperator.AbstractAggTableScanOperatorParameter( - node.getPlanNodeId(), - operatorContext, - aggColumnSchemas, - aggColumnsIndexArray, - node.getDeviceEntries(), - node.getDeviceEntries().size(), - seriesScanOptions, - measurementColumnNames, - allSensors, - measurementSchemas, - aggregators, - groupingKeySchemas, - groupingKeyIndex, - timeRangeIterator, - scanAscending, - canUseStatistic, - aggregatorInputChannels, - timeColumnName, - outputSymbols); - } - - // used for AggregationTableScanNode - private AbstractAggTableScanOperator.AbstractAggTableScanOperatorParameter - constructAbstractAggTableScanOperatorParameter( - AggregationTableScanNode node, LocalExecutionPlanContext context) { - return constructAbstractAggTableScanOperatorParameter( - node, - context, - AbstractAggTableScanOperator.class.getSimpleName(), - Collections.emptyMap(), - Long.MAX_VALUE); - } - - @Override - public Operator visitAggregationTableScan( - AggregationTableScanNode node, LocalExecutionPlanContext context) { - - AbstractAggTableScanOperator.AbstractAggTableScanOperatorParameter parameter = - constructAbstractAggTableScanOperatorParameter(node, context); - - OptimizeType optimizeType = - canUseLastCacheOptimize( - parameter.getTableAggregators(), node, parameter.getTimeColumnName()); - if (optimizeType != OptimizeType.NOOP) { - return constructLastQueryAggTableScanOperator( - node, parameter, optimizeType == OptimizeType.LAST_ROW, context); - } else { - DefaultAggTableScanOperator aggTableScanOperator = new DefaultAggTableScanOperator(parameter); - - context.getInstanceContext().collectTable(node.getQualifiedObjectName().getObjectName()); - addSource( - aggTableScanOperator, - context, - node, - parameter.getMeasurementColumnNames(), - parameter.getMeasurementSchemas(), - parameter.getAllSensors(), - AggregationTableScanNode.class.getSimpleName()); - return aggTableScanOperator; - } - } - - private LastQueryAggTableScanOperator constructLastQueryAggTableScanOperator( - AggregationTableScanNode node, - AbstractAggTableScanOperator.AbstractAggTableScanOperatorParameter parameter, - boolean isLastRowOptimize, - LocalExecutionPlanContext context) { - List hitCachesIndexes = new ArrayList<>(); - List> lastRowCacheResults = null; - List lastValuesCacheResults = null; - List cachedDeviceEntries = new ArrayList<>(); - List unCachedDeviceEntries = new ArrayList<>(); - long tableTTL = - DataNodeTTLCache.getInstance() - .getTTLForTable( - node.getQualifiedObjectName().getDatabaseName(), - node.getQualifiedObjectName().getObjectName()); - Filter updateTimeFilter = - updateFilterUsingTTL(parameter.getSeriesScanOptions().getGlobalTimeFilter(), tableTTL); - if (isLastRowOptimize) { - lastRowCacheResults = new ArrayList<>(); - for (int i = 0; i < node.getDeviceEntries().size(); i++) { - Optional> lastByResult = - TableDeviceSchemaCache.getInstance() - .getLastRow( - node.getQualifiedObjectName().getDatabaseName(), - node.getDeviceEntries().get(i).getDeviceID(), - "", - parameter.getMeasurementColumnNames()); - boolean allHitCache = true; - if (lastByResult.isPresent() && lastByResult.get().getLeft().isPresent()) { - for (int j = 0; j < lastByResult.get().getRight().length; j++) { - TsPrimitiveType tsPrimitiveType = lastByResult.get().getRight()[j]; - if (tsPrimitiveType == null - || (updateTimeFilter != null - && !LastQueryUtil.satisfyFilter( - updateTimeFilter, - new TimeValuePair( - lastByResult.get().getLeft().getAsLong(), tsPrimitiveType)))) { - // the process logic is different from tree model which examine if - // `isFilterGtOrGe(seriesScanOptions.getGlobalTimeFilter())`, set - // `lastByResult.get().getRight()[j] = EMPTY_PRIMITIVE_TYPE`, - // but it should skip in table model - allHitCache = false; - break; - } - } - } else { - allHitCache = false; - } - - DeviceEntry deviceEntry = node.getDeviceEntries().get(i); - if (!allHitCache) { - AlignedFullPath alignedPath = - constructAlignedPath( - deviceEntry, - parameter.getMeasurementColumnNames(), - parameter.getMeasurementSchemas(), - parameter.getAllSensors()); - ((DataDriverContext) context.getDriverContext()).addPath(alignedPath); - unCachedDeviceEntries.add(deviceEntry); - addUncachedDeviceToContext(node, context, deviceEntry); - - // last cache updateColumns need to put "" as time column - String[] updateColumns = new String[parameter.getMeasurementColumnNames().size() + 1]; - updateColumns[0] = ""; - for (int j = 1; j < updateColumns.length; j++) { - updateColumns[j] = parameter.getMeasurementColumnNames().get(j - 1); - } - TableDeviceSchemaCache.getInstance() - .initOrInvalidateLastCache( - node.getQualifiedObjectName().getDatabaseName(), - deviceEntry.getDeviceID(), - updateColumns, - false); - } else { - hitCachesIndexes.add(i); - lastRowCacheResults.add(lastByResult.get()); - cachedDeviceEntries.add(deviceEntry); - decreaseDeviceCount(node, context, deviceEntry); - } - } - } else { - // LAST_VALUES optimize - lastValuesCacheResults = new ArrayList<>(); - int measurementSize = parameter.getMeasurementColumnNames().size(); - // We don't init time if the last cache will not be updated in process of operator - boolean needInitTime = - parameter.getTableAggregators().stream() - .anyMatch( - aggregator -> - aggregator.getAccumulator() instanceof LastDescAccumulator - && !((LastDescAccumulator) aggregator.getAccumulator()) - .isMeasurementColumn()); - // When we need last cache of Time column if: - // 1. query is group by (we need last cache of Time to help judge if there is no data in - // device) - // 2. last(time), last(device) or last(attribute) occurs - boolean needTime = !node.getGroupingKeys().isEmpty() || needInitTime; - String[] targetColumns; - - if (needTime) { - targetColumns = new String[measurementSize + 1]; - // put time column in the last for convenience of later processing - targetColumns[targetColumns.length - 1] = ""; - } else { - targetColumns = new String[measurementSize]; - } - - for (int j = 0; j < measurementSize; j++) { - targetColumns[j] = parameter.getMeasurementColumnNames().get(j); - } - - for (int i = 0; i < node.getDeviceEntries().size(); i++) { - TimeValuePair[] lastResult = - TableDeviceSchemaCache.getInstance() - .getLastEntries( - node.getQualifiedObjectName().getDatabaseName(), - node.getDeviceEntries().get(i).getDeviceID(), - targetColumns); - boolean allHitCache = true; - if (lastResult != null) { - for (TimeValuePair timeValuePair : lastResult) { - if (timeValuePair == null || timeValuePair.getValue() == null) { - allHitCache = false; - break; - } - - if (updateTimeFilter != null - && !LastQueryUtil.satisfyFilter( - parameter.getSeriesScanOptions().getGlobalTimeFilter(), timeValuePair)) { - if (isFilterGtOrGe(updateTimeFilter)) { - // it means there is no data meets Filter - timeValuePair.setValue(EMPTY_PRIMITIVE_TYPE); - } else { - allHitCache = false; - break; - } - } - } - } else { - allHitCache = false; - } - - DeviceEntry deviceEntry = node.getDeviceEntries().get(i); - if (!allHitCache) { - AlignedFullPath alignedPath = - constructAlignedPath( - deviceEntry, - parameter.getMeasurementColumnNames(), - parameter.getMeasurementSchemas(), - parameter.getAllSensors()); - ((DataDriverContext) context.getDriverContext()).addPath(alignedPath); - unCachedDeviceEntries.add(deviceEntry); - addUncachedDeviceToContext(node, context, deviceEntry); - - TableDeviceSchemaCache.getInstance() - .initOrInvalidateLastCache( - node.getQualifiedObjectName().getDatabaseName(), - deviceEntry.getDeviceID(), - needInitTime || node.getGroupingKeys().isEmpty() - ? targetColumns - : Arrays.copyOfRange(targetColumns, 0, targetColumns.length - 1), - false); - } else { - hitCachesIndexes.add(i); - lastValuesCacheResults.add(lastResult); - cachedDeviceEntries.add(deviceEntry); - decreaseDeviceCount(node, context, deviceEntry); - } - } - } - - parameter.setDeviceEntries(unCachedDeviceEntries); - - // context add TableLastQueryOperator - LastQueryAggTableScanOperator lastQueryOperator = - new LastQueryAggTableScanOperator( - parameter, - cachedDeviceEntries, - node.getQualifiedObjectName(), - hitCachesIndexes, - lastRowCacheResults, - lastValuesCacheResults, - node.getDeviceCountMap(), - context.getInstanceContext().getDataNodeQueryContext()); - - ((DataDriverContext) context.getDriverContext()).addSourceOperator(lastQueryOperator); - parameter - .getOperatorContext() - .setOperatorType(LastQueryAggTableScanOperator.class.getSimpleName()); - return lastQueryOperator; - } - - private void addUncachedDeviceToContext( - AggregationTableScanNode node, LocalExecutionPlanContext context, DeviceEntry deviceEntry) { - boolean deviceInMultiRegion = - node.getDeviceCountMap() != null && node.getDeviceCountMap().containsKey(deviceEntry); - if (!deviceInMultiRegion) { - return; - } - - context.dataNodeQueryContext.lock(true); - try { - context.dataNodeQueryContext.addUnCachedDeviceIfAbsent( - node.getQualifiedObjectName(), deviceEntry, node.getDeviceCountMap().get(deviceEntry)); - } finally { - context.dataNodeQueryContext.unLock(true); - } - } - - /** - * Decrease the device count when its last cache was hit. Notice that the count can also be zero - * after decrease, we need to update last cache if needed. - */ - private void decreaseDeviceCount( - AggregationTableScanNode node, LocalExecutionPlanContext context, DeviceEntry deviceEntry) { - boolean deviceInMultiRegion = - node.getDeviceCountMap() != null && node.getDeviceCountMap().containsKey(deviceEntry); - if (!deviceInMultiRegion) { - return; - } - - context.dataNodeQueryContext.lock(true); - try { - context.dataNodeQueryContext.decreaseDeviceAndMayUpdateLastCache( - node.getQualifiedObjectName(), deviceEntry, node.getDeviceCountMap().get(deviceEntry)); - } finally { - context.dataNodeQueryContext.unLock(true); - } - } - - private SeriesScanOptions buildSeriesScanOptions( - LocalExecutionPlanContext context, - Map columnSchemaMap, - List measurementColumnNames, - Map measurementColumnsIndexMap, - String timeColumnName, - Optional timePredicate, - long pushDownLimit, - long pushDownOffset, - boolean pushLimitToEachDevice, - Expression pushDownPredicate) { - SeriesScanOptions.Builder scanOptionsBuilder = - timePredicate - .map(expression -> getSeriesScanOptionsBuilder(context, expression)) - .orElseGet(SeriesScanOptions.Builder::new); - scanOptionsBuilder.withPushDownLimit(pushDownLimit); - scanOptionsBuilder.withPushDownOffset(pushDownOffset); - scanOptionsBuilder.withPushLimitToEachDevice(pushLimitToEachDevice); - scanOptionsBuilder.withAllSensors(new HashSet<>(measurementColumnNames)); - if (pushDownPredicate != null) { - scanOptionsBuilder.withPushDownFilter( - convertPredicateToFilter( - pushDownPredicate, - measurementColumnsIndexMap, - columnSchemaMap, - timeColumnName, - context.getZoneId(), - TimestampPrecisionUtils.currPrecision)); - } - return scanOptionsBuilder.build(); - } - - @Override - public Operator visitExplainAnalyze(ExplainAnalyzeNode node, LocalExecutionPlanContext context) { - Operator operator = node.getChild().accept(this, context); - OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - ExplainAnalyzeOperator.class.getSimpleName()); - return new ExplainAnalyzeOperator( - operatorContext, operator, node.getQueryId(), node.isVerbose(), node.getTimeout()); - } - - @Override - public Operator visitCopyTo(CopyToNode node, LocalExecutionPlanContext context) { - PlanNode childNode = node.getChild(); - - List innerQueryOutputSymbols = node.getInnerQueryOutputSymbols(); - List childOutputSymbols = childNode.getOutputSymbols(); - Map childOutputSymbolsIndexMap = new HashMap<>(childOutputSymbols.size()); - for (int i = 0; i < childOutputSymbols.size(); i++) { - childOutputSymbolsIndexMap.put(childOutputSymbols.get(i), i); - } - int[] columnIndex2TsBlockColumnIndexList = new int[innerQueryOutputSymbols.size()]; - for (int i = 0; i < innerQueryOutputSymbols.size(); i++) { - int index = childOutputSymbolsIndexMap.get(innerQueryOutputSymbols.get(i)); - columnIndex2TsBlockColumnIndexList[i] = index; - } - - Operator operator = childNode.accept(this, context); - - OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableCopyToOperator.class.getSimpleName()); - return new TableCopyToOperator( - operatorContext, - operator, - node.getTargetFilePath(), - node.getCopyToOptions(), - node.getInnerQueryDatasetHeader().getColumnHeaders(), - columnIndex2TsBlockColumnIndexList); - } - @Override public Operator visitTableFunctionProcessor( TableFunctionProcessorNode node, LocalExecutionPlanContext context) { @@ -3910,206 +2102,11 @@ public Operator visitPatternRecognition( labelNames); } - @Override - public Operator visitInto(IntoNode node, LocalExecutionPlanContext context) { - Operator child = node.getChild().accept(this, context); - OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableIntoOperator.class.getSimpleName()); - - PartialPath targetTable = new PartialPath(node.getTable(), false); - - Map tsDataTypeMap = new LinkedHashMap<>(); - Map inputLocationMap = new LinkedHashMap<>(); - List inputColumnTypes = new ArrayList<>(); - List inputColumnCategories = new ArrayList<>(); - - List originColumns = node.getColumns(); - List originInputColumnNames = node.getNeededInputColumnNames(); - int size = originColumns.size(); - List inputColumns = new ArrayList<>(size); - - List childOutputName = node.getChild().getOutputSymbols(); - Map map = new HashMap<>(childOutputName.size()); - for (int i = 0; i < size; i++) { - map.put(childOutputName.get(i), i); - inputColumns.add(null); - } - for (int i = 0; i < size; i++) { - int index = map.get(originInputColumnNames.get(i)); - inputColumns.set(index, originColumns.get(i)); - } - ColumnSchema timeColumnOfTargetTable = null; - for (int i = 0; i < inputColumns.size(); i++) { - String columnName = inputColumns.get(i).getName(); - inputLocationMap.put(columnName, new InputLocation(0, i)); - - TsTableColumnCategory columnCategory = inputColumns.get(i).getColumnCategory(); - if (columnCategory == TIME) { - if (timeColumnOfTargetTable == null) { - timeColumnOfTargetTable = inputColumns.get(i); - } else { - throw new SemanticException("Multiple columns with TIME category found"); - } - continue; - } - - TSDataType columnType = InternalTypeManager.getTSDataType(inputColumns.get(i).getType()); - tsDataTypeMap.put(columnName, columnType); - inputColumnTypes.add(columnType); - inputColumnCategories.add(columnCategory); - } - if (timeColumnOfTargetTable == null) { - throw new SemanticException("Missing TIME category column"); - } - - long statementSizePerLine = - OperatorGeneratorUtil.calculateStatementSizePerLine(inputColumnTypes); - - return new TableIntoOperator( - operatorContext, - child, - node.getDatabase(), - targetTable, - inputColumnTypes, - inputColumnCategories, - inputLocationMap, - tsDataTypeMap, - true, - FragmentInstanceManager.getInstance().getIntoOperationExecutor(), - statementSizePerLine, - timeColumnOfTargetTable); - } - - private boolean[] checkStatisticAndScanOrder( - AggregationTableScanNode node, String timeColumnName) { - boolean canUseStatistic = true; - int ascendingCount = 0, descendingCount = 0; - - for (Map.Entry entry : node.getAggregations().entrySet()) { - AggregationNode.Aggregation aggregation = entry.getValue(); - String funcName = aggregation.getResolvedFunction().getSignature().getName(); - Symbol argument = Symbol.from(aggregation.getArguments().get(0)); - Type argumentType = node.getAssignments().get(argument).getType(); - - switch (funcName) { - case COUNT: - case AVG: - case SUM: - case EXTREME: - break; - case MAX: - case MIN: - if (BlobType.BLOB.equals(argumentType) - || ObjectType.OBJECT.equals(argumentType) - || BinaryType.TEXT.equals(argumentType) - || BooleanType.BOOLEAN.equals(argumentType)) { - canUseStatistic = false; - } - break; - case FIRST_AGGREGATION: - case LAST_AGGREGATION: - case LAST_BY_AGGREGATION: - case FIRST_BY_AGGREGATION: - if (FIRST_AGGREGATION.equals(funcName) || FIRST_BY_AGGREGATION.equals(funcName)) { - ascendingCount++; - } else { - descendingCount++; - } - - // first/last/first_by/last_by aggregation with BLOB or OBJECT type can not use statistics - if (BlobType.BLOB.equals(argumentType) || ObjectType.OBJECT.equals(argumentType)) { - canUseStatistic = false; - break; - } - - // first and last, the second argument has to be the time column - if (FIRST_AGGREGATION.equals(funcName) || LAST_AGGREGATION.equals(funcName)) { - if (!isTimeColumn(aggregation.getArguments().get(1), timeColumnName)) { - canUseStatistic = false; - break; - } - } - - // first_by and last_by, the second argument has to be the time column - if (FIRST_BY_AGGREGATION.equals(funcName) || LAST_BY_AGGREGATION.equals(funcName)) { - if (!isTimeColumn(aggregation.getArguments().get(2), timeColumnName)) { - canUseStatistic = false; - break; - } - } - - // only last_by(time, x) or last_by(x,time) can use statistic - if ((LAST_BY_AGGREGATION.equals(funcName) || FIRST_BY_AGGREGATION.equals(funcName)) - && !isTimeColumn(aggregation.getArguments().get(0), timeColumnName) - && !isTimeColumn(aggregation.getArguments().get(1), timeColumnName)) { - canUseStatistic = false; - } - break; - default: - canUseStatistic = false; - } - } - - boolean isAscending = node.getScanOrder().isAscending(); - boolean groupByDateBin = node.getProjection() != null && !node.getProjection().isEmpty(); - // only in non-groupByDateBin situation can change the scan order - if (!groupByDateBin) { - if (ascendingCount >= descendingCount) { - node.setScanOrder(Ordering.ASC); - isAscending = true; - } else { - node.setScanOrder(Ordering.DESC); - isAscending = false; - } - } - return new boolean[] {canUseStatistic, isAscending}; - } - - private OptimizeType canUseLastCacheOptimize( - List aggregators, AggregationTableScanNode node, String timeColumnName) { - if (!CommonDescriptor.getInstance().getConfig().isLastCacheEnable() || aggregators.isEmpty()) { - return OptimizeType.NOOP; - } - - // has value filter, can not optimize - if (node.getPushDownPredicate() != null) { - return OptimizeType.NOOP; - } - - // has date_bin, can not optimize - if (!node.getGroupingKeys().isEmpty() - && node.getProjection() != null - && !node.getProjection().getMap().isEmpty()) { - return OptimizeType.NOOP; - } - - // if the timeColumnName is null, the param of function is just a timestamp column other than - // the time column - if (timeColumnName == null || !checkOrderColumnIsTime(node.getAggregations(), timeColumnName)) { - return OptimizeType.NOOP; - } - - if (canUseLastRowOptimize(aggregators)) { - return OptimizeType.LAST_ROW; - } - - if (canUseLastValuesOptimize(aggregators)) { - return OptimizeType.LAST_VALUES; - } - - return OptimizeType.NOOP; - } - /** * Checks if the ordering column in aggregations matches the time column. only check for * FIRST/LAST/FIRST_BY/LAST_BY */ - private boolean checkOrderColumnIsTime( + protected boolean checkOrderColumnIsTime( Map aggregations, String timeColumnName) { for (Map.Entry entry : aggregations.entrySet()) { @@ -4132,7 +2129,7 @@ private boolean checkOrderColumnIsTime( return true; } - private boolean canUseLastRowOptimize(List aggregators) { + protected boolean canUseLastRowOptimize(List aggregators) { for (TableAggregator aggregator : aggregators) { if (aggregator.getAccumulator() instanceof LastDescAccumulator) { if (!((LastDescAccumulator) aggregator.getAccumulator()).isTimeColumn()) { @@ -4149,7 +2146,7 @@ private boolean canUseLastRowOptimize(List aggregators) { return true; } - private boolean canUseLastValuesOptimize(List aggregators) { + protected boolean canUseLastValuesOptimize(List aggregators) { for (TableAggregator aggregator : aggregators) { if (aggregator.getAccumulator() instanceof LastByDescAccumulator) { // cannot optimize when x is Measurement or y is not Measurement @@ -4164,7 +2161,7 @@ private boolean canUseLastValuesOptimize(List aggregators) { return true; } - private enum OptimizeType { + protected enum OptimizeType { LAST_ROW, LAST_VALUES, NOOP @@ -4179,7 +2176,7 @@ public Operator visitMarkDistinct(MarkDistinctNode node, LocalExecutionPlanConte .addOperatorContext( context.getNextOperatorId(), node.getPlanNodeId(), - ExplainAnalyzeOperator.class.getSimpleName()); + MarkDistinctOperator.class.getSimpleName()); TypeProvider typeProvider = context.getTypeProvider(); Map childLayout = 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 00125a970b7b8..846a9f20d105f 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 @@ -40,12 +40,6 @@ @SuppressWarnings("java:S6539") // suppress "Monster class" warning public abstract class PlanVisitor implements IQueryPlanVisitor { - public R process(PlanNode node, C context) { - return node.accept(this, context); - } - - public abstract R visitPlan(PlanNode node, C context); - ///////////////////////////////////////////////////////////////////////////////////////////////// // Data Write Node ///////////////////////////////////////////////////////////////////////////////////////////////// From 35344fd9abccd4b233ff32b5c19a4a7770ed2eb8 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 13 Apr 2026 10:46:44 +0800 Subject: [PATCH 03/45] move some plannodes --- .../plan/planner/TableOperatorGenerator.java | 44 +- .../dataregion/DataExecutionVisitor.java | 2 +- .../schemaregion/SchemaExecutionVisitor.java | 2 +- .../plan/node/ICoreQueryPlanVisitor.java | 236 +++++ .../planner/plan/node/IQueryPlanVisitor.java | 812 ------------------ .../node/process/MultiChildProcessNode.java | 2 +- .../plan/node/process/ProcessNode.java | 2 +- .../node/process/SingleChildProcessNode.java | 2 +- .../relational/planner/node/FillNode.java | 8 +- .../relational/planner/node/FilterNode.java | 8 +- .../relational/planner/node/JoinNode.java | 10 +- .../relational/planner/node/LimitNode.java | 8 +- .../visitor/PipePlanToStatementVisitor.java | 2 +- .../PipePlanTablePatternParseVisitor.java | 2 +- .../PipePlanTablePrivilegeParseVisitor.java | 2 +- .../PipePlanTreePatternParseVisitor.java | 2 +- .../PipePlanTreePrivilegeParseVisitor.java | 2 +- .../executor/RegionWriteExecutor.java | 80 +- .../optimization/AggregationPushDown.java | 6 +- .../optimization/ColumnInjectionPushDown.java | 6 +- .../optimization/LimitOffsetPushDown.java | 4 +- ...rderByExpressionWithLimitChangeToTopK.java | 6 +- .../plan/optimization/PredicatePushDown.java | 6 +- .../DataNodeTableOperatorGenerator.java | 34 +- .../plan/planner/LogicalPlanBuilder.java | 2 +- .../plan/planner/OperatorTreeGenerator.java | 4 +- .../distribution/ExchangeNodeAdder.java | 4 +- .../planner/distribution/SourceRewriter.java | 2 +- .../planner/plan/node/BaseSourceRewriter.java | 2 +- .../planner/plan/node/ExplainAnalyzeNode.java | 5 +- .../planner/plan/node/PlanGraphPrinter.java | 11 +- .../plan/planner/plan/node/PlanNodeType.java | 8 +- .../plan/planner/plan/node/PlanVisitor.java | 625 +++++++++++++- .../planner/plan/node/SimplePlanVisitor.java | 2 +- .../read/AbstractSchemaMergeNode.java | 2 +- .../metadata/read/CountSchemaMergeNode.java | 4 +- .../read/DeviceSchemaFetchScanNode.java | 4 +- .../read/NodeManagementMemoryMergeNode.java | 6 +- .../metadata/read/NodePathsConvertNode.java | 6 +- .../metadata/read/NodePathsCountNode.java | 6 +- .../metadata/read/SchemaFetchMergeNode.java | 4 +- .../metadata/read/SchemaQueryMergeNode.java | 4 +- .../read/SchemaQueryOrderByHeatNode.java | 6 +- .../metadata/read/SchemaQueryScanNode.java | 4 +- .../read/SeriesSchemaFetchScanNode.java | 4 +- .../metadata/write/ActivateTemplateNode.java | 4 +- .../write/AlterEncodingCompressorNode.java | 4 +- .../write/BatchActivateTemplateNode.java | 4 +- .../write/ConstructSchemaBlackListNode.java | 4 +- .../metadata/write/CreateTimeSeriesNode.java | 4 +- .../write/DeactivateTemplateNode.java | 4 +- .../metadata/write/DeleteTimeSeriesNode.java | 4 +- .../InternalBatchActivateTemplateNode.java | 4 +- .../InternalCreateMultiTimeSeriesNode.java | 4 +- .../write/InternalCreateTimeSeriesNode.java | 4 +- .../write/PreDeactivateTemplateNode.java | 4 +- .../RollbackPreDeactivateTemplateNode.java | 4 +- .../write/RollbackSchemaBlackListNode.java | 4 +- .../write/view/AlterLogicalViewNode.java | 4 +- .../ConstructLogicalViewBlackListNode.java | 4 +- .../write/view/CreateLogicalViewNode.java | 4 +- .../write/view/DeleteLogicalViewNode.java | 4 +- .../RollbackLogicalViewBlackListNode.java | 4 +- .../plan/node/process/AI/InferenceNode.java | 6 +- .../process/ActiveRegionScanMergeNode.java | 5 +- .../process/AggregationMergeSortNode.java | 5 +- .../plan/node/process/AggregationNode.java | 5 +- .../plan/node/process/CollectNode.java | 5 +- .../plan/node/process/ColumnInjectNode.java | 5 +- .../plan/node/process/DeviceMergeNode.java | 5 +- .../plan/node/process/DeviceViewIntoNode.java | 5 +- .../plan/node/process/DeviceViewNode.java | 5 +- .../plan/node/process/ExchangeNode.java | 5 +- .../planner/plan/node/process/FillNode.java | 5 +- .../planner/plan/node/process/FilterNode.java | 4 +- .../plan/node/process/GroupByLevelNode.java | 5 +- .../plan/node/process/GroupByTagNode.java | 5 +- .../node/process/HorizontallyConcatNode.java | 5 +- .../planner/plan/node/process/IntoNode.java | 5 +- .../planner/plan/node/process/LimitNode.java | 5 +- .../plan/node/process/MergeSortNode.java | 5 +- .../planner/plan/node/process/OffsetNode.java | 5 +- .../plan/node/process/ProjectNode.java | 5 +- .../node/process/RawDataAggregationNode.java | 5 +- .../node/process/SingleDeviceViewNode.java | 5 +- .../process/SlidingWindowAggregationNode.java | 5 +- .../planner/plan/node/process/SortNode.java | 5 +- .../planner/plan/node/process/TopKNode.java | 5 +- .../plan/node/process/TransformNode.java | 5 +- .../node/process/TwoChildProcessNode.java | 1 + .../process/join/FullOuterTimeJoinNode.java | 6 +- .../node/process/join/InnerTimeJoinNode.java | 6 +- .../process/join/LeftOuterTimeJoinNode.java | 4 +- .../process/last/LastQueryCollectNode.java | 6 +- .../node/process/last/LastQueryMergeNode.java | 6 +- .../plan/node/process/last/LastQueryNode.java | 6 +- .../process/last/LastQueryTransformNode.java | 6 +- .../plan/node/sink/IdentitySinkNode.java | 4 +- .../plan/node/sink/ShuffleSinkNode.java | 4 +- .../AlignedSeriesAggregationScanNode.java | 4 +- .../node/source/AlignedSeriesScanNode.java | 4 +- .../node/source/DeviceRegionScanNode.java | 4 +- .../plan/node/source/LastQueryScanNode.java | 4 +- .../plan/node/source/RegionScanNode.java | 4 +- .../source/SeriesAggregationScanNode.java | 4 +- .../source/SeriesAggregationSourceNode.java | 4 +- .../plan/node/source/SeriesScanNode.java | 4 +- .../node/source/SeriesScanSourceNode.java | 4 +- .../plan/node/source/ShowDiskUsageNode.java | 4 +- .../plan/node/source/ShowQueriesNode.java | 4 +- .../node/source/TimeseriesRegionScanNode.java | 4 +- .../planner/ExpressionExtractor.java | 4 +- .../plan/relational/planner/QueryPlanner.java | 4 +- .../relational/planner/RelationPlanner.java | 4 +- .../planner/SimplePlanRewriter.java | 2 +- .../relational/planner/SubqueryPlanner.java | 2 +- .../planner/TableLogicalPlanner.java | 4 +- .../planner/distribute/AddExchangeNodes.java | 2 +- .../TableDistributedPlanGenerator.java | 16 +- .../TableModelTypeProviderExtractor.java | 8 +- .../planner/iterative/GroupReference.java | 4 +- .../relational/planner/iterative/Plans.java | 2 +- .../EliminateLimitProjectWithTableScan.java | 2 +- .../rule/EliminateLimitWithTableScan.java | 2 +- .../rule/ExpressionRewriteRuleSet.java | 2 +- .../iterative/rule/ImplementExceptAll.java | 2 +- .../rule/ImplementExceptDistinctAsUnion.java | 2 +- .../iterative/rule/ImplementIntersectAll.java | 2 +- .../ImplementIntersectDistinctAsUnion.java | 2 +- .../planner/iterative/rule/MergeFilters.java | 2 +- .../MergeLimitOverProjectWithMergeSort.java | 2 +- .../rule/MergeLimitOverProjectWithSort.java | 2 +- .../rule/MergeLimitWithMergeSort.java | 2 +- .../iterative/rule/MergeLimitWithSort.java | 2 +- .../planner/iterative/rule/MergeLimits.java | 2 +- .../rule/PruneCorrelatedJoinColumns.java | 2 +- .../rule/PruneDistinctAggregation.java | 2 +- .../iterative/rule/PruneFillColumns.java | 2 +- .../iterative/rule/PruneFilterColumns.java | 2 +- .../rule/PruneJoinChildrenColumns.java | 2 +- .../iterative/rule/PruneJoinColumns.java | 2 +- .../iterative/rule/PruneLimitColumns.java | 2 +- .../rule/PushDownFilterIntoWindow.java | 2 +- .../rule/PushDownLimitIntoWindow.java | 2 +- .../rule/PushLimitThroughOffset.java | 2 +- .../rule/PushLimitThroughProject.java | 2 +- .../iterative/rule/PushLimitThroughUnion.java | 2 +- .../iterative/rule/RemoveTrivialFilters.java | 2 +- .../RemoveUnreferencedScalarSubqueries.java | 4 +- ...atedDistinctAggregationWithProjection.java | 4 +- ...dDistinctAggregationWithoutProjection.java | 4 +- ...elatedGlobalAggregationWithProjection.java | 6 +- ...tedGlobalAggregationWithoutProjection.java | 6 +- ...latedGroupedAggregationWithProjection.java | 4 +- ...edGroupedAggregationWithoutProjection.java | 4 +- .../rule/TransformCorrelatedJoinToJoin.java | 6 +- .../TransformCorrelatedScalarSubquery.java | 6 +- .../TransformExistsApplyToCorrelatedJoin.java | 6 +- ...TransformFilteringSemiJoinToInnerJoin.java | 6 +- .../TransformUncorrelatedSubqueryToJoin.java | 2 +- .../planner/node/AggregationNode.java | 6 +- .../node/AggregationTableScanNode.java | 4 +- .../AggregationTreeDeviceViewScanNode.java | 4 +- ...gnedAggregationTreeDeviceViewScanNode.java | 5 +- .../relational/planner/node/ApplyNode.java | 4 +- .../planner/node/AssignUniqueId.java | 6 +- .../relational/planner/node/CollectNode.java | 6 +- .../relational/planner/node/CopyToNode.java | 6 +- .../planner/node/CorrelatedJoinNode.java | 5 +- .../relational/planner/node/CteScanNode.java | 4 +- .../planner/node/DeviceTableScanNode.java | 4 +- .../planner/node/EnforceSingleRowNode.java | 6 +- .../relational/planner/node/ExceptNode.java | 4 +- .../relational/planner/node/ExchangeNode.java | 6 +- .../planner/node/ExplainAnalyzeNode.java | 6 +- .../relational/planner/node/GapFillNode.java | 6 +- .../relational/planner/node/GroupNode.java | 4 +- .../node/InformationSchemaTableScanNode.java | 4 +- .../planner/node/IntersectNode.java | 4 +- .../relational/planner/node/IntoNode.java | 6 +- .../planner/node/LinearFillNode.java | 5 +- .../planner/node/MarkDistinctNode.java | 6 +- .../planner/node/MergeSortNode.java | 6 +- ...gnedAggregationTreeDeviceViewScanNode.java | 4 +- .../relational/planner/node/OffsetNode.java | 6 +- .../relational/planner/node/OutputNode.java | 6 +- .../planner/node/PatternRecognitionNode.java | 6 +- .../relational/planner/node/Patterns.java | 4 + .../planner/node/PreviousFillNode.java | 5 +- .../relational/planner/node/ProjectNode.java | 6 +- .../planner/node/RowNumberNode.java | 6 +- .../relational/planner/node/SemiJoinNode.java | 4 +- .../planner/node/SetOperationNode.java | 2 +- .../relational/planner/node/SortNode.java | 6 +- .../planner/node/StreamSortNode.java | 4 +- .../planner/node/TableFunctionNode.java | 6 +- .../node/TableFunctionProcessorNode.java | 6 +- .../planner/node/TableScanNode.java | 4 +- .../relational/planner/node/TopKNode.java | 6 +- .../planner/node/TopKRankingNode.java | 6 +- .../node/TreeAlignedDeviceViewScanNode.java | 4 +- .../planner/node/TreeDeviceViewScanNode.java | 4 +- .../TreeNonAlignedDeviceViewScanNode.java | 4 +- .../relational/planner/node/UnionNode.java | 4 +- .../planner/node/ValueFillNode.java | 5 +- .../relational/planner/node/ValuesNode.java | 4 +- .../relational/planner/node/WindowNode.java | 6 +- ...leSchemaQueryAttributeSecurityVisitor.java | 2 +- .../ConstructTableDevicesBlackListNode.java | 4 +- .../schema/CreateOrUpdateTableDeviceNode.java | 4 +- .../DeleteTableDevicesInBlackListNode.java | 4 +- .../RollbackTableDevicesBlackListNode.java | 4 +- .../schema/TableAttributeColumnDropNode.java | 4 +- .../TableDeviceAttributeCommitUpdateNode.java | 4 +- .../TableDeviceAttributeUpdateNode.java | 4 +- .../node/schema/TableDeviceFetchNode.java | 4 +- .../schema/TableDeviceQueryCountNode.java | 4 +- .../node/schema/TableDeviceQueryScanNode.java | 4 +- .../node/schema/TableNodeLocationAddNode.java | 4 +- .../planner/optimizations/JoinUtils.java | 2 +- .../optimizations/ParallelizeGrouping.java | 4 +- .../optimizations/PlanNodeDecorrelator.java | 6 +- .../PushAggregationIntoTableScan.java | 2 +- .../PushLimitOffsetIntoTableScan.java | 8 +- .../PushPredicateIntoTableScan.java | 14 +- .../optimizations/QueryCardinalityUtil.java | 6 +- .../optimizations/SortElimination.java | 4 +- .../planner/optimizations/SymbolMapper.java | 2 +- .../TransformAggregationToStreamable.java | 6 +- ...tifiedComparisonApplyToCorrelatedJoin.java | 2 +- .../TransformSortToStreamSort.java | 2 +- .../UnaliasSymbolReferences.java | 10 +- .../impl/SchemaRegionMemoryImpl.java | 2 +- .../trigger/executor/TriggerFireVisitor.java | 2 +- .../mtree/schemafile/SchemaFileTest.java | 3 +- ...nedTreeDeviceViewScanOperatorTreeTest.java | 2 +- .../ViewFromTreeAdaptorOperatorTest.java | 4 +- .../SinkOperatorDownStreamNodeIdTest.java | 2 +- .../relational/analyzer/AnalyzerTest.java | 4 +- .../relational/analyzer/AsofJoinTest.java | 2 +- .../analyzer/InsertIntoQueryTest.java | 2 +- .../plan/relational/analyzer/JoinTest.java | 6 +- .../analyzer/LimitOffsetPushDownTest.java | 2 +- .../plan/relational/analyzer/SortTest.java | 4 +- .../relational/analyzer/SubQueryTest.java | 4 +- .../analyzer/TableFunctionTest.java | 2 +- .../relational/analyzer/TestPlanBuilder.java | 4 +- .../plan/relational/analyzer/TestUtils.java | 2 +- .../planner/CorrelatedSubqueryTest.java | 2 +- .../planner/UncorrelatedSubqueryTest.java | 2 +- .../assertions/AsofJoinClauseProvider.java | 2 +- .../assertions/EquiJoinClauseProvider.java | 2 +- .../planner/assertions/FilterMatcher.java | 2 +- .../planner/assertions/JoinMatcher.java | 2 +- .../planner/assertions/LimitMatcher.java | 2 +- .../planner/assertions/PlanMatchPattern.java | 6 +- .../assertions/PlanMatchingVisitor.java | 2 +- .../TableFunctionProcessorMatcher.java | 1 - .../settle/SettleCompactionTaskTest.java | 1 - 259 files changed, 1461 insertions(+), 1423 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/planner/TableOperatorGenerator.java (98%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java delete mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IQueryPlanVisitor.java rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/planner/plan/node/process/MultiChildProcessNode.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/planner/plan/node/process/ProcessNode.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/planner/plan/node/process/SingleChildProcessNode.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/FillNode.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/FilterNode.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/JoinNode.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/LimitNode.java (92%) 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/calc_commons/plan/planner/TableOperatorGenerator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 36f4f9dc78926..09ef349094d73 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/calc_commons/plan/planner/TableOperatorGenerator.java @@ -17,14 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.planner; +package org.apache.iotdb.db.calc_commons.plan.planner; -import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; @@ -101,8 +103,8 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; import org.apache.iotdb.db.queryengine.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionKind; @@ -125,11 +127,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode; -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.GroupNode; -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; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Measure; @@ -179,10 +178,6 @@ import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.common.conf.TSFileDescriptor; import org.apache.tsfile.enums.TSDataType; -import org.apache.tsfile.file.metadata.IDeviceID; -import org.apache.tsfile.file.metadata.idcolumn.FourOrHigherLevelDBExtractor; -import org.apache.tsfile.file.metadata.idcolumn.ThreeLevelDBExtractor; -import org.apache.tsfile.file.metadata.idcolumn.TwoLevelDBExtractor; import org.apache.tsfile.read.common.block.column.BinaryColumn; import org.apache.tsfile.read.common.block.column.BooleanColumn; import org.apache.tsfile.read.common.block.column.DoubleColumn; @@ -244,7 +239,7 @@ /** This Visitor is responsible for transferring Table PlanNode Tree to Table Operator Tree. */ public class TableOperatorGenerator - implements IQueryPlanVisitor { + implements ICoreQueryPlanVisitor { protected final Metadata metadata; @@ -257,29 +252,6 @@ public Operator visitPlan(PlanNode node, LocalExecutionPlanContext context) { throw new UnsupportedOperationException("should call the concrete visitXX() method"); } - public static IDeviceID.TreeDeviceIdColumnValueExtractor createTreeDeviceIdColumnValueExtractor( - String treeDBName) { - try { - PartialPath db = new PartialPath(treeDBName); - int dbLevel = db.getNodes().length; - // For the path of 'root.**', we can only get the root level in this place - // In this case, we still need to support deviceId such as 'root.db' - // The relevant deviceId must be two level db, but we can't get it now - if (dbLevel == 1 || dbLevel == 2) { - return new TwoLevelDBExtractor(treeDBName.length()); - } else if (dbLevel == 3) { - return new ThreeLevelDBExtractor(treeDBName.length()); - } else if (dbLevel >= 4) { - return new FourOrHigherLevelDBExtractor(dbLevel); - } else { - throw new IllegalArgumentException( - "tree db name should at least be two level: " + treeDBName); - } - } catch (IllegalPathException e) { - throw new IllegalArgumentException(e); - } - } - @Override public Operator visitCteScan(CteScanNode node, LocalExecutionPlanContext context) { OperatorContext operatorContext = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java index e0184b8595d23..2290b8efd7ad9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java @@ -54,7 +54,7 @@ import java.io.IOException; import java.util.Map; -public class DataExecutionVisitor extends PlanVisitor { +public class DataExecutionVisitor implements PlanVisitor { private static final Logger LOGGER = LoggerFactory.getLogger(DataExecutionVisitor.class); @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java index 261b4908a9061..05b5735ab7666 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java @@ -96,7 +96,7 @@ import java.util.Objects; /** Schema write {@link PlanNode} visitor */ -public class SchemaExecutionVisitor extends PlanVisitor { +public class SchemaExecutionVisitor implements PlanVisitor { private static Logger logger = LoggerFactory.getLogger(SchemaExecutionVisitor.class); @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java new file mode 100644 index 0000000000000..25830cc63ea03 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java @@ -0,0 +1,236 @@ +/* + * 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.node_commons.plan.planner.plan.node; + +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; + +public interface ICoreQueryPlanVisitor extends IPlanVisitor { + + ///////////////////////////////////////////////////////////////////////////////////////////////// + // Data Query Node + ///////////////////////////////////////////////////////////////////////////////////////////////// + + // source -------------------------------------------------------------------------------------- + + default R visitSourceNode(SourceNode node, C context) { + return visitPlan(node, context); + } + + default R visitCteScan(CteScanNode node, C context) { + return visitSourceNode(node, context); + } + + // single child -------------------------------------------------------------------------------- + + default R visitSingleChildProcess(SingleChildProcessNode node, C context) { + return visitPlan(node, context); + } + + // two child ----------------------------------------------------------------------------------- + + default R visitTwoChildProcess(TwoChildProcessNode node, C context) { + return visitPlan(node, context); + } + + // multi child -------------------------------------------------------------------------------- + + default R visitMultiChildProcess(MultiChildProcessNode node, C context) { + return visitPlan(node, context); + } + + // =============================== Used for Table Model ==================================== + default R visitFilter(FilterNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitApply( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode node, C context) { + return visitTwoChildProcess(node, context); + } + + default R visitAssignUniqueId( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitEnforceSingleRow( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode node, + C context) { + return visitSingleChildProcess(node, context); + } + + default R visitCorrelatedJoin( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode node, + C context) { + return visitTwoChildProcess(node, context); + } + + default R visitProject( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitLimit(LimitNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitOffset( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitMergeSort( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitOutput( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitCollect( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitGapFill(GapFillNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitFill(FillNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitPreviousFill(PreviousFillNode node, C context) { + return visitFill(node, context); + } + + default R visitLinearFill(LinearFillNode node, C context) { + return visitFill(node, context); + } + + default R visitValueFill(ValueFillNode node, C context) { + return visitFill(node, context); + } + + default R visitSort( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitStreamSort( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitGroup(GroupNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitTopK( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitTopKRanking( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode node, + C context) { + return visitSingleChildProcess(node, context); + } + + default R visitRowNumber(RowNumberNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitValuesNode(ValuesNode node, C context) { + return visitPlan(node, context); + } + + default R visitJoin(JoinNode node, C context) { + return visitTwoChildProcess(node, context); + } + + default R visitSemiJoin(SemiJoinNode node, C context) { + return visitTwoChildProcess(node, context); + } + + default R visitGroupReference(GroupReference node, C context) { + return visitPlan(node, context); + } + + default R visitAggregation( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode node, + C context) { + return visitSingleChildProcess(node, context); + } + + default R visitMarkDistinct(MarkDistinctNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitWindowFunction(WindowNode node, C context) { + return visitPlan(node, context); + } + + default R visitTableFunction(TableFunctionNode node, C context) { + return visitPlan(node, context); + } + + default R visitTableFunctionProcessor(TableFunctionProcessorNode node, C context) { + return visitPlan(node, context); + } + + default R visitPatternRecognition(PatternRecognitionNode node, C context) { + return visitPlan(node, context); + } + + default R visitUnion(UnionNode node, C context) { + return visitPlan(node, context); + } + + default R visitIntersect(IntersectNode node, C context) { + return visitPlan(node, context); + } + + default R visitExcept(ExceptNode node, C context) { + return visitPlan(node, context); + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IQueryPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IQueryPlanVisitor.java deleted file mode 100644 index bba1a28314c2d..0000000000000 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IQueryPlanVisitor.java +++ /dev/null @@ -1,812 +0,0 @@ -/* - * 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.node_commons.plan.planner.plan.node; - -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesCountNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesSchemaScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.LevelTimeSeriesCountNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodeManagementMemoryMergeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsConvertNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsCountNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsSchemaScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaFetchMergeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryMergeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryOrderByHeatNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SeriesSchemaFetchScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TimeSeriesCountNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TimeSeriesSchemaScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.BatchActivateTemplateNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ConstructSchemaBlackListNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateAlignedTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateMultiTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.DeactivateTemplateNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.DeleteTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalBatchActivateTemplateNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalCreateMultiTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalCreateTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.PreDeactivateTemplateNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.RollbackPreDeactivateTemplateNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.RollbackSchemaBlackListNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.AlterLogicalViewNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.ConstructLogicalViewBlackListNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.CreateLogicalViewNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.DeleteLogicalViewNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.RollbackLogicalViewBlackListNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AI.InferenceNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ActiveRegionScanMergeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.CollectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ColumnInjectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceMergeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewIntoNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByTagNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.HorizontallyConcatNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.IntoNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MergeSortNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleDeviceViewNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SlidingWindowAggregationNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SortNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TopKNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TransformNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.InnerTimeJoinNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.LeftOuterTimeJoinNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryCollectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryMergeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryTransformNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.ShuffleSinkNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesAggregationScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.DeviceRegionScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.LastQueryScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.RegionScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationSourceNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanSourceNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowDiskUsageNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowQueriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.TimeseriesRegionScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AlignedAggregationTreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.NonAlignedAggregationTreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeAlignedDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.ConstructTableDevicesBlackListNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.DeleteTableDeviceNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.DeleteTableDevicesInBlackListNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.RollbackTableDevicesBlackListNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableAttributeColumnDropNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeCommitUpdateNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; -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.node.schema.TableNodeLocationAddNode; - -public interface IQueryPlanVisitor extends IPlanVisitor { - - ///////////////////////////////////////////////////////////////////////////////////////////////// - // Data Query Node - ///////////////////////////////////////////////////////////////////////////////////////////////// - - // source -------------------------------------------------------------------------------------- - - default R visitSourceNode(SourceNode node, C context) { - return visitPlan(node, context); - } - - default R visitSeriesScanSource(SeriesScanSourceNode node, C context) { - return visitSourceNode(node, context); - } - - default R visitSeriesScan(SeriesScanNode node, C context) { - return visitSeriesScanSource(node, context); - } - - default R visitAlignedSeriesScan(AlignedSeriesScanNode node, C context) { - return visitSeriesScanSource(node, context); - } - - default R visitSeriesAggregationSourceNode(SeriesAggregationSourceNode node, C context) { - return visitSourceNode(node, context); - } - - default R visitSeriesAggregationScan(SeriesAggregationScanNode node, C context) { - return visitSeriesAggregationSourceNode(node, context); - } - - default R visitAlignedSeriesAggregationScan(AlignedSeriesAggregationScanNode node, C context) { - return visitSeriesAggregationSourceNode(node, context); - } - - default R visitLastQueryScan(LastQueryScanNode node, C context) { - return visitSourceNode(node, context); - } - - default R visitRegionScan(RegionScanNode node, C context) { - return visitSourceNode(node, context); - } - - default R visitDeviceRegionScan(DeviceRegionScanNode node, C context) { - return visitRegionScan(node, context); - } - - default R visitTimeSeriesRegionScan(TimeseriesRegionScanNode node, C context) { - return visitRegionScan(node, context); - } - - default R visitCteScan(CteScanNode node, C context) { - return visitSourceNode(node, context); - } - - // single child -------------------------------------------------------------------------------- - - default R visitSingleChildProcess(SingleChildProcessNode node, C context) { - return visitPlan(node, context); - } - - default R visitFill(FillNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitFilter(FilterNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitSlidingWindowAggregation(SlidingWindowAggregationNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitLimit(LimitNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitOffset(OffsetNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitSort(SortNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitProject(ProjectNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitExchange(ExchangeNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitTransform(TransformNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitInto(IntoNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitInto( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitDeviceViewInto(DeviceViewIntoNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitColumnInject(ColumnInjectNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitSingleDeviceView(SingleDeviceViewNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitInference(InferenceNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitExplainAnalyze(ExplainAnalyzeNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitRawDataAggregation(RawDataAggregationNode node, C context) { - return visitSingleChildProcess(node, context); - } - - // two child ----------------------------------------------------------------------------------- - - default R visitTwoChildProcess(TwoChildProcessNode node, C context) { - return visitPlan(node, context); - } - - default R visitLeftOuterTimeJoin(LeftOuterTimeJoinNode node, C context) { - return visitTwoChildProcess(node, context); - } - - // multi child -------------------------------------------------------------------------------- - - default R visitMultiChildProcess(MultiChildProcessNode node, C context) { - return visitPlan(node, context); - } - - default R visitDeviceView(DeviceViewNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitAggregationMergeSort(AggregationMergeSortNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitDeviceMerge(DeviceMergeNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitGroupByLevel(GroupByLevelNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitGroupByTag(GroupByTagNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitAggregation(AggregationNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitFullOuterTimeJoin(FullOuterTimeJoinNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitInnerTimeJoin(InnerTimeJoinNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitLastQuery(LastQueryNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitLastQueryMerge(LastQueryMergeNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitLastQueryCollect(LastQueryCollectNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitLastQueryTransform(LastQueryTransformNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitMergeSort(MergeSortNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitCollect(CollectNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitTopK(TopKNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitHorizontallyConcat(HorizontallyConcatNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitRegionMerge(ActiveRegionScanMergeNode node, C context) { - return visitMultiChildProcess(node, context); - } - - // others ----------------------------------------------------------------------------------- - - default R visitShowQueries(ShowQueriesNode node, C context) { - return visitPlan(node, context); - } - - default R visitShowDiskUsage(ShowDiskUsageNode node, C context) { - return visitPlan(node, context); - } - - default R visitIdentitySink(IdentitySinkNode node, C context) { - return visitPlan(node, context); - } - - default R visitShuffleSink(ShuffleSinkNode node, C context) { - return visitPlan(node, context); - } - - ///////////////////////////////////////////////////////////////////////////////////////////////// - // Schema Write & Query Node - ///////////////////////////////////////////////////////////////////////////////////////////////// - - default R visitSchemaQueryMerge(SchemaQueryMergeNode node, C context) { - return visitPlan(node, context); - } - - default R visitSchemaQueryScan(SchemaQueryScanNode node, C context) { - return visitPlan(node, context); - } - - default R visitSchemaQueryOrderByHeat(SchemaQueryOrderByHeatNode node, C context) { - return visitPlan(node, context); - } - - default R visitTimeSeriesSchemaScan(TimeSeriesSchemaScanNode node, C context) { - return visitPlan(node, context); - } - - default R visitDevicesSchemaScan(DevicesSchemaScanNode node, C context) { - return visitPlan(node, context); - } - - default R visitDevicesCount(DevicesCountNode node, C context) { - return visitPlan(node, context); - } - - default R visitTimeSeriesCount(TimeSeriesCountNode node, C context) { - return visitPlan(node, context); - } - - default R visitLevelTimeSeriesCount(LevelTimeSeriesCountNode node, C context) { - return visitPlan(node, context); - } - - default R visitCountMerge(CountSchemaMergeNode node, C context) { - return visitPlan(node, context); - } - - default R visitCreateTimeSeries(CreateTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - default R visitSchemaFetchMerge(SchemaFetchMergeNode node, C context) { - return visitPlan(node, context); - } - - default R visitSeriesSchemaFetchScan(SeriesSchemaFetchScanNode node, C context) { - return visitPlan(node, context); - } - - default R visitDeviceSchemaFetchScan(DeviceSchemaFetchScanNode node, C context) { - return visitPlan(node, context); - } - - default R visitCreateAlignedTimeSeries(CreateAlignedTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - default R visitCreateMultiTimeSeries(CreateMultiTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - default R visitAlterTimeSeries(AlterTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - default R visitInternalCreateTimeSeries(InternalCreateTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - default R visitActivateTemplate(ActivateTemplateNode node, C context) { - return visitPlan(node, context); - } - - default R visitPreDeactivateTemplate(PreDeactivateTemplateNode node, C context) { - return visitPlan(node, context); - } - - default R visitRollbackPreDeactivateTemplate(RollbackPreDeactivateTemplateNode node, C context) { - return visitPlan(node, context); - } - - default R visitDeactivateTemplate(DeactivateTemplateNode node, C context) { - return visitPlan(node, context); - } - - default R visitInternalBatchActivateTemplate(InternalBatchActivateTemplateNode node, C context) { - return visitPlan(node, context); - } - - default R visitInternalCreateMultiTimeSeries(InternalCreateMultiTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - default R visitNodePathsSchemaScan(NodePathsSchemaScanNode node, C context) { - return visitPlan(node, context); - } - - default R visitNodeManagementMemoryMerge(NodeManagementMemoryMergeNode node, C context) { - return visitPlan(node, context); - } - - default R visitNodePathConvert(NodePathsConvertNode node, C context) { - return visitPlan(node, context); - } - - default R visitNodePathsCount(NodePathsCountNode node, C context) { - return visitPlan(node, context); - } - - default R visitDeleteTimeseries(DeleteTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - default R visitAlterEncodingCompressor(AlterEncodingCompressorNode node, C context) { - return visitPlan(node, context); - } - - default R visitAlterTimeSeriesDataType(AlterTimeSeriesNode node, C context) { - return visitPlan(node, context); - } - - default R visitConstructSchemaBlackList(ConstructSchemaBlackListNode node, C context) { - return visitPlan(node, context); - } - - default R visitRollbackSchemaBlackList(RollbackSchemaBlackListNode node, C context) { - return visitPlan(node, context); - } - - default R visitBatchActivateTemplate(BatchActivateTemplateNode node, C context) { - return visitPlan(node, context); - } - - default R visitCreateLogicalView(CreateLogicalViewNode node, C context) { - return visitPlan(node, context); - } - - default R visitConstructLogicalViewBlackList(ConstructLogicalViewBlackListNode node, C context) { - return visitPlan(node, context); - } - - default R visitRollbackLogicalViewBlackList(RollbackLogicalViewBlackListNode node, C context) { - return visitPlan(node, context); - } - - default R visitDeleteLogicalView(DeleteLogicalViewNode node, C context) { - return visitPlan(node, context); - } - - default R visitAlterLogicalView(AlterLogicalViewNode node, C context) { - return visitPlan(node, context); - } - - default R visitCreateOrUpdateTableDevice( - final CreateOrUpdateTableDeviceNode node, final C context) { - return visitPlan(node, context); - } - - default R visitTableDeviceAttributeUpdate( - final TableDeviceAttributeUpdateNode node, final C context) { - return visitPlan(node, context); - } - - default R visitTableDeviceFetch(final TableDeviceFetchNode node, final C context) { - return visitPlan(node, context); - } - - default R visitTableDeviceQueryScan(final TableDeviceQueryScanNode node, final C context) { - return visitPlan(node, context); - } - - default R visitTableDeviceQueryCount(final TableDeviceQueryCountNode node, final C context) { - return visitPlan(node, context); - } - - default R visitTableDeviceAttributeCommit( - final TableDeviceAttributeCommitUpdateNode node, final C context) { - return visitPlan(node, context); - } - - default R visitTableNodeLocationAdd(final TableNodeLocationAddNode node, final C context) { - return visitPlan(node, context); - } - - default R visitDeleteTableDevice(final DeleteTableDeviceNode node, final C context) { - return visitPlan(node, context); - } - - default R visitTableAttributeColumnDrop( - final TableAttributeColumnDropNode node, final C context) { - return visitPlan(node, context); - } - - default R visitConstructTableDevicesBlackList( - final ConstructTableDevicesBlackListNode node, final C context) { - return visitPlan(node, context); - } - - default R visitRollbackTableDevicesBlackList( - final RollbackTableDevicesBlackListNode node, final C context) { - return visitPlan(node, context); - } - - default R visitDeleteTableDevicesInBlackList( - final DeleteTableDevicesInBlackListNode node, final C context) { - return visitPlan(node, context); - } - - // =============================== Used for Table Model ==================================== - default R visitFilter( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitApply( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode node, C context) { - return visitTwoChildProcess(node, context); - } - - default R visitAssignUniqueId( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitEnforceSingleRow( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode node, - C context) { - return visitSingleChildProcess(node, context); - } - - default R visitCorrelatedJoin( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode node, - C context) { - return visitTwoChildProcess(node, context); - } - - default R visitTableScan(TableScanNode node, C context) { - return visitPlan(node, context); - } - - default R visitDeviceTableScan(DeviceTableScanNode node, C context) { - return visitTableScan(node, context); - } - - default R visitInformationSchemaTableScan(InformationSchemaTableScanNode node, C context) { - return visitTableScan(node, context); - } - - default R visitProject( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitLimit( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitOffset( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitMergeSort( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitExplainAnalyze( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode node, - C context) { - return visitSingleChildProcess(node, context); - } - - default R visitCopyTo( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitOutput( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitCollect( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitGapFill(GapFillNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitFill( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.FillNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitPreviousFill(PreviousFillNode node, C context) { - return visitFill(node, context); - } - - default R visitLinearFill(LinearFillNode node, C context) { - return visitFill(node, context); - } - - default R visitValueFill(ValueFillNode node, C context) { - return visitFill(node, context); - } - - default R visitSort( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitStreamSort( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitGroup(GroupNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitTopK( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode node, C context) { - return visitMultiChildProcess(node, context); - } - - default R visitTopKRanking( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode node, - C context) { - return visitSingleChildProcess(node, context); - } - - default R visitRowNumber(RowNumberNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitValuesNode(ValuesNode node, C context) { - return visitPlan(node, context); - } - - default R visitJoin( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode node, C context) { - return visitTwoChildProcess(node, context); - } - - default R visitSemiJoin(SemiJoinNode node, C context) { - return visitTwoChildProcess(node, context); - } - - default R visitGroupReference(GroupReference node, C context) { - return visitPlan(node, context); - } - - default R visitAggregation( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode node, - C context) { - return visitSingleChildProcess(node, context); - } - - default R visitTableExchange( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitAggregationTableScan( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode node, - C context) { - return visitDeviceTableScan(node, context); - } - - default R visitTreeDeviceViewScan(TreeDeviceViewScanNode node, C context) { - return visitDeviceTableScan(node, context); - } - - default R visitAggregationTreeDeviceViewScan(AggregationTreeDeviceViewScanNode node, C context) { - return visitAggregationTableScan(node, context); - } - - default R visitAlignedAggregationTreeDeviceViewScan( - AlignedAggregationTreeDeviceViewScanNode node, C context) { - return visitAggregationTreeDeviceViewScan(node, context); - } - - default R visitNonAlignedAggregationTreeDeviceViewScan( - NonAlignedAggregationTreeDeviceViewScanNode node, C context) { - return visitAggregationTreeDeviceViewScan(node, context); - } - - default R visitTreeAlignedDeviceViewScan(TreeAlignedDeviceViewScanNode node, C context) { - return visitTreeDeviceViewScan(node, context); - } - - default R visitTreeNonAlignedDeviceViewScan(TreeNonAlignedDeviceViewScanNode node, C context) { - return visitTreeDeviceViewScan(node, context); - } - - default R visitMarkDistinct(MarkDistinctNode node, C context) { - return visitSingleChildProcess(node, context); - } - - default R visitWindowFunction(WindowNode node, C context) { - return visitPlan(node, context); - } - - default R visitTableFunction(TableFunctionNode node, C context) { - return visitPlan(node, context); - } - - default R visitTableFunctionProcessor(TableFunctionProcessorNode node, C context) { - return visitPlan(node, context); - } - - default R visitPatternRecognition(PatternRecognitionNode node, C context) { - return visitPlan(node, context); - } - - default R visitUnion(UnionNode node, C context) { - return visitPlan(node, context); - } - - default R visitIntersect(IntersectNode node, C context) { - return visitPlan(node, context); - } - - default R visitExcept(ExceptNode node, C context) { - return visitPlan(node, context); - } -} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MultiChildProcessNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MultiChildProcessNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java index 715eca2414d88..7781971156f14 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MultiChildProcessNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +package org.apache.iotdb.db.node_commons.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProcessNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/ProcessNode.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProcessNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/ProcessNode.java index af4a39cd1161c..c02caa21f7889 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProcessNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/ProcessNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +package org.apache.iotdb.db.node_commons.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleChildProcessNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleChildProcessNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java index 989630849926e..dd48b789d1f46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleChildProcessNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +package org.apache.iotdb.db.node_commons.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FillNode.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FillNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FillNode.java index b310c2b15e753..15f0c620324ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FillNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import java.util.List; @@ -36,7 +36,7 @@ protected FillNode(PlanNodeId id, PlanNode child) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitFill(this, context); + return ((PlanVisitor) visitor).visitFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FilterNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java index 739fd66a4c8b0..7195e839093df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; @@ -46,7 +46,7 @@ public FilterNode(PlanNodeId id, PlanNode child, Expression predicate) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitFilter(this, context); + return ((PlanVisitor) visitor).visitFilter(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/JoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/JoinNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java index 5d4da802549d6..58dfa0998b941 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/JoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; @@ -46,8 +46,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.lang.String.format; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.EquiJoinClause.flipBatch; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.EquiJoinClause.flipBatch; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; public class JoinNode extends TwoChildProcessNode { @@ -176,7 +176,7 @@ public JoinNode flip() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitJoin(this, context); + return ((PlanVisitor) visitor).visitJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LimitNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LimitNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java index dd928b2a21b35..2149caa66f34f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LimitNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +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; @@ -73,7 +73,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitLimit(this, context); + return ((PlanVisitor) visitor).visitLimit(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java index 4570a98e8dc4a..3115ced539378 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java @@ -72,7 +72,7 @@ import java.util.Objects; import java.util.stream.Collectors; -public class PipePlanToStatementVisitor extends PlanVisitor { +public class PipePlanToStatementVisitor implements PlanVisitor { @Override public Statement visitPlan(final PlanNode node, final Void context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java index 4ff4d074f09d3..7d122b88d2fd4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java @@ -33,7 +33,7 @@ import java.util.stream.Collectors; public class PipePlanTablePatternParseVisitor - extends PlanVisitor, TablePattern> { + implements PlanVisitor, TablePattern> { @Override public Optional visitPlan(final PlanNode node, final TablePattern pattern) { return Optional.of(node); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java index aa1dba4a52577..457c372390b4e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; public class PipePlanTablePrivilegeParseVisitor - extends PlanVisitor, IAuditEntity> { + implements PlanVisitor, IAuditEntity> { @Override public Optional visitPlan(final PlanNode node, final IAuditEntity auditEntity) { return Optional.of(node); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java index 041c19b8330f5..03e06ae507042 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java @@ -68,7 +68,7 @@ * one is used in the {@link PipeSchemaRegionWritePlanEvent} in {@link SchemaRegionListeningQueue}. */ public class PipePlanTreePatternParseVisitor - extends PlanVisitor, IoTDBTreePatternOperations> { + implements PlanVisitor, IoTDBTreePatternOperations> { @Override public Optional visitPlan( final PlanNode node, final IoTDBTreePatternOperations pattern) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java index a9ff6463e88f3..b6a0b9531c942 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java @@ -62,7 +62,7 @@ import java.util.stream.IntStream; public class PipePlanTreePrivilegeParseVisitor - extends PlanVisitor, IAuditEntity> { + implements PlanVisitor, IAuditEntity> { private final boolean skip; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java index b3eaec5f218d4..6b17d3bbf1616 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java @@ -184,7 +184,7 @@ public RegionExecutionResult execute(final ConsensusGroupId groupId, final PlanN } private class WritePlanNodeExecutionVisitor - extends PlanVisitor { + implements PlanVisitor { @Override public RegionExecutionResult visitPlan( @@ -341,7 +341,7 @@ public RegionExecutionResult visitPipeEnrichedDeleteDataNode( // data deletion should block data insertion, especially when executed for deleting timeseries context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return super.visitPipeEnrichedDeleteDataNode(node, context); + return visitPipeEnrichedDeleteDataNode(node, context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } @@ -354,7 +354,7 @@ public RegionExecutionResult visitDeleteData( // require write lock on data region. context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return super.visitDeleteData(node, context); + return visitDeleteData(node, context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } @@ -367,7 +367,7 @@ public RegionExecutionResult visitDeleteData( // require write lock on data region. context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return super.visitDeleteData(node, context); + return visitDeleteData(node, context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } @@ -380,7 +380,7 @@ public RegionExecutionResult visitWriteObjectFile( // require write lock on data region. context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return super.visitWriteObjectFile(node, context); + return visitWriteObjectFile(node, context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } @@ -391,7 +391,7 @@ public RegionExecutionResult visitDeleteTimeseries( final DeleteTimeSeriesNode node, final WritePlanNodeExecutionContext context) { context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return super.visitDeleteTimeseries(node, context); + return visitDeleteTimeseries(node, context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } @@ -402,7 +402,7 @@ public RegionExecutionResult visitDeleteLogicalView( final DeleteLogicalViewNode node, final WritePlanNodeExecutionContext context) { context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return super.visitDeleteLogicalView(node, context); + return visitDeleteLogicalView(node, context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } @@ -440,7 +440,7 @@ private RegionExecutionResult executeCreateTimeSeries( Collections.singletonList(node.getPath().getMeasurement()), Collections.singletonList(node.getAlias())); if (failingMeasurementMap.isEmpty()) { - return super.visitCreateTimeSeries(node, context); + return visitCreateTimeSeries(node, context); } else { final MetadataException metadataException = failingMeasurementMap.get(0); LOGGER.info(METADATA_ERROR_MSG, metadataException.getMessage()); @@ -457,13 +457,12 @@ private RegionExecutionResult executeCreateTimeSeries( if (receivedFromPipe) { context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return super.visitPipeEnrichedWritePlanNode( - new PipeEnrichedWritePlanNode(node), context); + return visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } } else { - return super.visitCreateTimeSeries(node, context); + return visitCreateTimeSeries(node, context); } } } @@ -498,7 +497,7 @@ private RegionExecutionResult executeCreateAlignedTimeSeries( schemaRegion.checkMeasurementExistence( node.getDevicePath(), node.getMeasurements(), node.getAliasList()); if (failingMeasurementMap.isEmpty()) { - return super.visitCreateAlignedTimeSeries(node, context); + return visitCreateAlignedTimeSeries(node, context); } else { final MetadataException metadataException = failingMeasurementMap.values().iterator().next(); @@ -516,13 +515,12 @@ private RegionExecutionResult executeCreateAlignedTimeSeries( if (receivedFromPipe) { context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return super.visitPipeEnrichedWritePlanNode( - new PipeEnrichedWritePlanNode(node), context); + return visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } } else { - return super.visitCreateAlignedTimeSeries(node, context); + return visitCreateAlignedTimeSeries(node, context); } } } @@ -585,13 +583,12 @@ private RegionExecutionResult executeCreateMultiTimeSeries( if (receivedFromPipe) { context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return super.visitPipeEnrichedWritePlanNode( - new PipeEnrichedWritePlanNode(node), context); + return visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } } else { - return super.visitCreateMultiTimeSeries(node, context); + return visitCreateMultiTimeSeries(node, context); } } } @@ -634,8 +631,7 @@ private RegionExecutionResult registerTimeSeries( final List failingStatus) { if (!measurementGroupMap.isEmpty()) { // try registering the rest timeseries - final RegionExecutionResult executionResult = - super.visitCreateMultiTimeSeries(node, context); + final RegionExecutionResult executionResult = visitCreateMultiTimeSeries(node, context); if (failingStatus.isEmpty()) { return executionResult; } @@ -713,7 +709,7 @@ private RegionExecutionResult executeInternalCreateTimeSeries( return processExecutionResultOfInternalCreateSchema( !measurementGroup.isEmpty() - ? super.visitInternalCreateTimeSeries(node, context) + ? visitInternalCreateTimeSeries(node, context) : RegionExecutionResult.create( true, "Execute successfully", @@ -727,13 +723,12 @@ private RegionExecutionResult executeInternalCreateTimeSeries( if (receivedFromPipe) { context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return super.visitPipeEnrichedWritePlanNode( - new PipeEnrichedWritePlanNode(node), context); + return visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } } else { - return super.visitInternalCreateTimeSeries(node, context); + return visitInternalCreateTimeSeries(node, context); } } } @@ -815,7 +810,7 @@ private RegionExecutionResult executeInternalCreateMultiTimeSeries( return processExecutionResultOfInternalCreateSchema( !node.getDeviceMap().isEmpty() - ? super.visitInternalCreateMultiTimeSeries(node, context) + ? visitInternalCreateMultiTimeSeries(node, context) : RegionExecutionResult.create( true, "Execute successfully", @@ -829,13 +824,12 @@ private RegionExecutionResult executeInternalCreateMultiTimeSeries( if (receivedFromPipe) { context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return super.visitPipeEnrichedWritePlanNode( - new PipeEnrichedWritePlanNode(node), context); + return visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } } else { - return super.visitInternalCreateMultiTimeSeries(node, context); + return visitInternalCreateMultiTimeSeries(node, context); } } } @@ -949,8 +943,8 @@ private RegionExecutionResult executeAlterTimeSeries( measurementPath.getMeasurementSchema().getType())); } return receivedFromPipe - ? super.visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) - : super.visitAlterTimeSeries(node, context); + ? visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) + : visitAlterTimeSeries(node, context); } catch (MetadataException e) { return RegionExecutionResult.create( true, e.getMessage(), RpcUtils.getStatus(e.getErrorCode(), e.getMessage())); @@ -993,8 +987,8 @@ private RegionExecutionResult executeActivateTemplate( Collections.emptyList()); if (result == null) { return receivedFromPipe - ? super.visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) - : super.visitActivateTemplate(node, context); + ? visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) + : visitActivateTemplate(node, context); } else { return result; } @@ -1044,8 +1038,8 @@ private RegionExecutionResult executeBatchActivateTemplate( } return receivedFromPipe - ? super.visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) - : super.visitBatchActivateTemplate(node, context); + ? visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) + : visitBatchActivateTemplate(node, context); } finally { context.getRegionWriteValidationRWLock().readLock().unlock(); } @@ -1095,8 +1089,8 @@ private RegionExecutionResult executeInternalBatchActivateTemplate( } return receivedFromPipe - ? super.visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) - : super.visitInternalBatchActivateTemplate(node, context); + ? visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) + : visitInternalBatchActivateTemplate(node, context); } finally { context.getRegionWriteValidationRWLock().readLock().unlock(); } @@ -1145,15 +1139,15 @@ private RegionExecutionResult executeCreateLogicalView( } // step 2. make sure all source paths exist. return receivedFromPipe - ? super.visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) - : super.visitCreateLogicalView(node, context); + ? visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) + : visitCreateLogicalView(node, context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } } else { return receivedFromPipe - ? super.visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) - : super.visitCreateLogicalView(node, context); + ? visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) + : visitCreateLogicalView(node, context); } // end of visitCreateLogicalView } @@ -1177,8 +1171,8 @@ private RegionExecutionResult executeCreateOrUpdateTableDevice( false, e.getMessage(), RpcUtils.getStatus(e.getErrorCode(), e.getMessage())); } return receivedFromPipe - ? super.visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) - : super.visitCreateOrUpdateTableDevice(node, context); + ? visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) + : visitCreateOrUpdateTableDevice(node, context); } @Override @@ -1189,7 +1183,7 @@ public RegionExecutionResult visitPipeEnrichedWritePlanNode( } private class PipeEnrichedWriteSchemaNodeExecutionVisitor - extends PlanVisitor { + implements PlanVisitor { WritePlanNodeExecutionVisitor visitor; 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 d7222e1b75996..1dfd80025ac37 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 @@ -26,6 +26,8 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; @@ -38,10 +40,8 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByTagNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleDeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SlidingWindowAggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; @@ -183,7 +183,7 @@ private boolean cannotUseStatisticsForTemplate(Set aggregationExpres return false; } - private static class Rewriter extends PlanVisitor { + private static class Rewriter implements PlanVisitor { @Override public PlanNode visitPlan(PlanNode node, RewriterContext context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java index 921ab33058807..f7c83903d9b10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.optimization; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; 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.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ColumnInjectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SlidingWindowAggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationSourceNode; @@ -77,7 +77,7 @@ public PlanNode optimize(PlanNode plan, Analysis analysis, MPPQueryContext conte return plan; } - private static class Rewriter extends PlanVisitor { + private static class Rewriter implements PlanVisitor { @Override public PlanNode visitPlan(PlanNode node, Void context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java index 9e5149d9d34cc..2ca6fc7cb8411 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.optimization; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TransformNode; @@ -87,7 +87,7 @@ public PlanNode optimize(PlanNode plan, Analysis analysis, MPPQueryContext conte return plan.accept(new Rewriter(), new RewriterContext(analysis)); } - private static class Rewriter extends PlanVisitor { + private static class Rewriter implements PlanVisitor { @Override public PlanNode visitPlan(PlanNode node, RewriterContext context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java index 90b5d2fdb434c..25b0bfa69c7d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.optimization; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -27,9 +29,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MergeSortNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TransformNode; @@ -93,7 +93,7 @@ public PlanNode optimize(PlanNode plan, Analysis analysis, MPPQueryContext conte return plan.accept(new Rewriter(), new RewriterContext(context)); } - private static class Rewriter extends PlanVisitor { + private static class Rewriter implements PlanVisitor { @Override public PlanNode visitPlan(PlanNode node, RewriterContext context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java index 5a555832f41b2..65fabf0e3a5ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java @@ -24,6 +24,8 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; @@ -35,9 +37,7 @@ 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.planner.plan.node.process.FilterNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TransformNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.InnerTimeJoinNode; @@ -82,7 +82,7 @@ public PlanNode optimize(PlanNode plan, Analysis analysis, MPPQueryContext conte new Rewriter(), new RewriterContext(analysis, context, queryStatement.isAlignByDevice())); } - private static class Rewriter extends PlanVisitor { + private static class Rewriter implements PlanVisitor { @Override public PlanNode visitPlan(PlanNode node, RewriterContext context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index ea084f3679ea9..759058fde317f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -16,12 +16,14 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; 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.calc_commons.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; @@ -79,6 +81,7 @@ import org.apache.iotdb.db.queryengine.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; 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.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; @@ -127,6 +130,9 @@ import org.apache.tsfile.common.conf.TSFileDescriptor; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.IDeviceID; +import org.apache.tsfile.file.metadata.idcolumn.FourOrHigherLevelDBExtractor; +import org.apache.tsfile.file.metadata.idcolumn.ThreeLevelDBExtractor; +import org.apache.tsfile.file.metadata.idcolumn.TwoLevelDBExtractor; import org.apache.tsfile.read.TimeValuePair; import org.apache.tsfile.read.common.TimeRange; import org.apache.tsfile.read.common.type.BinaryType; @@ -185,7 +191,8 @@ import static org.apache.iotdb.db.utils.constant.SqlConstant.SUM; import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; -public class DataNodeTableOperatorGenerator extends TableOperatorGenerator { +public class DataNodeTableOperatorGenerator extends TableOperatorGenerator + implements PlanVisitor { private static final MPPDataExchangeManager MPP_DATA_EXCHANGE_MANAGER = MPPDataExchangeService.getInstance().getMPPDataExchangeManager(); @@ -279,6 +286,29 @@ public Operator visitTableExchange(ExchangeNode node, LocalExecutionPlanContext return exchangeOperator; } + public static IDeviceID.TreeDeviceIdColumnValueExtractor createTreeDeviceIdColumnValueExtractor( + String treeDBName) { + try { + PartialPath db = new PartialPath(treeDBName); + int dbLevel = db.getNodes().length; + // For the path of 'root.**', we can only get the root level in this place + // In this case, we still need to support deviceId such as 'root.db' + // The relevant deviceId must be two level db, but we can't get it now + if (dbLevel == 1 || dbLevel == 2) { + return new TwoLevelDBExtractor(treeDBName.length()); + } else if (dbLevel == 3) { + return new ThreeLevelDBExtractor(treeDBName.length()); + } else if (dbLevel >= 4) { + return new FourOrHigherLevelDBExtractor(dbLevel); + } else { + throw new IllegalArgumentException( + "tree db name should at least be two level: " + treeDBName); + } + } catch (IllegalPathException e) { + throw new IllegalArgumentException(e); + } + } + @Override public Operator visitTreeNonAlignedDeviceViewScan( TreeNonAlignedDeviceViewScanNode node, LocalExecutionPlanContext context) { @@ -325,7 +355,7 @@ public Operator visitTreeNonAlignedDeviceViewScan( } String treePrefixPath = DataNodeTreeViewSchemaUtils.getPrefixPath(tsTable); IDeviceID.TreeDeviceIdColumnValueExtractor extractor = - TableOperatorGenerator.createTreeDeviceIdColumnValueExtractor(treePrefixPath); + createTreeDeviceIdColumnValueExtractor(treePrefixPath); long viewTTL = tsTable.getCachedTableTTL(); DeviceIteratorScanOperator.TreeNonAlignedDeviceViewScanParameters parameter = 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 66559989b0a83..8709ffb04a995 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 @@ -30,6 +30,7 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.template.Template; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; @@ -72,7 +73,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.IntoNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MergeSortNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleDeviceViewNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index 91fc26d5d1fec..f562d0000574f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -31,6 +31,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.NodeRef; @@ -214,7 +215,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.IntoNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MergeSortNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; @@ -331,7 +331,7 @@ import static org.apache.iotdb.db.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; /** This Visitor is responsible for transferring PlanNode Tree to Operator Tree. */ -public class OperatorTreeGenerator extends PlanVisitor { +public class OperatorTreeGenerator implements PlanVisitor { private static final Logger LOGGER = LoggerFactory.getLogger(OperatorTreeGenerator.class); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java index 009d45ae54008..f7895e05a1bcd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java @@ -21,6 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.partition.DataPartition; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -47,7 +48,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.HorizontallyConcatNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MergeSortNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleDeviceViewNode; @@ -78,7 +78,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; -public class ExchangeNodeAdder extends PlanVisitor { +public class ExchangeNodeAdder implements PlanVisitor { private final Analysis analysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java index adb1b8520b08b..eb186e8109fa2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java @@ -31,6 +31,7 @@ import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; @@ -55,7 +56,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.HorizontallyConcatNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MergeSortNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleDeviceViewNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java index 11f8afd64480a..30b310868ecce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java @@ -24,7 +24,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; -public class BaseSourceRewriter extends PlanVisitor, C> { +public class BaseSourceRewriter implements PlanVisitor, C> { @Override public List visitPlan(PlanNode node, C context) { // TODO: (xingtanzjr) we apply no action for IWritePlanNode currently 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 4d3751f1a518a..16c7cea4ed926 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 @@ -21,9 +21,8 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import java.io.DataOutputStream; import java.io.IOException; @@ -52,7 +51,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitExplainAnalyze(this, context); + return ((PlanVisitor) visitor).visitExplainAnalyze(this, context); } @Override 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 180b4b9f1be11..8b7811f72839a 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 @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; @@ -109,7 +110,7 @@ import static com.google.common.base.Preconditions.checkArgument; -public class PlanGraphPrinter extends PlanVisitor, PlanGraphPrinter.GraphContext> { +public class PlanGraphPrinter implements PlanVisitor, PlanGraphPrinter.GraphContext> { private static final String INDENT = " "; private static final String HORIZONTAL = "─"; @@ -820,7 +821,7 @@ public List visitMarkDistinct(MarkDistinctNode node, GraphContext contex @Override public List visitFilter( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode node, + org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Filter-%s", node.getPlanNodeId().getId())); @@ -930,7 +931,7 @@ public List visitTableExchange(ExchangeNode node, GraphContext context) @Override public List visitLimit( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode node, + org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Limit-%s", node.getPlanNodeId().getId())); @@ -1039,9 +1040,7 @@ public List visitCorrelatedJoin(CorrelatedJoinNode node, GraphContext co } @Override - public List visitJoin( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode node, - GraphContext context) { + public List visitJoin(JoinNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Join-%s", node.getPlanNodeId().getId())); if (node.getAsofCriteria().isPresent()) { 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 7f255d0fe5f81..c1405c60e99ba 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePieceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; @@ -652,7 +653,7 @@ public static PlanNode deserialize(ByteBuffer buffer, short nodeType) { 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( + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode.deserialize( buffer); case 1002: return org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode.deserialize( @@ -661,7 +662,7 @@ public static PlanNode deserialize(ByteBuffer buffer, short nodeType) { return org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode.deserialize( buffer); case 1004: - return org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode.deserialize( + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode.deserialize( buffer); case 1005: return org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode.deserialize( @@ -682,8 +683,7 @@ public static PlanNode deserialize(ByteBuffer buffer, short nodeType) { return org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode .deserialize(buffer); case 1011: - return org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.deserialize( - buffer); + return JoinNode.deserialize(buffer); case 1012: return PreviousFillNode.deserialize(buffer); case 1013: 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 846a9f20d105f..925327af79399 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 @@ -19,12 +19,96 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesCountNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesSchemaScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.LevelTimeSeriesCountNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodeManagementMemoryMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsConvertNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsCountNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsSchemaScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaFetchMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryOrderByHeatNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SeriesSchemaFetchScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TimeSeriesCountNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TimeSeriesSchemaScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.BatchActivateTemplateNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ConstructSchemaBlackListNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateAlignedTimeSeriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateMultiTimeSeriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateTimeSeriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.DeactivateTemplateNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.DeleteTimeSeriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalBatchActivateTemplateNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalCreateMultiTimeSeriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalCreateTimeSeriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.PreDeactivateTemplateNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.RollbackPreDeactivateTemplateNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.RollbackSchemaBlackListNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.AlterLogicalViewNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.ConstructLogicalViewBlackListNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.CreateLogicalViewNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.DeleteLogicalViewNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.RollbackLogicalViewBlackListNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedInsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedNonWritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedWritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeOperateSchemaQueueNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AI.InferenceNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ActiveRegionScanMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.CollectNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ColumnInjectNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewIntoNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByTagNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.HorizontallyConcatNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.IntoNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MergeSortNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleDeviceViewNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SlidingWindowAggregationNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SortNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TopKNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TransformNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.InnerTimeJoinNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.LeftOuterTimeJoinNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryCollectNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryMergeNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryTransformNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.ShuffleSinkNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesAggregationScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.DeviceRegionScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.LastQueryScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.RegionScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationSourceNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanSourceNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowDiskUsageNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowQueriesNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.TimeseriesRegionScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertMultiTabletsNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; @@ -36,55 +120,498 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertRowNode; 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.node.AggregationTreeDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AlignedAggregationTreeDeviceViewScanNode; +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.NonAlignedAggregationTreeDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeAlignedDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.ConstructTableDevicesBlackListNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.DeleteTableDeviceNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.DeleteTableDevicesInBlackListNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.RollbackTableDevicesBlackListNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableAttributeColumnDropNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeCommitUpdateNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; +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.node.schema.TableNodeLocationAddNode; @SuppressWarnings("java:S6539") // suppress "Monster class" warning -public abstract class PlanVisitor implements IQueryPlanVisitor { +public interface PlanVisitor extends ICoreQueryPlanVisitor { + + ///////////////////////////////////////////////////////////////////////////////////////////////// + // Data Query Node + ///////////////////////////////////////////////////////////////////////////////////////////////// + + // source -------------------------------------------------------------------------------------- + + default R visitSeriesScanSource(SeriesScanSourceNode node, C context) { + return visitSourceNode(node, context); + } + + default R visitSeriesScan(SeriesScanNode node, C context) { + return visitSeriesScanSource(node, context); + } + + default R visitAlignedSeriesScan(AlignedSeriesScanNode node, C context) { + return visitSeriesScanSource(node, context); + } + + default R visitSeriesAggregationSourceNode(SeriesAggregationSourceNode node, C context) { + return visitSourceNode(node, context); + } + + default R visitSeriesAggregationScan(SeriesAggregationScanNode node, C context) { + return visitSeriesAggregationSourceNode(node, context); + } + + default R visitAlignedSeriesAggregationScan(AlignedSeriesAggregationScanNode node, C context) { + return visitSeriesAggregationSourceNode(node, context); + } + + default R visitLastQueryScan(LastQueryScanNode node, C context) { + return visitSourceNode(node, context); + } + + default R visitRegionScan(RegionScanNode node, C context) { + return visitSourceNode(node, context); + } + + default R visitDeviceRegionScan(DeviceRegionScanNode node, C context) { + return visitRegionScan(node, context); + } + + default R visitTimeSeriesRegionScan(TimeseriesRegionScanNode node, C context) { + return visitRegionScan(node, context); + } + + // single child -------------------------------------------------------------------------------- + + default R visitFill(FillNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitFilter(FilterNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitSlidingWindowAggregation(SlidingWindowAggregationNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitLimit(LimitNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitOffset(OffsetNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitSort(SortNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitProject(ProjectNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitExchange(ExchangeNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitTransform(TransformNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitInto(IntoNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitInto( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitDeviceViewInto(DeviceViewIntoNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitColumnInject(ColumnInjectNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitSingleDeviceView(SingleDeviceViewNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitInference(InferenceNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitExplainAnalyze(ExplainAnalyzeNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitRawDataAggregation(RawDataAggregationNode node, C context) { + return visitSingleChildProcess(node, context); + } + + // two child ----------------------------------------------------------------------------------- + + default R visitLeftOuterTimeJoin(LeftOuterTimeJoinNode node, C context) { + return visitTwoChildProcess(node, context); + } + + // multi child -------------------------------------------------------------------------------- + + default R visitDeviceView(DeviceViewNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitAggregationMergeSort(AggregationMergeSortNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitDeviceMerge(DeviceMergeNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitGroupByLevel(GroupByLevelNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitGroupByTag(GroupByTagNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitAggregation(AggregationNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitFullOuterTimeJoin(FullOuterTimeJoinNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitInnerTimeJoin(InnerTimeJoinNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitLastQuery(LastQueryNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitLastQueryMerge(LastQueryMergeNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitLastQueryCollect(LastQueryCollectNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitLastQueryTransform(LastQueryTransformNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitMergeSort(MergeSortNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitCollect(CollectNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitTopK(TopKNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitHorizontallyConcat(HorizontallyConcatNode node, C context) { + return visitMultiChildProcess(node, context); + } + + default R visitRegionMerge(ActiveRegionScanMergeNode node, C context) { + return visitMultiChildProcess(node, context); + } + + // others ----------------------------------------------------------------------------------- + + default R visitShowQueries(ShowQueriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitShowDiskUsage(ShowDiskUsageNode node, C context) { + return visitPlan(node, context); + } + + default R visitIdentitySink(IdentitySinkNode node, C context) { + return visitPlan(node, context); + } + + default R visitShuffleSink(ShuffleSinkNode node, C context) { + return visitPlan(node, context); + } + + ///////////////////////////////////////////////////////////////////////////////////////////////// + // Schema Write & Query Node + ///////////////////////////////////////////////////////////////////////////////////////////////// + + default R visitSchemaQueryMerge(SchemaQueryMergeNode node, C context) { + return visitPlan(node, context); + } + + default R visitSchemaQueryScan(SchemaQueryScanNode node, C context) { + return visitPlan(node, context); + } + + default R visitSchemaQueryOrderByHeat(SchemaQueryOrderByHeatNode node, C context) { + return visitPlan(node, context); + } + + default R visitTimeSeriesSchemaScan(TimeSeriesSchemaScanNode node, C context) { + return visitPlan(node, context); + } + + default R visitDevicesSchemaScan(DevicesSchemaScanNode node, C context) { + return visitPlan(node, context); + } + + default R visitDevicesCount(DevicesCountNode node, C context) { + return visitPlan(node, context); + } + + default R visitTimeSeriesCount(TimeSeriesCountNode node, C context) { + return visitPlan(node, context); + } + + default R visitLevelTimeSeriesCount(LevelTimeSeriesCountNode node, C context) { + return visitPlan(node, context); + } + + default R visitCountMerge(CountSchemaMergeNode node, C context) { + return visitPlan(node, context); + } + + default R visitCreateTimeSeries(CreateTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitSchemaFetchMerge(SchemaFetchMergeNode node, C context) { + return visitPlan(node, context); + } + + default R visitSeriesSchemaFetchScan(SeriesSchemaFetchScanNode node, C context) { + return visitPlan(node, context); + } + + default R visitDeviceSchemaFetchScan(DeviceSchemaFetchScanNode node, C context) { + return visitPlan(node, context); + } + + default R visitCreateAlignedTimeSeries(CreateAlignedTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitCreateMultiTimeSeries(CreateMultiTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitAlterTimeSeries(AlterTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitInternalCreateTimeSeries(InternalCreateTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitActivateTemplate(ActivateTemplateNode node, C context) { + return visitPlan(node, context); + } + + default R visitPreDeactivateTemplate(PreDeactivateTemplateNode node, C context) { + return visitPlan(node, context); + } + + default R visitRollbackPreDeactivateTemplate(RollbackPreDeactivateTemplateNode node, C context) { + return visitPlan(node, context); + } + + default R visitDeactivateTemplate(DeactivateTemplateNode node, C context) { + return visitPlan(node, context); + } + + default R visitInternalBatchActivateTemplate(InternalBatchActivateTemplateNode node, C context) { + return visitPlan(node, context); + } + + default R visitInternalCreateMultiTimeSeries(InternalCreateMultiTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitNodePathsSchemaScan(NodePathsSchemaScanNode node, C context) { + return visitPlan(node, context); + } + + default R visitNodeManagementMemoryMerge(NodeManagementMemoryMergeNode node, C context) { + return visitPlan(node, context); + } + + default R visitNodePathConvert(NodePathsConvertNode node, C context) { + return visitPlan(node, context); + } + + default R visitNodePathsCount(NodePathsCountNode node, C context) { + return visitPlan(node, context); + } + + default R visitDeleteTimeseries(DeleteTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitAlterEncodingCompressor(AlterEncodingCompressorNode node, C context) { + return visitPlan(node, context); + } + + default R visitAlterTimeSeriesDataType(AlterTimeSeriesNode node, C context) { + return visitPlan(node, context); + } + + default R visitConstructSchemaBlackList(ConstructSchemaBlackListNode node, C context) { + return visitPlan(node, context); + } + + default R visitRollbackSchemaBlackList(RollbackSchemaBlackListNode node, C context) { + return visitPlan(node, context); + } + + default R visitBatchActivateTemplate(BatchActivateTemplateNode node, C context) { + return visitPlan(node, context); + } + + default R visitCreateLogicalView(CreateLogicalViewNode node, C context) { + return visitPlan(node, context); + } + + default R visitConstructLogicalViewBlackList(ConstructLogicalViewBlackListNode node, C context) { + return visitPlan(node, context); + } + + default R visitRollbackLogicalViewBlackList(RollbackLogicalViewBlackListNode node, C context) { + return visitPlan(node, context); + } + + default R visitDeleteLogicalView(DeleteLogicalViewNode node, C context) { + return visitPlan(node, context); + } + + default R visitAlterLogicalView(AlterLogicalViewNode node, C context) { + return visitPlan(node, context); + } + + default R visitCreateOrUpdateTableDevice( + final CreateOrUpdateTableDeviceNode node, final C context) { + return visitPlan(node, context); + } + + default R visitTableDeviceAttributeUpdate( + final TableDeviceAttributeUpdateNode node, final C context) { + return visitPlan(node, context); + } + + default R visitTableDeviceFetch(final TableDeviceFetchNode node, final C context) { + return visitPlan(node, context); + } + + default R visitTableDeviceQueryScan(final TableDeviceQueryScanNode node, final C context) { + return visitPlan(node, context); + } + + default R visitTableDeviceQueryCount(final TableDeviceQueryCountNode node, final C context) { + return visitPlan(node, context); + } + + default R visitTableDeviceAttributeCommit( + final TableDeviceAttributeCommitUpdateNode node, final C context) { + return visitPlan(node, context); + } + + default R visitTableNodeLocationAdd(final TableNodeLocationAddNode node, final C context) { + return visitPlan(node, context); + } + + default R visitDeleteTableDevice(final DeleteTableDeviceNode node, final C context) { + return visitPlan(node, context); + } + + default R visitTableAttributeColumnDrop( + final TableAttributeColumnDropNode node, final C context) { + return visitPlan(node, context); + } + + default R visitConstructTableDevicesBlackList( + final ConstructTableDevicesBlackListNode node, final C context) { + return visitPlan(node, context); + } + + default R visitRollbackTableDevicesBlackList( + final RollbackTableDevicesBlackListNode node, final C context) { + return visitPlan(node, context); + } + + default R visitDeleteTableDevicesInBlackList( + final DeleteTableDevicesInBlackListNode node, final C context) { + return visitPlan(node, context); + } ///////////////////////////////////////////////////////////////////////////////////////////////// // Data Write Node ///////////////////////////////////////////////////////////////////////////////////////////////// - public R visitInsertRow(InsertRowNode node, C context) { + default R visitInsertRow(InsertRowNode node, C context) { return visitPlan(node, context); } - public R visitRelationalInsertRow(RelationalInsertRowNode node, C context) { + default R visitRelationalInsertRow(RelationalInsertRowNode node, C context) { return visitInsertRow(node, context); } - public R visitRelationalInsertRows(RelationalInsertRowsNode node, C context) { + default R visitRelationalInsertRows(RelationalInsertRowsNode node, C context) { return visitInsertRows(node, context); } - public R visitInsertTablet(InsertTabletNode node, C context) { + default R visitInsertTablet(InsertTabletNode node, C context) { return visitPlan(node, context); } - public R visitRelationalInsertTablet(RelationalInsertTabletNode node, C context) { + default R visitRelationalInsertTablet(RelationalInsertTabletNode node, C context) { return visitInsertTablet(node, context); } - public R visitInsertRows(InsertRowsNode node, C context) { + default R visitInsertRows(InsertRowsNode node, C context) { return visitPlan(node, context); } - public R visitInsertMultiTablets(InsertMultiTabletsNode node, C context) { + default R visitInsertMultiTablets(InsertMultiTabletsNode node, C context) { return visitPlan(node, context); } - public R visitInsertRowsOfOneDevice(InsertRowsOfOneDeviceNode node, C context) { + default R visitInsertRowsOfOneDevice(InsertRowsOfOneDeviceNode node, C context) { return visitPlan(node, context); } - public R visitDeleteData(DeleteDataNode node, C context) { + default R visitDeleteData(DeleteDataNode node, C context) { return visitPlan(node, context); } - public R visitDeleteData(RelationalDeleteDataNode node, C context) { + default R visitDeleteData(RelationalDeleteDataNode node, C context) { return visitPlan(node, context); } - public R visitWriteObjectFile(ObjectNode node, C context) { + default R visitWriteObjectFile(ObjectNode node, C context) { return visitPlan(node, context); } @@ -92,23 +619,85 @@ public R visitWriteObjectFile(ObjectNode node, C context) { // Pipe Related Node ///////////////////////////////////////////////////////////////////////////////////////////////// - public R visitPipeEnrichedInsertNode(PipeEnrichedInsertNode node, C context) { + default R visitPipeEnrichedInsertNode(PipeEnrichedInsertNode node, C context) { + return visitPlan(node, context); + } + + default R visitPipeEnrichedDeleteDataNode(PipeEnrichedDeleteDataNode node, C context) { return visitPlan(node, context); } - public R visitPipeEnrichedDeleteDataNode(PipeEnrichedDeleteDataNode node, C context) { + default R visitPipeEnrichedWritePlanNode(PipeEnrichedWritePlanNode node, C context) { return visitPlan(node, context); } - public R visitPipeEnrichedWritePlanNode(PipeEnrichedWritePlanNode node, C context) { + default R visitPipeEnrichedNonWritePlanNode(PipeEnrichedNonWritePlanNode node, C context) { return visitPlan(node, context); } - public R visitPipeEnrichedNonWritePlanNode(PipeEnrichedNonWritePlanNode node, C context) { + default R visitPipeOperateSchemaQueueNode(PipeOperateSchemaQueueNode node, C context) { return visitPlan(node, context); } - public R visitPipeOperateSchemaQueueNode(PipeOperateSchemaQueueNode node, C context) { + // =============================== Used for Table Model ==================================== + + default R visitTableScan(TableScanNode node, C context) { return visitPlan(node, context); } + + default R visitDeviceTableScan(DeviceTableScanNode node, C context) { + return visitTableScan(node, context); + } + + default R visitInformationSchemaTableScan(InformationSchemaTableScanNode node, C context) { + return visitTableScan(node, context); + } + + default R visitExplainAnalyze( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode node, + C context) { + return visitSingleChildProcess(node, context); + } + + default R visitCopyTo( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitTableExchange( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode node, C context) { + return visitSingleChildProcess(node, context); + } + + default R visitAggregationTableScan( + org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode node, + C context) { + return visitDeviceTableScan(node, context); + } + + default R visitTreeDeviceViewScan(TreeDeviceViewScanNode node, C context) { + return visitDeviceTableScan(node, context); + } + + default R visitAggregationTreeDeviceViewScan(AggregationTreeDeviceViewScanNode node, C context) { + return visitAggregationTableScan(node, context); + } + + default R visitAlignedAggregationTreeDeviceViewScan( + AlignedAggregationTreeDeviceViewScanNode node, C context) { + return visitAggregationTreeDeviceViewScan(node, context); + } + + default R visitNonAlignedAggregationTreeDeviceViewScan( + NonAlignedAggregationTreeDeviceViewScanNode node, C context) { + return visitAggregationTreeDeviceViewScan(node, context); + } + + default R visitTreeAlignedDeviceViewScan(TreeAlignedDeviceViewScanNode node, C context) { + return visitTreeDeviceViewScan(node, context); + } + + default R visitTreeNonAlignedDeviceViewScan(TreeNonAlignedDeviceViewScanNode node, C context) { + return visitTreeDeviceViewScan(node, context); + } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java index ed5bdb37bcfb2..40e91cf68ecbb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -public class SimplePlanVisitor extends PlanVisitor { +public class SimplePlanVisitor implements PlanVisitor { @Override public Void visitPlan(PlanNode node, C context) { for (PlanNode source : node.getChildren()) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java index 3207d4db06e1b..b91181b27934e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProcessNode; import java.util.ArrayList; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java index 7a764bd4a3c31..dda21cf8b888f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; import java.io.IOException; @@ -62,7 +62,7 @@ public static PlanNode deserialize(ByteBuffer byteBuffer) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitCountMerge(this, context); + return ((PlanVisitor) visitor).visitCountMerge(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java index c9eae1accd0b1..e6695e044dc45 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; import java.io.IOException; @@ -97,6 +97,6 @@ public static DeviceSchemaFetchScanNode deserialize(ByteBuffer byteBuffer) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitDeviceSchemaFetchScan(this, context); + return ((PlanVisitor) visitor).visitDeviceSchemaFetchScan(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java index f1b4093d3a119..fdf5a8b1557f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java @@ -22,11 +22,11 @@ import org.apache.iotdb.common.rpc.thrift.TSchemaNode; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -89,7 +89,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitNodeManagementMemoryMerge(this, context); + return ((PlanVisitor) visitor).visitNodeManagementMemoryMerge(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java index 31d2b1b6d027c..e17a027c622b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; @@ -77,7 +77,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitNodePathConvert(this, context); + return ((PlanVisitor) visitor).visitNodePathConvert(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java index fc22ce3314508..119ff719dff01 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; @@ -77,7 +77,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitNodePathsCount(this, context); + return ((PlanVisitor) visitor).visitNodePathsCount(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java index ea9cab58a7c8f..8bd98766a6e52 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.tsfile.utils.ReadWriteIOUtils; @@ -92,7 +92,7 @@ public static PlanNode deserialize(ByteBuffer byteBuffer) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitSchemaFetchMerge(this, context); + return ((PlanVisitor) visitor).visitSchemaFetchMerge(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java index 3bf8b69e786b5..eb9dfcab834ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; import java.io.IOException; @@ -74,7 +74,7 @@ public static SchemaQueryMergeNode deserialize(ByteBuffer byteBuffer) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitSchemaQueryMerge(this, context); + return ((PlanVisitor) visitor).visitSchemaQueryMerge(this, context); } @Override 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 f3cd780b44bdd..a7e724630aff4 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 @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; import java.io.IOException; @@ -76,7 +76,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitSchemaQueryOrderByHeat(this, context); + return ((PlanVisitor) visitor).visitSchemaQueryOrderByHeat(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java index 1ac8961a6188e..56ff6e2df6eb4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java @@ -24,10 +24,10 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import java.util.Collections; @@ -165,7 +165,7 @@ public String toString() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitSchemaQueryScan(this, context); + return ((PlanVisitor) visitor).visitSchemaQueryScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java index 1c7341e5e62ed..8600a7ce75209 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java @@ -24,11 +24,11 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -156,7 +156,7 @@ public static SeriesSchemaFetchScanNode deserialize(ByteBuffer byteBuffer) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitSeriesSchemaFetchScan(this, context); + return ((PlanVisitor) visitor).visitSeriesSchemaFetchScan(this, context); } public boolean isWithTags() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java index 7d01012f20362..a4aecff9e2337 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.IActivateTemplateInClusterPlan; @@ -173,7 +173,7 @@ public List splitByPartition(IAnalysis analysis) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitActivateTemplate(this, context); + return ((PlanVisitor) visitor).visitActivateTemplate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java index be0b91f727748..7cfdc9f9ba658 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.utils.SerializeUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; @@ -103,7 +103,7 @@ public List getOutputColumnNames() { @Override public R accept(final IPlanVisitor visitor, final C context) { - return ((IQueryPlanVisitor) visitor).visitAlterEncodingCompressor(this, context); + return ((PlanVisitor) visitor).visitAlterEncodingCompressor(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java index 75c31259f41ce..841b2548e60a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.tsfile.utils.Pair; @@ -173,7 +173,7 @@ public List splitByPartition(IAnalysis analysis) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitBatchActivateTemplate(this, context); + return ((PlanVisitor) visitor).visitBatchActivateTemplate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java index 9b2794ab4d863..bbddec0540e17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; import java.io.IOException; @@ -75,7 +75,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitConstructSchemaBlackList(this, context); + return ((PlanVisitor) visitor).visitConstructSchemaBlackList(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java index 1c3f47d70f9b6..bc13684fb9f29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.ICreateTimeSeriesPlan; @@ -351,7 +351,7 @@ protected void serializeAttributes(final DataOutputStream stream) throws IOExcep @Override public R accept(final IPlanVisitor visitor, final C schemaRegion) { - return ((IQueryPlanVisitor) visitor).visitCreateTimeSeries(this, schemaRegion); + return ((PlanVisitor) visitor).visitCreateTimeSeries(this, schemaRegion); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java index 57919e233618a..0576d58fbf4b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.write.req.IDeactivateTemplatePlan; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -78,7 +78,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitDeactivateTemplate(this, context); + return ((PlanVisitor) visitor).visitDeactivateTemplate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java index 65155ae30e59d..c98327d399922 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; import java.io.IOException; @@ -75,7 +75,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitDeleteTimeseries(this, context); + return ((PlanVisitor) visitor).visitDeleteTimeseries(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java index d3a39f0d54449..1ff255215b959 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.tsfile.utils.Pair; @@ -167,7 +167,7 @@ public List splitByPartition(IAnalysis analysis) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitInternalBatchActivateTemplate(this, context); + return ((PlanVisitor) visitor).visitInternalBatchActivateTemplate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java index d2c025e1f6f0b..492460dae00bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.tsfile.utils.Pair; @@ -170,7 +170,7 @@ public List splitByPartition(IAnalysis analysis) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitInternalCreateMultiTimeSeries(this, context); + return ((PlanVisitor) visitor).visitInternalCreateMultiTimeSeries(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java index 61784102dca22..b061f9650b001 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import com.google.common.collect.ImmutableList; @@ -108,7 +108,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitInternalCreateTimeSeries(this, context); + return ((PlanVisitor) visitor).visitInternalCreateTimeSeries(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java index aa52922c21612..1618836a11379 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.write.req.IPreDeactivateTemplatePlan; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -78,7 +78,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitPreDeactivateTemplate(this, context); + return ((PlanVisitor) visitor).visitPreDeactivateTemplate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java index 4ef336126da6e..626e0d2b0a8af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.write.req.IRollbackPreDeactivateTemplatePlan; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -80,7 +80,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitRollbackPreDeactivateTemplate(this, context); + return ((PlanVisitor) visitor).visitRollbackPreDeactivateTemplate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java index 6012f3b1a35c8..23a1b5603b734 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; import java.io.IOException; @@ -75,7 +75,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitRollbackSchemaBlackList(this, context); + return ((PlanVisitor) visitor).visitRollbackSchemaBlackList(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java index 5a71ec2eb7473..6089dba1f19e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java @@ -25,10 +25,10 @@ import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.tsfile.exception.NotImplementedException; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -94,7 +94,7 @@ private void collectAllSourcePaths(ViewExpression viewExpression, Set R accept(final IPlanVisitor visitor, final C context) { - return ((IQueryPlanVisitor) visitor).visitAlterLogicalView(this, context); + return ((PlanVisitor) visitor).visitAlterLogicalView(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java index 21fa8e716c129..447e0f260862b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; import java.io.IOException; @@ -75,7 +75,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitConstructLogicalViewBlackList(this, context); + return ((PlanVisitor) visitor).visitConstructLogicalViewBlackList(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java index 82b1069bb9732..c2d5f20df3795 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java @@ -26,11 +26,11 @@ import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.GetSourcePathsVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.view.ICreateLogicalViewPlan; @@ -119,7 +119,7 @@ public void setViewPathToSourceExpressionMap( @Override public R accept(IPlanVisitor visitor, C schemaRegion) { - return ((IQueryPlanVisitor) visitor).visitCreateLogicalView(this, schemaRegion); + return ((PlanVisitor) visitor).visitCreateLogicalView(this, schemaRegion); } // endregion diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java index 93cba9c023a90..01d4127c7a116 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; import java.io.IOException; @@ -74,7 +74,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitDeleteLogicalView(this, context); + return ((PlanVisitor) visitor).visitDeleteLogicalView(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java index d59bb85580f1e..3104bb3a70388 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; import java.io.IOException; @@ -74,7 +74,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitRollbackLogicalViewBlackList(this, context); + return ((PlanVisitor) visitor).visitRollbackLogicalViewBlackList(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java index 32fbf5d03c821..6763096d6b066 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AI; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.model.ModelInferenceDescriptor; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -81,7 +81,7 @@ public boolean isGenerateTimeColumn() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitInference(this, context); + return ((PlanVisitor) visitor).visitInference(this, context); } @Override 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 9886cb8ea20ff..854ef70b5b4c5 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 @@ -22,10 +22,11 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.tsfile.utils.ReadWriteIOUtils; @@ -121,7 +122,7 @@ public String toString() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitRegionMerge(this, context); + return ((PlanVisitor) visitor).visitRegionMerge(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java index aebd642528d8e..e03eb5d62d47d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java @@ -20,11 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -111,7 +112,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitAggregationMergeSort(this, context); + return ((PlanVisitor) visitor).visitAggregationMergeSort(this, context); } @Override 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 289436ab35b3c..3be0e4985f21e 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 @@ -21,11 +21,12 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationSourceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByParameter; @@ -217,7 +218,7 @@ public static List findAggregationSourceNode(PlanNo @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitAggregation(this, context); + return ((PlanVisitor) visitor).visitAggregation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java index 29c1a3d233304..8522f824820cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.tsfile.utils.ReadWriteIOUtils; @@ -51,7 +52,7 @@ public CollectNode(PlanNodeId id, List children, List outputCo @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitCollect(this, context); + return ((PlanVisitor) visitor).visitCollect(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java index 1f938569d9b08..d797739148c99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.utils.columngenerator.parameter.ColumnGeneratorParameter; import org.apache.tsfile.enums.TSDataType; @@ -60,7 +61,7 @@ public ColumnInjectNode( @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitColumnInject(this, context); + return ((PlanVisitor) visitor).visitColumnInject(this, context); } public List getGeneratedColumnTypes() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java index 8671011ab7698..040f1b0c4e30d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.OrderByParameter; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -87,7 +88,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitDeviceMerge(this, context); + return ((PlanVisitor) visitor).visitDeviceMerge(this, context); } @Override 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 c8c074f6a0e65..6d57e7501e8c6 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 @@ -22,10 +22,11 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.DeviceViewIntoPathDescriptor; import java.io.DataOutputStream; @@ -93,7 +94,7 @@ public static DeviceViewIntoNode deserialize(ByteBuffer byteBuffer) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitDeviceViewInto(this, context); + return ((PlanVisitor) visitor).visitDeviceViewInto(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java index 3af3979aca908..3da741a893ff2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java @@ -20,11 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.OrderByParameter; import org.apache.tsfile.file.metadata.IDeviceID; @@ -130,7 +131,7 @@ public void setOutputColumnNames(List outputColumnNames) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitDeviceView(this, context); + return ((PlanVisitor) visitor).visitDeviceView(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java index 3da6e7a2c5bc4..fa4e2e78d9887 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java @@ -21,11 +21,12 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -66,7 +67,7 @@ public int allowedChildCount() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitExchange(this, context); + return ((PlanVisitor) visitor).visitExchange(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java index 80867fbb76038..26ab8318cf0cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.FillDescriptor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -73,7 +74,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitFill(this, context); + return ((PlanVisitor) visitor).visitFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java index 8ec4ccf02d729..97d8c0ca00d9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -71,7 +71,7 @@ public FilterNode( @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitFilter(this, context); + return ((PlanVisitor) visitor).visitFilter(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java index 0088937144779..528f014e12d5c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.CrossSeriesAggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; @@ -127,7 +128,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitGroupByLevel(this, context); + return ((PlanVisitor) visitor).visitGroupByLevel(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java index c84a948e68cec..2ec573b2b5b35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.CrossSeriesAggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -121,7 +122,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitGroupByTag(this, context); + return ((PlanVisitor) visitor).visitGroupByTag(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java index 0e930dca0a363..35b7272239833 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; import java.io.IOException; @@ -75,7 +76,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitHorizontallyConcat(this, context); + return ((PlanVisitor) visitor).visitHorizontallyConcat(this, context); } @Override 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 59686c94bcac6..dc4b371f73ae5 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 @@ -22,10 +22,11 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.IntoPathDescriptor; import java.io.DataOutputStream; @@ -90,7 +91,7 @@ public static IntoNode deserialize(ByteBuffer byteBuffer) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitInto(this, context); + return ((PlanVisitor) visitor).visitInto(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java index 7159b7953ab4c..37df9c8287786 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.tsfile.utils.ReadWriteIOUtils; @@ -69,7 +70,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitLimit(this, context); + return ((PlanVisitor) visitor).visitLimit(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java index b577bea0fbdcc..2a06510e3ebc4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.OrderByParameter; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -87,7 +88,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitMergeSort(this, context); + return ((PlanVisitor) visitor).visitMergeSort(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java index 6fe66a3239bfb..6c600edc9dba6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.tsfile.utils.ReadWriteIOUtils; @@ -67,7 +68,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitOffset(this, context); + return ((PlanVisitor) visitor).visitOffset(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java index 0b981bc222f67..16e48e7343821 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java @@ -20,11 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.tsfile.utils.ReadWriteIOUtils; @@ -70,7 +71,7 @@ public void setOutputColumnNames(List outputColumnNames) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitProject(this, context); + return ((PlanVisitor) visitor).visitProject(this, context); } @Override 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 701d58402e453..54f4724284856 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 @@ -21,11 +21,12 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; @@ -211,7 +212,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitRawDataAggregation(this, context); + return ((PlanVisitor) visitor).visitRawDataAggregation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java index fec55aca123bd..1326b86f72d1c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java @@ -19,11 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -109,7 +110,7 @@ public List getDeviceToMeasurementIndexes() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitSingleDeviceView(this, context); + return ((PlanVisitor) visitor).visitSingleDeviceView(this, context); } @Override 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 3ac458cd4c6a2..97625a3b345b2 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 @@ -21,10 +21,11 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -132,7 +133,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitSlidingWindowAggregation(this, context); + return ((PlanVisitor) visitor).visitSlidingWindowAggregation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java index 03620d849b107..79248740e92fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.OrderByParameter; import com.google.common.base.Objects; @@ -68,7 +69,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitSort(this, context); + return ((PlanVisitor) visitor).visitSort(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java index 50773d725ff8b..fc77c207c24d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.OrderByParameter; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -101,7 +102,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitTopK(this, context); + return ((PlanVisitor) visitor).visitTopK(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java index e1f9882cea0b1..a6f8f0771fea4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java @@ -20,11 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -79,7 +80,7 @@ public final List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitTransform(this, context); + return ((PlanVisitor) visitor).visitTransform(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java index 149e8024933ee..157053fc51df9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java index 57e87eadd7af7..8e2a8a3b7fabb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -98,7 +98,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitFullOuterTimeJoin(this, context); + return ((PlanVisitor) visitor).visitFullOuterTimeJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java index f9376e2f99f6e..1a6d49252d146 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -133,7 +133,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitInnerTimeJoin(this, context); + return ((PlanVisitor) visitor).visitInnerTimeJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java index 33e5fcd9eafa7..33c41ae1a27f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -89,7 +89,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitLeftOuterTimeJoin(this, context); + return ((PlanVisitor) visitor).visitLeftOuterTimeJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java index 9e3b37f1c105d..0633c5e345f46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; import java.io.IOException; @@ -93,7 +93,7 @@ public int hashCode() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitLastQueryCollect(this, context); + return ((PlanVisitor) visitor).visitLastQueryCollect(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java index 3445a722b133b..814e4a09a8e9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -110,7 +110,7 @@ public int hashCode() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitLastQueryMerge(this, context); + return ((PlanVisitor) visitor).visitLastQueryMerge(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java index 823accca982dc..c851f43d28179 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.LastQueryScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -199,7 +199,7 @@ public int hashCode() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitLastQuery(this, context); + return ((PlanVisitor) visitor).visitLastQuery(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java index fe5c0a7a58208..482ff2fb36caf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -92,7 +92,7 @@ public static LastQueryTransformNode deserialize(ByteBuffer byteBuffer) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitLastQueryTransform(this, context); + return ((PlanVisitor) visitor).visitLastQueryTransform(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java index 224a7c94b5d87..8f4f0a1b6757f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.tsfile.utils.ReadWriteIOUtils; @@ -73,7 +73,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitIdentitySink(this, context); + return ((PlanVisitor) visitor).visitIdentitySink(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java index 93bd736112337..dc51f3df788c5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.tsfile.utils.ReadWriteIOUtils; @@ -72,7 +72,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitShuffleSink(this, context); + return ((PlanVisitor) visitor).visitShuffleSink(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java index 47a7a095d7591..3eaa32e9de2ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java @@ -24,7 +24,6 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; @@ -32,6 +31,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; @@ -195,7 +195,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitAlignedSeriesAggregationScan(this, context); + return ((PlanVisitor) visitor).visitAlignedSeriesAggregationScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java index 6c7b3ce504720..df30b42f5b067 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java @@ -24,7 +24,6 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; @@ -32,6 +31,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.tsfile.common.constant.TsFileConstant; @@ -141,7 +141,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitAlignedSeriesScan(this, context); + return ((PlanVisitor) visitor).visitAlignedSeriesScan(this, context); } @Override 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 f40a4762bb7bd..af1e033f32536 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 @@ -25,12 +25,12 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -93,7 +93,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitDeviceRegionScan(this, context); + return ((PlanVisitor) visitor).visitDeviceRegionScan(this, context); } @Override 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 fa69d8386406c..0dbe0495c3b34 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 @@ -24,12 +24,12 @@ import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; import org.apache.tsfile.enums.TSDataType; @@ -247,7 +247,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitLastQueryScan(this, context); + return ((PlanVisitor) visitor).visitLastQueryScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java index c302e12211d73..a186124e44f29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.util.Objects; import java.util.Set; @@ -87,7 +87,7 @@ public boolean equals(Object o) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitRegionScan(this, context); + return ((PlanVisitor) visitor).visitRegionScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java index 7974aea91a191..ea109f45baa0e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java @@ -23,13 +23,13 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; @@ -185,7 +185,7 @@ public void close() throws Exception {} @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitSeriesAggregationScan(this, context); + return ((PlanVisitor) visitor).visitSeriesAggregationScan(this, context); } @Override 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 846a68df1bbaf..2b0ae8a9e1389 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 @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -115,7 +115,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitSeriesAggregationSourceNode(this, context); + return ((PlanVisitor) visitor).visitSeriesAggregationSourceNode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java index 506b8b16657c0..c1b8556105a64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java @@ -23,13 +23,13 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import com.google.common.collect.ImmutableList; @@ -120,7 +120,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitSeriesScan(this, context); + return ((PlanVisitor) visitor).visitSeriesScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java index f2f5ffa0f243e..f254d766550e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import com.google.common.collect.ImmutableList; @@ -161,7 +161,7 @@ public void addChild(PlanNode child) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitSeriesScanSource(this, context); + return ((PlanVisitor) visitor).visitSeriesScanSource(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java index 1f7ee81e63c07..b92e8326ec8a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java @@ -24,11 +24,11 @@ import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -141,7 +141,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitShowDiskUsage(this, context); + return ((PlanVisitor) visitor).visitShowDiskUsage(this, context); } // We only use DataNodeLocation when do distributionPlan, so DataNodeLocation is no need to 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 99e9f34982dba..b4002061d24b0 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 @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -88,7 +88,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitShowQueries(this, context); + return ((PlanVisitor) visitor).visitShowQueries(this, context); } // We only use DataNodeLocation when do distributionPlan, so DataNodeLocation is no need to 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 4c603c888cb1a..4ec660a4e7845 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 @@ -28,11 +28,11 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -114,7 +114,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitTimeSeriesRegionScan(this, context); + return ((PlanVisitor) visitor).visitTimeSeriesRegionScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java index 5176e87a29326..aee57659664d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -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.sql.ast.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index 071a6a05da671..e8660b5a965cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -33,10 +35,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Aggregation; -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.GroupNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PreviousFillNode; 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 47dc87499b975..ad8133a982061 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 @@ -21,6 +21,8 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -58,10 +60,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; -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.IntersectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Measure; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java index d2a8ec781a197..8322c0a52c152 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java @@ -28,7 +28,7 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.ChildReplacer.replaceChildren; public abstract class SimplePlanRewriter - extends PlanVisitor> { + implements PlanVisitor> { public static PlanNode rewriteWith(SimplePlanRewriter rewriter, PlanNode node) { return node.accept(rewriter, new RewriteContext<>(rewriter, null)); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java index 2226bb021796c..fe3db50d9e885 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -33,7 +34,6 @@ 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.EnforceSingleRowNode; -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.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; 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 c33cb05250bd1..01f062729ca44 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 @@ -27,6 +27,8 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -53,9 +55,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; 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.IntoNode; -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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java index c74f8bd5b4b25..8688e9123dcbf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java @@ -43,7 +43,7 @@ import static org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistributionType.SAME_WITH_SOME_CHILD; public class AddExchangeNodes - extends PlanVisitor { + implements PlanVisitor { private final MPPQueryContext queryContext; 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 700b43152cab2..1b79d388d0ebc 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 @@ -34,17 +34,21 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.ClusterTopology; -import org.apache.iotdb.db.queryengine.plan.planner.TableOperatorGenerator; +import org.apache.iotdb.db.queryengine.plan.planner.DataNodeTableOperatorGenerator; import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; import org.apache.iotdb.db.queryengine.plan.planner.exceptions.RootFIPlacementException; 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.planner.plan.node.WritePlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; @@ -68,14 +72,10 @@ 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.GroupNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode; -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.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.NonAlignedAggregationTreeDeviceViewScanNode; @@ -156,7 +156,7 @@ /** This class is used to generate distributed plan for table model. */ public class TableDistributedPlanGenerator - extends PlanVisitor, TableDistributedPlanGenerator.PlanContext> { + implements PlanVisitor, TableDistributedPlanGenerator.PlanContext> { private final MPPQueryContext queryContext; private final QueryId queryId; private final Analysis analysis; @@ -1905,7 +1905,7 @@ private void processSortProperty( DataNodeTableCache.getInstance() .getTable(qualifiedObjectName.getDatabaseName(), qualifiedObjectName.getObjectName()); return Optional.of( - TableOperatorGenerator.createTreeDeviceIdColumnValueExtractor( + DataNodeTableOperatorGenerator.createTreeDeviceIdColumnValueExtractor( DataNodeTreeViewSchemaUtils.getPrefixPath(table))); } else { return Optional.empty(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java index 8e8a688811fb3..0f2384bded796 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; @@ -30,13 +34,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; -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.GroupNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode; -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; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode; 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/plan/relational/planner/iterative/GroupReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java index d84f87cdfa338..b33f1a4630328 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.Symbol; import com.google.common.collect.ImmutableList; @@ -73,7 +73,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitGroupReference(this, context); + return ((PlanVisitor) visitor).visitGroupReference(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java index 0e603eddfd191..8bd606e6f878d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java @@ -33,7 +33,7 @@ public static PlanNode resolveGroupReferences(PlanNode node, Lookup lookup) { return node.accept(new ResolvingVisitor(lookup), null); } - private static class ResolvingVisitor extends PlanVisitor { + private static class ResolvingVisitor implements PlanVisitor { private final Lookup lookup; public ResolvingVisitor(Lookup lookup) { 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 25cf1155592ea..6d8a2569d0e33 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 @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; 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; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; 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 14bb434241c15..e9313bb0373e7 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 @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; 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; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java index ec7e886115f4d..6def85481dedd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; 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.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Measure; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java index 9cb2de735114f..ee5e94e6b8d7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java index 7b3d1c0015601..49b8709716486 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java index af31281c918aa..a6034c3a24a53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java index 388631c795b04..e1599bd767f67 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java index be87e2042ea0d..9cd9a13cdca1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java index 97c0303a1c109..8bea3672611fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java index 879d0833910bb..aeaa11ce53591 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -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.SortNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java index 05b54ae21e53b..d547305ed4deb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java index 90948d96a41d6..93fa0abbba90e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode; 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.TopKNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java index dba8e1181129f..f9d9330a1302d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java index 70d4f3021dddc..d8bffc9c4c752 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java index 37d604f3dd4a8..4b0735ae1ee7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java @@ -68,7 +68,7 @@ private static boolean isDistinctOperator(AggregationNode node) { return node.getAggregations().isEmpty(); } - private static class DistinctAggregationRewriter extends PlanVisitor { + private static class DistinctAggregationRewriter implements PlanVisitor { private final Lookup lookup; private boolean rewritten; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java index d6b19643c02ed..8059da85a297a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FillNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java index 28be2b531a22f..936ed1f35a2ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.FilterNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java index d52dca46efe83..fe553d0c51655 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; 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.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java index c09710346ed09..a8e5d059c3227 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java index ab5b76cec43d2..2ed5a68024108 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java index d7ecab9cabfe4..69e33daeac245 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java index e3ce8619c5beb..e7f20ef0114bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java index 5f302f3d3dcaa..d936c56db3545 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -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.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java index aece5057546d0..d86ab6a651373 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -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.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java index 0c2c11ac72085..43cce40c74448 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java index 0927eea552ddd..fb4aab42b268f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java index badc7dff3c499..955c7451d8222 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java @@ -26,8 +26,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.RIGHT; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.RIGHT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.isAtLeastScalar; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java index a79f86dec91e8..47177fe191093 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; @@ -27,7 +28,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; @@ -45,8 +45,8 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java index 6af314ec33946..4fb95a4e00b62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; @@ -40,9 +40,9 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java index ffae9eb5c8e02..91c3edb6add02 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; @@ -27,7 +28,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; @@ -50,13 +50,13 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.rewriteWithMasks; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Aggregation.groupingColumns; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java index 5e85f39454b6b..bfb84bdc3794e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; @@ -27,7 +28,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; @@ -47,14 +47,14 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.rewriteWithMasks; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Aggregation.groupingColumns; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java index cae6088c8784f..c207b8541818a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; @@ -27,7 +28,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; @@ -45,10 +45,10 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Aggregation.groupingColumns; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java index 208e3ed5e0019..f6aa213c24029 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; @@ -40,11 +40,11 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Aggregation.groupingColumns; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java index f24de2d1b0d76..f47dcc024e65f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; @@ -35,9 +35,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index 3dcb42f5ddd01..a2091c8e4e49d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; 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.Assignments; @@ -27,7 +28,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; @@ -46,9 +46,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanNodeSearcher.searchFrom; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java index 0e864eed38642..ebf24e7b278fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; @@ -28,7 +29,6 @@ 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.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; @@ -48,10 +48,10 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.globalAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java index 1f32fdbffe157..9f0efc02a7674 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.iterative.Rule; -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.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; @@ -40,12 +40,12 @@ import java.util.function.Predicate; import static com.google.common.collect.ImmutableList.toImmutableList; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.semiJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java index 6d96843e89302..cbe385fcec44f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; 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.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -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.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationNode.java index 4324733d55523..229c91cfd94fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationNode.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; @@ -220,7 +220,7 @@ public boolean hasOrderings() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitAggregation(this, context); + return ((PlanVisitor) visitor).visitAggregation(this, context); } @Override 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 7e39790340a84..5fe33861cd4a4 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 @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.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.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; @@ -284,7 +284,7 @@ public AggregationTableScanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitAggregationTableScan(this, context); + return ((PlanVisitor) visitor).visitAggregationTableScan(this, context); } public static AggregationTableScanNode combineAggregationAndTableScan( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java index 570b23654b38c..9b066809da874 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; @@ -104,7 +104,7 @@ public Map getMeasurementColumnNameMap() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitAggregationTreeDeviceViewScan(this, context); + return ((PlanVisitor) visitor).visitAggregationTreeDeviceViewScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java index 3c28cde337ac2..8514bcbb32f46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; @@ -88,8 +88,7 @@ private AlignedAggregationTreeDeviceViewScanNode() {} @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor) - .visitAlignedAggregationTreeDeviceViewScan(this, context); + return ((PlanVisitor) visitor).visitAlignedAggregationTreeDeviceViewScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java index 52edc0d4d90fa..36605c54eb272 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; @@ -119,7 +119,7 @@ public List getOutputSymbols() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitApply(this, context); + return ((PlanVisitor) visitor).visitApply(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AssignUniqueId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AssignUniqueId.java index c3a7a28d4317c..bb4395950849c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AssignUniqueId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AssignUniqueId.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; @@ -49,7 +49,7 @@ public AssignUniqueId(PlanNodeId id, PlanNode child, Symbol idColumn) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitAssignUniqueId(this, context); + return ((PlanVisitor) visitor).visitAssignUniqueId(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CollectNode.java index 04df2d8ee8d47..a6707f84bedb4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CollectNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; @@ -58,7 +58,7 @@ public CollectNode(PlanNodeId id, List children, List outputSy @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitCollect(this, context); + return ((PlanVisitor) visitor).visitCollect(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java index e28880181718e..3525f4fe5b8fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import java.io.DataOutputStream; @@ -92,7 +92,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitCopyTo(this, context); + return ((PlanVisitor) visitor).visitCopyTo(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java index e367dd1c314dc..e669484a64f07 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java @@ -20,9 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; 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.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; @@ -140,7 +141,7 @@ public PlanNode replaceChildren(List newChildren) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitCorrelatedJoin(this, context); + return ((PlanVisitor) visitor).visitCorrelatedJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java index 1c094f34837e5..ac56389b3b2fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; 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.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; @@ -69,7 +69,7 @@ public CteDataStore getDataStore() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitCteScan(this, context); + return ((PlanVisitor) visitor).visitCteScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java index 02452900f9f6b..3478c2d089dff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.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.AlignedDeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; @@ -123,7 +123,7 @@ public DeviceTableScanNode( @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitDeviceTableScan(this, context); + return ((PlanVisitor) visitor).visitDeviceTableScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/EnforceSingleRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/EnforceSingleRowNode.java index 6900c5b477af3..154a04204be54 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/EnforceSingleRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/EnforceSingleRowNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.Iterables; @@ -51,7 +51,7 @@ public PlanNode getSource() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitEnforceSingleRow(this, context); + return ((PlanVisitor) visitor).visitEnforceSingleRow(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java index 611aa8bf1bc37..c5db4f3ede539 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.Symbol; import com.google.common.collect.ListMultimap; @@ -58,7 +58,7 @@ private ExceptNode( @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitExcept(this, context); + return ((PlanVisitor) visitor).visitExcept(this, context); } public boolean isDistinct() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java index 6a2adbe7d82db..bce1021da9058 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java @@ -21,12 +21,12 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -65,7 +65,7 @@ public int allowedChildCount() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitTableExchange(this, context); + return ((PlanVisitor) visitor).visitTableExchange(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java index 07c9bffdba207..80ab4f2a68e90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import java.io.DataOutputStream; @@ -64,7 +64,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitExplainAnalyze(this, context); + return ((PlanVisitor) visitor).visitExplainAnalyze(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GapFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GapFillNode.java index d64a09629280b..f94a7e45ee9e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GapFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GapFillNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.Iterables; @@ -102,7 +102,7 @@ public long getNonMonthDuration() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitGapFill(this, context); + return ((PlanVisitor) visitor).visitGapFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GroupNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GroupNode.java index 90139fd69ac25..94ec6f1aa5e93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GroupNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GroupNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.OrderingScheme; import com.google.common.collect.Iterables; @@ -69,7 +69,7 @@ public int getPartitionKeyCount() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitGroup(this, context); + return ((PlanVisitor) visitor).visitGroup(this, context); } @Override 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 index 267c5f04f2adf..45e3cc534bb27 100644 --- 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 @@ -20,10 +20,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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; @@ -86,7 +86,7 @@ protected InformationSchemaTableScanNode() {} @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitInformationSchemaTableScan(this, context); + return ((PlanVisitor) visitor).visitInformationSchemaTableScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java index 9321368aef360..0a400e2b0901c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.Symbol; import com.google.common.collect.ListMultimap; @@ -57,7 +57,7 @@ private IntersectNode( @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitIntersect(this, context); + return ((PlanVisitor) visitor).visitIntersect(this, context); } public boolean isDistinct() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java index 7a8562625651f..8644a871d8d71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +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.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; @@ -70,7 +70,7 @@ public IntoNode( @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitInto(this, context); + return ((PlanVisitor) visitor).visitInto(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LinearFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LinearFillNode.java index 512241df8026a..24b2d0b965a09 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LinearFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LinearFillNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import com.google.common.collect.Iterables; @@ -66,7 +67,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitLinearFill(this, context); + return ((PlanVisitor) visitor).visitLinearFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MarkDistinctNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MarkDistinctNode.java index 218af8473ee0d..8a2b89c972ed7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MarkDistinctNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MarkDistinctNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; @@ -99,7 +99,7 @@ public Optional getHashSymbol() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitMarkDistinct(this, context); + return ((PlanVisitor) visitor).visitMarkDistinct(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MergeSortNode.java index 905f757d41b80..42e65bb8d69af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MergeSortNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +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; @@ -66,7 +66,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitMergeSort(this, context); + return ((PlanVisitor) visitor).visitMergeSort(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java index 91d09c8982185..d9b8cc1b59ae8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; @@ -88,7 +88,7 @@ private NonAlignedAggregationTreeDeviceViewScanNode() {} @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor) + return ((PlanVisitor) visitor) .visitNonAlignedAggregationTreeDeviceViewScan(this, context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java index d8cb4041109f9..79b287995893f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; @@ -56,7 +56,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitOffset(this, context); + return ((PlanVisitor) visitor).visitOffset(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java index 6ebfb67f49a7a..562af0ac9ed76 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; @@ -70,7 +70,7 @@ public OutputNode(PlanNodeId id, List columnNames, List outputSy @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitOutput(this, context); + return ((PlanVisitor) visitor).visitOutput(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PatternRecognitionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PatternRecognitionNode.java index b66f0700510a2..013d3b35cf083 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PatternRecognitionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PatternRecognitionNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +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.rowpattern.ExpressionAndValuePointers; @@ -141,7 +141,7 @@ public Map getVariableDefinitions() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitPatternRecognition(this, context); + return ((PlanVisitor) visitor).visitPatternRecognition(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java index d661862a7433e..a186c676d3781 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PreviousFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PreviousFillNode.java index 4496e7ea7f59a..47a7f3f3e1d6f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PreviousFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PreviousFillNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import com.google.common.collect.Iterables; @@ -79,7 +80,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitPreviousFill(this, context); + return ((PlanVisitor) visitor).visitPreviousFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java index 764d3b0096b7b..675dab2b99bed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; 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.sql.ast.Expression; @@ -49,7 +49,7 @@ public ProjectNode(PlanNodeId id, PlanNode child, Assignments assignments) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitProject(this, context); + return ((PlanVisitor) visitor).visitProject(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/RowNumberNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/RowNumberNode.java index 26f67c3203b44..0b6eb585f781b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/RowNumberNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/RowNumberNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; @@ -101,7 +101,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitRowNumber(this, context); + return ((PlanVisitor) visitor).visitRowNumber(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SemiJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SemiJoinNode.java index 33eb0120171bc..2a09594f0bc1e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SemiJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SemiJoinNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -99,7 +99,7 @@ public List getOutputSymbols() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitSemiJoin(this, context); + return ((PlanVisitor) visitor).visitSemiJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java index b4c7cd09c2265..c0e9ad101d3d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SortNode.java index 06d4a258d9987..5e9e55531c28c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SortNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +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; @@ -67,7 +67,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitSort(this, context); + return ((PlanVisitor) visitor).visitSort(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/StreamSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/StreamSortNode.java index 63891645cb0ce..251c0084b1340 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/StreamSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/StreamSortNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.OrderingScheme; import com.google.common.base.Objects; @@ -69,7 +69,7 @@ public PlanNode replaceChildren(List newChildren) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitStreamSort(this, context); + return ((PlanVisitor) visitor).visitStreamSort(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionNode.java index d6778840b5966..bc05ccf7e65d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -244,7 +244,7 @@ public static TableFunctionNode deserialize(ByteBuffer byteBuffer) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitTableFunction(this, context); + return ((PlanVisitor) visitor).visitTableFunction(this, context); } public static class TableArgumentProperties { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionProcessorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionProcessorNode.java index fb2903094d13f..1225f6a24165a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionProcessorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionProcessorNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -184,7 +184,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitTableFunctionProcessor(this, context); + return ((PlanVisitor) visitor).visitTableFunctionProcessor(this, context); } @Override 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 72dd47ff4e8df..e4de5df8da090 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 @@ -22,10 +22,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.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.Metadata; @@ -108,7 +108,7 @@ protected TableScanNode() {} @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitTableScan(this, context); + return ((PlanVisitor) visitor).visitTableScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKNode.java index 7796bb9525176..313bf9ad61b5f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +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; @@ -83,7 +83,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitTopK(this, context); + return ((PlanVisitor) visitor).visitTopK(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKRankingNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKRankingNode.java index 809b0fc344d01..d1f5bd11220f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKRankingNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKRankingNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -97,7 +97,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitTopKRanking(this, context); + return ((PlanVisitor) visitor).visitTopKRanking(this, context); } public DataOrganizationSpecification getSpecification() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java index 71b5f5377687a..5dd0ee9e66214 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; @@ -76,7 +76,7 @@ public TreeAlignedDeviceViewScanNode() {} @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitTreeAlignedDeviceViewScan(this, context); + return ((PlanVisitor) visitor).visitTreeAlignedDeviceViewScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java index f7707bac08811..6ea1da9f2c0c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; @@ -106,7 +106,7 @@ public Map getMeasurementColumnNameMap() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitTreeDeviceViewScan(this, context); + return ((PlanVisitor) visitor).visitTreeDeviceViewScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java index f7f8eef9b33c9..d938cea022f3a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; @@ -76,7 +76,7 @@ public TreeNonAlignedDeviceViewScanNode() {} @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitTreeNonAlignedDeviceViewScan(this, context); + return ((PlanVisitor) visitor).visitTreeNonAlignedDeviceViewScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/UnionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/UnionNode.java index a639affcda44e..884d0fe4f568b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/UnionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/UnionNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import com.google.common.collect.ImmutableListMultimap; @@ -62,7 +62,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitUnion(this, context); + return ((PlanVisitor) visitor).visitUnion(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValueFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValueFillNode.java index e989db00f9b3e..47054cec3451c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValueFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValueFillNode.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; @@ -54,7 +55,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitValueFill(this, context); + return ((PlanVisitor) visitor).visitValueFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValuesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValuesNode.java index 5e8bdc7495338..d2190b2b75f6f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValuesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValuesNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; @@ -117,7 +117,7 @@ public ValuesNode( @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitValuesNode(this, context); + return ((PlanVisitor) visitor).visitValuesNode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/WindowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/WindowNode.java index 752c8eb84bb70..b9799a0282d58 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/WindowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/WindowNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; @@ -155,7 +155,7 @@ public PlanNode replaceChildren(List newChildren) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitWindowFunction(this, context); + return ((PlanVisitor) visitor).visitWindowFunction(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java index 71be86f04fa3c..9f0a06fbe1d87 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java @@ -30,7 +30,7 @@ import javax.annotation.Nonnull; public abstract class AbstractTableSchemaQueryAttributeSecurityVisitor - extends PlanVisitor { + implements PlanVisitor { public R processFragment( final @Nonnull FragmentInstance instance, final @Nonnull ConsensusGroupId groupId) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java index e486c8f3158eb..befc85ea3d717 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; @@ -90,7 +90,7 @@ protected void serializeAttributes(final DataOutputStream stream) throws IOExcep @Override public R accept(final IPlanVisitor visitor, final C context) { - return ((IQueryPlanVisitor) visitor).visitConstructTableDevicesBlackList(this, context); + return ((PlanVisitor) visitor).visitConstructTableDevicesBlackList(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java index ece90a7598632..7738f18976261 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; @@ -290,7 +290,7 @@ public List splitByPartition(final IAnalysis analysis) { @Override public R accept(final IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitCreateOrUpdateTableDevice(this, context); + return ((PlanVisitor) visitor).visitCreateOrUpdateTableDevice(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java index cc283a17cd91b..146fcd79beafc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; @@ -62,7 +62,7 @@ public static DeleteTableDevicesInBlackListNode deserialize(final ByteBuffer buf @Override public R accept(final IPlanVisitor visitor, final C context) { - return ((IQueryPlanVisitor) visitor).visitDeleteTableDevicesInBlackList(this, context); + return ((PlanVisitor) visitor).visitDeleteTableDevicesInBlackList(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java index 257dbee5972c6..9452e1b4b2bc1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; @@ -62,7 +62,7 @@ public static RollbackTableDevicesBlackListNode deserialize(final ByteBuffer buf @Override public R accept(final IPlanVisitor visitor, final C context) { - return ((IQueryPlanVisitor) visitor).visitRollbackTableDevicesBlackList(this, context); + return ((PlanVisitor) visitor).visitRollbackTableDevicesBlackList(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java index 80e1254591ab3..964f865442b9d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; @@ -110,7 +110,7 @@ public static TableAttributeColumnDropNode deserialize(final ByteBuffer buffer) @Override public R accept(final IPlanVisitor visitor, final C context) { - return ((IQueryPlanVisitor) visitor).visitTableAttributeColumnDrop(this, context); + return ((PlanVisitor) visitor).visitTableAttributeColumnDrop(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java index 9459efc765cd1..6fd73aba0d541 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; @@ -113,7 +113,7 @@ public List getOutputColumnNames() { @Override public R accept(final IPlanVisitor visitor, final C context) { - return ((IQueryPlanVisitor) visitor).visitTableDeviceAttributeCommit(this, context); + return ((PlanVisitor) visitor).visitTableDeviceAttributeCommit(this, context); } @Override 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 65aa1db648a22..a079d00a29256 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 @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.SessionInfo; 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.PlanNodeType; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; @@ -122,7 +122,7 @@ public SessionInfo getSessionInfo() { @Override public R accept(final IPlanVisitor visitor, final C context) { - return ((IQueryPlanVisitor) visitor).visitTableDeviceAttributeUpdate(this, context); + return ((PlanVisitor) visitor).visitTableDeviceAttributeUpdate(this, context); } @Override 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 3d40afdcb57f9..4fb15f5e894a7 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 @@ -22,10 +22,10 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.metadata.read.TableDeviceSourceNode; import org.apache.iotdb.db.schemaengine.schemaregion.attribute.update.DeviceAttributeCacheUpdater; @@ -176,7 +176,7 @@ public static TableDeviceFetchNode deserialize(final ByteBuffer buffer) { @Override public R accept(final IPlanVisitor visitor, C context) { - return ((IQueryPlanVisitor) visitor).visitTableDeviceFetch(this, context); + return ((PlanVisitor) visitor).visitTableDeviceFetch(this, context); } @Override 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 1659517a9ed84..4859bc5f86c50 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 @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.sql.ast.Expression; import java.nio.ByteBuffer; @@ -61,7 +61,7 @@ public List getOutputColumnNames() { @Override public R accept(final IPlanVisitor visitor, final C context) { - return ((IQueryPlanVisitor) visitor).visitTableDeviceQueryCount(this, context); + return ((PlanVisitor) visitor).visitTableDeviceQueryCount(this, context); } @Override 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 fbb05c772f134..d34b24459914f 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 @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.sql.ast.Expression; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -75,7 +75,7 @@ public boolean isNeedAligned() { @Override public R accept(final IPlanVisitor visitor, final C context) { - return ((IQueryPlanVisitor) visitor).visitTableDeviceQueryScan(this, context); + return ((PlanVisitor) visitor).visitTableDeviceQueryScan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java index 49e22fab60832..d6a8c0d564f18 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; @@ -77,7 +77,7 @@ public List getOutputColumnNames() { @Override public R accept(final IPlanVisitor visitor, final C context) { - return ((IQueryPlanVisitor) visitor).visitTableNodeLocationAdd(this, context); + return ((PlanVisitor) visitor).visitTableNodeLocationAdd(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java index 9e751d2dd4d31..ef4e210272b3f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.EqualityInference; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java index 9b51308f469ed..faecdd41a9dca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; 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.analyzer.Analysis; @@ -31,7 +32,6 @@ 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.GroupNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode; @@ -83,7 +83,7 @@ public PlanNode optimize(PlanNode plan, PlanOptimizer.Context context) { return plan.accept(new Rewriter(context.getAnalysis()), new Context(null, 0)); } - private static class Rewriter extends PlanVisitor { + private static class Rewriter implements PlanVisitor { private final Analysis analysis; public Rewriter(Analysis analysis) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java index 22bf7a65c9215..b0ca41272e213 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java @@ -21,6 +21,8 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; 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.Assignments; @@ -31,8 +33,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -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.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; @@ -96,7 +96,7 @@ public Optional decorrelateFilters(PlanNode node, List decorrelationResult.correlatedPredicates, decorrelationResult.node, correlation)); } - private class DecorrelatingVisitor extends PlanVisitor, Void> { + private class DecorrelatingVisitor implements PlanVisitor, Void> { private final TypeManager typeManager; private final List correlation; 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 3bcb6f1935b25..22a4433418324 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 @@ -71,7 +71,7 @@ public PlanNode optimize(PlanNode plan, PlanOptimizer.Context context) { context.getSymbolAllocator())); } - private static class Rewriter extends PlanVisitor { + private static class Rewriter implements PlanVisitor { @Override public PlanNode visitPlan(PlanNode node, Context context) { 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 89403b59f9795..6299e2976b430 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 @@ -21,6 +21,9 @@ import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; 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.analyzer.Analysis; @@ -30,12 +33,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; 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.GroupNode; 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; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PreviousFillNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; @@ -73,7 +73,7 @@ public PlanNode optimize(PlanNode plan, PlanOptimizer.Context context) { return plan.accept(new Rewriter(context.getAnalysis()), new Context()); } - private static class Rewriter extends PlanVisitor { + private static class Rewriter implements PlanVisitor { private final Analysis analysis; public Rewriter(Analysis analysis) { 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 7bd4530afd194..23dc1c3c7b4c7 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 @@ -26,6 +26,8 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; @@ -56,9 +58,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; 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.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode; @@ -108,6 +108,10 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ATTRIBUTE; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.FULL; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.RIGHT; 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.plan.analyze.AnalyzeVisitor.getTimePartitionSlotList; @@ -124,10 +128,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.CanonicalizeExpressionRewriter.canonicalizeExpression; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.ChildReplacer.replaceChildren; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.FULL; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.RIGHT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.JoinUtils.UNSUPPORTED_JOIN_CRITERIA; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.JoinUtils.extractJoinPredicate; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.JoinUtils.joinEqualityExpression; @@ -187,7 +187,7 @@ public PlanNode optimize(PlanNode plan, Context context) { new RewriteContext(TRUE_LITERAL)); } - private static class Rewriter extends PlanVisitor { + private static class Rewriter implements PlanVisitor { private final MPPQueryContext queryContext; private final Analysis analysis; private final Metadata metadata; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java index 7c81f196c69f4..f13b516101dd8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; 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.planner.plan.node.process.ExchangeNode; @@ -27,8 +29,6 @@ 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.EnforceSingleRowNode; -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.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; @@ -88,7 +88,7 @@ public static Cardinality extractCardinality(PlanNode node, Lookup lookup) { } private static final class CardinalityExtractorPlanVisitor - extends PlanVisitor, Void> { + implements PlanVisitor, Void> { private final Lookup lookup; public CardinalityExtractorPlanVisitor(Lookup lookup) { 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 bb276f07150b9..d8f4d49ee87a9 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; 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.PatternRecognitionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode; @@ -54,7 +54,7 @@ public PlanNode optimize(PlanNode plan, PlanOptimizer.Context context) { return plan.accept(new Rewriter(), new Context()); } - private static class Rewriter extends PlanVisitor { + private static class Rewriter implements PlanVisitor { @Override public PlanNode visitPlan(PlanNode node, Context context) { PlanNode newNode = node.clone(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java index 125f5e988529d..fafe3f304ce69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; 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.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Measure; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowNumberNode; 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 1d64e28f8e3fa..e448a131f3130 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; 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.metadata.ColumnSchema; @@ -28,7 +29,6 @@ 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.FillNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode; @@ -68,7 +68,7 @@ public PlanNode optimize(PlanNode plan, PlanOptimizer.Context context) { return plan.accept(new Rewriter(), null); } - private static class Rewriter extends PlanVisitor { + private static class Rewriter implements PlanVisitor { @Override public PlanNode visitPlan(PlanNode node, Void context) { @@ -100,7 +100,7 @@ public PlanNode visitAggregationTableScan(AggregationTableScanNode node, Void co * preGroupedSymbols of child-AggregationNode should have been calculated. GroupContext: The * GroupingKeys of current AggregationNode. */ - private static class DeriveGroupProperties extends PlanVisitor, GroupContext> { + private static class DeriveGroupProperties implements PlanVisitor, GroupContext> { @Override public List visitPlan(PlanNode node, GroupContext context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java index d7aaeda4f8571..fead848e1b2c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; @@ -31,7 +32,6 @@ 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.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; 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 7eb6dfb81c97c..ecc29d27e6a4f 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 @@ -61,7 +61,7 @@ public PlanNode optimize(PlanNode plan, PlanOptimizer.Context context) { new Rewriter(context.getAnalysis(), context.getQueryContext()), new Context()); } - private static class Rewriter extends PlanVisitor { + private static class Rewriter implements PlanVisitor { private final Analysis analysis; private final MPPQueryContext queryContext; 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 24adb746df4e1..ec0a04b66eac9 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 @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; 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.metadata.ColumnSchema; @@ -40,14 +43,11 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; 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.GroupNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode; -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; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode; @@ -92,7 +92,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableMap.toImmutableMap; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper.symbolMapper; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper.symbolReallocator; @@ -143,7 +143,7 @@ public NodeAndMappings reallocateSymbols( return new NodeAndMappings(result.getRoot(), symbolMapper(result.getMappings()).map(fields)); } - private static class Visitor extends PlanVisitor { + private static class Visitor implements PlanVisitor { private final Metadata metadata; private final Function, SymbolMapper> mapperProvider; 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 c5c3b7f57b8cf..29daa08c8e809 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 @@ -156,7 +156,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import static org.apache.iotdb.db.queryengine.plan.planner.TableOperatorGenerator.makeLayout; +import static org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator.makeLayout; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher.convertTagValuesToDeviceID; import static org.apache.tsfile.common.constant.TsFileConstant.PATH_SEPARATOR; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java index 05843c2092aef..8c60f9c4127e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java @@ -69,7 +69,7 @@ import static org.apache.iotdb.commons.schema.table.Audit.includeByAuditTreeDB; -public class TriggerFireVisitor extends PlanVisitor { +public class TriggerFireVisitor implements PlanVisitor { private static final Logger LOGGER = LoggerFactory.getLogger(TriggerFireVisitor.class); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java index 75a8ab8bc0000..771caf7504c55 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java @@ -567,7 +567,8 @@ public void testEstimateSegSize() throws Exception { // to test whether estimation of segment size works on edge cases /** * related methods shall be merged further: {@linkplain SchemaFile#reEstimateSegSize} - * ,{@linkplain PageManager#reEstimateSegSize} + * ,{@linkplain + * org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.pbtree.schemafile.pagemgr.PageManager#reEstimateSegSize} */ ICachedMNode sgNode = nodeFactory.createDatabaseMNode(null, "mma").getAsMNode(); ICachedMNode d1 = fillChildren(sgNode, 300, "d", this::supplyEntity); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java index 253ba133dc5b7..d63caff333b35 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.schema.table.column.TagColumnSchema; import org.apache.iotdb.commons.schema.table.column.TimeColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -40,7 +41,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.DeviceIteratorScanOperator; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; -import org.apache.iotdb.db.queryengine.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java index 4e979bb2fec45..721af0d3db69a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java @@ -32,7 +32,7 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeToTableViewAdaptorOperator; -import org.apache.iotdb.db.queryengine.plan.planner.TableOperatorGenerator; +import org.apache.iotdb.db.queryengine.plan.planner.DataNodeTableOperatorGenerator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -179,7 +179,7 @@ public void test1() { columnIndexArray, columnSchemas, seriesScanOperator, - TableOperatorGenerator.createTreeDeviceIdColumnValueExtractor( + DataNodeTableOperatorGenerator.createTreeDeviceIdColumnValueExtractor( VIEW_FROM_TREE_ADAPTOR_OPERATOR_TEST)); int count = 0; while (operator.hasNext()) { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java index 1d659e32dc126..cd071872f0788 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator; -import org.apache.iotdb.db.queryengine.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; 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 8c4bc256493a2..da39a91dd61c5 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 @@ -32,6 +32,8 @@ import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -61,8 +63,6 @@ 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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java index 62ec85d27745b..b846c73c9fbde 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java index 879356acaee95..519f8ffecc251 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -30,7 +31,6 @@ 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.IntoNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; 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 436f9736d192f..8f3921584f3b4 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 @@ -21,6 +21,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -43,8 +45,6 @@ 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; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode; @@ -72,6 +72,7 @@ import java.util.List; import java.util.Optional; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AnalyzerTest.analyzeSQL; @@ -102,7 +103,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.junit.Assert.assertEquals; 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 fbe814ff25bc0..d15ebf4f8745d 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -35,7 +36,6 @@ 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.TopKNode; 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 2f6a028ea4a46..8547356dbdf66 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 @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; @@ -32,8 +34,6 @@ 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; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode; 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 156123604b5d5..746bf06f53586 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 @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -30,8 +32,6 @@ 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; 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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java index 344c69cfc1a71..a2e3a72b127cb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.ForecastTableFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.TableFunctionProcessorMatcher; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.udf.api.relational.EmptyTableFunctionHandle; import org.apache.iotdb.udf.api.relational.table.MapTableFunctionHandle; 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 f2d7f4ccf68da..4b65fc7f61c07 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 @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; @@ -27,8 +29,6 @@ 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; 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 e2d8e494b7ac4..2f65a7ec5bf07 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -30,7 +31,6 @@ 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.sql.ast.Statement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java index e7baf8078f112..8ed29e46fb581 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java index 3a0a0acd20364..051f93ca04194 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; 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.LongLiteral; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java index c02f41bc8ae06..e83201b8f759e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/EquiJoinClauseProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/EquiJoinClauseProvider.java index c151b6874a6f8..f33a76f4e7fc1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/EquiJoinClauseProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/EquiJoinClauseProvider.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java index 0382a70f4b654..6a67644c5ee79 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; 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.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java index 090e4a0bc3bc9..50eaf3eb10545 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; 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.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java index 9eca6cf3a102e..a563451dfd236 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; 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.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.Ordering; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode; import com.google.common.collect.ImmutableList; 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 2ca57e5296a5b..84a988c821db9 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 @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; 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; @@ -37,11 +40,8 @@ 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.GroupNode; 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.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.NonAlignedAggregationTreeDeviceViewScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java index b7db9aeac252e..be4280b15db63 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java @@ -36,7 +36,7 @@ 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; -final class PlanMatchingVisitor extends PlanVisitor { +final class PlanMatchingVisitor implements PlanVisitor { private final Metadata metadata; private final SessionInfo sessionInfo; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java index c0c534f494d57..a272dba7e382b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java @@ -38,7 +38,6 @@ import static java.util.Objects.requireNonNull; 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; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.node; public class TableFunctionProcessorMatcher implements Matcher { private final String name; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleCompactionTaskTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleCompactionTaskTest.java index e318d0e87d07a..43ab0a8ad6032 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleCompactionTaskTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleCompactionTaskTest.java @@ -67,7 +67,6 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.db.storageengine.dataregion.compaction.utils.TsFileGeneratorUtils.createTimeseries; import static org.apache.iotdb.db.storageengine.dataregion.compaction.utils.TsFileGeneratorUtils.testStorageGroup; import static org.apache.tsfile.common.constant.TsFileConstant.PATH_SEPARATOR; import static org.apache.tsfile.utils.TsFileGeneratorUtils.getDataType; From 604a7475e645a7adfc001cbf771be1ff82d4f08b Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 13 Apr 2026 11:23:57 +0800 Subject: [PATCH 04/45] move rowpattern --- .../plan/planner/TableOperatorGenerator.java | 72 ++++++++--------- .../plan/node/ICoreQueryPlanVisitor.java | 79 +++++++++---------- .../planner/node/AggregationNode.java | 4 +- .../planner/node/AssignUniqueId.java | 2 +- .../relational/planner/node/CollectNode.java | 2 +- .../planner/node/EnforceSingleRowNode.java | 2 +- .../relational/planner/node/GapFillNode.java | 2 +- .../relational/planner/node/GroupNode.java | 2 +- .../planner/node/LinearFillNode.java | 3 +- .../planner/node/MarkDistinctNode.java | 2 +- .../plan/relational/planner/node/Measure.java | 4 +- .../planner/node/MergeSortNode.java | 2 +- .../relational/planner/node/OffsetNode.java | 2 +- .../relational/planner/node/OutputNode.java | 2 +- .../planner/node/PatternRecognitionNode.java | 10 ++- .../planner/node/PreviousFillNode.java | 3 +- .../relational/planner/node/ProjectNode.java | 2 +- .../planner/node/RowNumberNode.java | 2 +- .../relational/planner/node/SemiJoinNode.java | 2 +- .../relational/planner/node/SortNode.java | 2 +- .../planner/node/StreamSortNode.java | 2 +- .../planner/node/TableFunctionNode.java | 2 +- .../node/TableFunctionProcessorNode.java | 2 +- .../relational/planner/node/TopKNode.java | 2 +- .../planner/node/TopKRankingNode.java | 2 +- .../relational/planner/node/UnionNode.java | 3 +- .../planner/node/ValueFillNode.java | 3 +- .../relational/planner/node/ValuesNode.java | 2 +- .../relational/planner/node/WindowNode.java | 2 +- .../rowpattern/AggregationLabelSet.java | 2 +- .../rowpattern/AggregationValuePointer.java | 2 +- .../rowpattern/ClassifierValuePointer.java | 2 +- .../ExpressionAndValuePointers.java | 2 +- .../rowpattern}/rowpattern/IrAlternation.java | 2 +- .../rowpattern}/rowpattern/IrAnchor.java | 4 +- .../rowpattern/IrConcatenation.java | 2 +- .../rowpattern}/rowpattern/IrEmpty.java | 2 +- .../rowpattern}/rowpattern/IrExclusion.java | 2 +- .../rowpattern}/rowpattern/IrLabel.java | 2 +- .../IrPatternAlternationOptimizer.java | 4 +- .../rowpattern}/rowpattern/IrPermutation.java | 2 +- .../rowpattern}/rowpattern/IrQuantified.java | 2 +- .../rowpattern}/rowpattern/IrQuantifier.java | 2 +- .../rowpattern}/rowpattern/IrRowPattern.java | 2 +- .../rowpattern/IrRowPatternFlattener.java | 2 +- .../rowpattern/IrRowPatternVisitor.java | 2 +- .../rowpattern/LogicalIndexPointer.java | 2 +- .../rowpattern/MatchNumberValuePointer.java | 2 +- .../rowpattern}/rowpattern/Patterns.java | 12 +-- .../rowpattern/RowPatternToIrRewriter.java | 12 +-- .../rowpattern/ScalarValuePointer.java | 2 +- .../rowpattern}/rowpattern/ValuePointer.java | 2 +- .../common/header/DatasetHeader.java | 2 +- .../rowpattern/expression/Computation.java | 4 +- .../IrRowPatternToProgramRewriter.java | 22 +++--- .../process/window/TopKRankingOperator.java | 2 +- .../aggregation/TableAggregator.java | 2 +- .../grouped/GroupedAggregator.java | 2 +- .../grouped/HashAggregationOperator.java | 2 +- .../StreamingHashAggregationOperator.java | 2 +- .../InMemoryHashAggregationBuilder.java | 2 +- .../DataNodeTableOperatorGenerator.java | 2 +- .../planner/plan/node/PlanGraphPrinter.java | 60 +++++++------- .../plan/planner/plan/node/PlanNodeType.java | 62 +++++++-------- .../planner/ExpressionExtractor.java | 4 +- .../plan/relational/planner/PlanBuilder.java | 2 +- .../plan/relational/planner/QueryPlanner.java | 28 +++---- .../relational/planner/RelationPlanner.java | 38 ++++----- .../relational/planner/SubqueryPlanner.java | 4 +- .../relational/planner/SymbolsExtractor.java | 4 +- .../planner/TableLogicalPlanner.java | 8 +- .../planner/distribute/AddExchangeNodes.java | 4 +- .../TableDistributedPlanGenerator.java | 50 ++++++------ .../distribute/TableDistributedPlanner.java | 2 +- .../TableModelTypeProviderExtractor.java | 22 +++--- .../rule/AggregationDecorrelation.java | 2 +- .../EliminateLimitProjectWithTableScan.java | 2 +- .../rule/EvaluateEmptyIntersect.java | 2 +- .../rule/ExpressionRewriteRuleSet.java | 10 +-- .../iterative/rule/GatherAndMergeWindows.java | 4 +- .../iterative/rule/ImplementExceptAll.java | 2 +- .../rule/ImplementExceptDistinctAsUnion.java | 2 +- .../iterative/rule/ImplementIntersectAll.java | 2 +- .../ImplementIntersectDistinctAsUnion.java | 2 +- .../rule/ImplementPatternRecognition.java | 4 +- .../rule/ImplementTableFunctionSource.java | 6 +- .../iterative/rule/InlineProjections.java | 2 +- .../MergeLimitOverProjectWithMergeSort.java | 6 +- .../rule/MergeLimitOverProjectWithSort.java | 8 +- .../rule/MergeLimitWithMergeSort.java | 4 +- .../iterative/rule/MergeLimitWithSort.java | 6 +- .../planner/iterative/rule/MergeUnion.java | 2 +- ...ipleDistinctAggregationToMarkDistinct.java | 4 +- .../iterative/rule/OptimizeRowPattern.java | 8 +- .../rule/ProjectOffPushDownRule.java | 2 +- .../rule/PruneAggregationColumns.java | 2 +- .../rule/PruneAggregationSourceColumns.java | 2 +- .../rule/PruneAssignUniqueIdColumns.java | 2 +- .../rule/PruneDistinctAggregation.java | 4 +- .../rule/PruneEnforceSingleRowColumns.java | 2 +- .../iterative/rule/PruneGapFillColumns.java | 2 +- .../rule/PruneMarkDistinctColumns.java | 2 +- .../iterative/rule/PruneOffsetColumns.java | 2 +- .../rule/PruneOutputSourceColumns.java | 2 +- .../PrunePatternRecognitionSourceColumns.java | 6 +- .../iterative/rule/PruneProjectColumns.java | 2 +- .../iterative/rule/PruneSortColumns.java | 2 +- .../PruneTableFunctionProcessorColumns.java | 4 +- ...neTableFunctionProcessorSourceColumns.java | 4 +- .../iterative/rule/PruneTopKColumns.java | 2 +- .../iterative/rule/PruneUnionColumns.java | 2 +- .../rule/PruneUnionSourceColumns.java | 2 +- .../iterative/rule/PruneWindowColumns.java | 2 +- .../rule/PushDownFilterIntoWindow.java | 6 +- .../rule/PushDownLimitIntoWindow.java | 6 +- .../rule/PushDownOffsetIntoTableScan.java | 2 +- .../rule/PushLimitThroughOffset.java | 2 +- .../rule/PushLimitThroughProject.java | 2 +- .../iterative/rule/PushLimitThroughUnion.java | 2 +- .../rule/PushProjectionThroughUnion.java | 4 +- .../iterative/rule/PushTopKThroughUnion.java | 4 +- .../rule/RemoveEmptyExceptBranches.java | 6 +- .../rule/RemoveEmptyUnionBranches.java | 4 +- .../RemoveRedundantEnforceSingleRowNode.java | 2 +- .../iterative/rule/RemoveRedundantExists.java | 2 +- .../RemoveRedundantIdentityProjections.java | 2 +- .../iterative/rule/RemoveRedundantWindow.java | 4 +- .../rule/ReplaceWindowWithRowNumber.java | 4 +- .../iterative/rule/SetOperationMerge.java | 2 +- .../rule/SetOperationNodeTranslator.java | 12 +-- .../rule/SimplifyCountOverConstant.java | 4 +- .../SingleDistinctAggregationToGroupBy.java | 6 +- ...atedDistinctAggregationWithProjection.java | 8 +- ...dDistinctAggregationWithoutProjection.java | 6 +- ...elatedGlobalAggregationWithProjection.java | 8 +- ...tedGlobalAggregationWithoutProjection.java | 8 +- ...latedGroupedAggregationWithProjection.java | 8 +- ...edGroupedAggregationWithoutProjection.java | 6 +- .../TransformCorrelatedScalarSubquery.java | 8 +- .../TransformExistsApplyToCorrelatedJoin.java | 8 +- ...TransformFilteringSemiJoinToInnerJoin.java | 8 +- ...rrelatedInPredicateSubqueryToSemiJoin.java | 2 +- .../TransformUncorrelatedSubqueryToJoin.java | 2 +- .../planner/iterative/rule/Util.java | 10 +-- .../node/AggregationTableScanNode.java | 2 + .../AggregationTreeDeviceViewScanNode.java | 1 + ...gnedAggregationTreeDeviceViewScanNode.java | 1 + ...gnedAggregationTreeDeviceViewScanNode.java | 1 + .../relational/planner/node/Patterns.java | 20 +++++ .../optimizations/ParallelizeGrouping.java | 16 ++-- .../optimizations/PlanNodeDecorrelator.java | 10 +-- .../PushAggregationIntoTableScan.java | 4 +- .../PushLimitOffsetIntoTableScan.java | 20 ++--- .../PushPredicateIntoTableScan.java | 12 +-- .../optimizations/QueryCardinalityUtil.java | 10 +-- .../optimizations/SortElimination.java | 12 +-- .../planner/optimizations/SymbolMapper.java | 30 +++---- .../TransformAggregationToStreamable.java | 14 ++-- ...tifiedComparisonApplyToCorrelatedJoin.java | 8 +- .../TransformSortToStreamSort.java | 10 +-- .../UnaliasSymbolReferences.java | 44 +++++------ .../planner/optimizations/Util.java | 10 +-- .../IrRowPatternOptimizationTest.java | 26 +++--- .../process/rowpattern/MatcherTest.java | 22 +++--- .../window/TopKRankingOperatorTest.java | 2 +- .../node/process/WindowNodeSerdeTest.java | 2 +- .../analyzer/AggregationCornerCaseTest.java | 2 +- .../relational/analyzer/AggregationTest.java | 8 +- .../relational/analyzer/AnalyzerTest.java | 8 +- .../relational/analyzer/DistinctTest.java | 2 +- .../analyzer/InsertIntoQueryTest.java | 6 +- .../plan/relational/analyzer/JoinTest.java | 16 ++-- .../analyzer/LimitOffsetPushDownTest.java | 8 +- .../PushAggregationThroughUnionTest.java | 4 +- .../plan/relational/analyzer/SortTest.java | 12 +-- .../relational/analyzer/SubQueryTest.java | 10 +-- .../plan/relational/analyzer/TSBSTest.java | 8 +- .../relational/analyzer/TestPlanBuilder.java | 6 +- .../plan/relational/analyzer/TestUtils.java | 4 +- .../relational/analyzer/TreeViewTest.java | 6 +- .../planner/CorrelatedSubqueryTest.java | 2 +- .../planner/CteMaterializerTest.java | 2 +- .../PatternRecognitionNodeSerdeTest.java | 22 +++--- .../planner/UncorrelatedSubqueryTest.java | 6 +- .../AggregationDeviceTableScanMatcher.java | 2 +- .../AggregationFunctionMatcher.java | 2 +- .../assertions/AggregationMatcher.java | 2 +- .../assertions/AggregationStepMatcher.java | 2 +- .../assertions/AssignUniqueIdMatcher.java | 2 +- .../planner/assertions/ExpressionMatcher.java | 2 +- .../planner/assertions/GroupMatcher.java | 2 +- .../assertions/IdentityProjectionMatcher.java | 2 +- .../assertions/MarkDistinctMatcher.java | 2 +- .../planner/assertions/OffsetMatcher.java | 2 +- .../planner/assertions/PlanMatchPattern.java | 38 ++++----- .../assertions/PlanMatchingVisitor.java | 2 +- .../planner/assertions/SemiJoinMatcher.java | 2 +- .../planner/assertions/SortMatcher.java | 2 +- .../StrictAssignedSymbolsMatcher.java | 2 +- .../TableFunctionProcessorMatcher.java | 2 +- .../planner/assertions/TopKMatcher.java | 2 +- .../assertions/WindowFunctionMatcher.java | 2 +- 202 files changed, 703 insertions(+), 683 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/AggregationNode.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/AssignUniqueId.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/CollectNode.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/EnforceSingleRowNode.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/GapFillNode.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/GroupNode.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/LinearFillNode.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/MarkDistinctNode.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/Measure.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/MergeSortNode.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/OffsetNode.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/OutputNode.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/PatternRecognitionNode.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/PreviousFillNode.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/ProjectNode.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/RowNumberNode.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/SemiJoinNode.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/SortNode.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/StreamSortNode.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/TableFunctionNode.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/TableFunctionProcessorNode.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/TopKNode.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/TopKRankingNode.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/UnionNode.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/ValueFillNode.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/ValuesNode.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/WindowNode.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/AggregationLabelSet.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/AggregationValuePointer.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/ClassifierValuePointer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/ExpressionAndValuePointers.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/IrAlternation.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/IrAnchor.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/IrConcatenation.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/IrEmpty.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/IrExclusion.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/IrLabel.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/IrPatternAlternationOptimizer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/IrPermutation.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/IrQuantified.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/IrQuantifier.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/IrRowPattern.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/IrRowPatternFlattener.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/IrRowPatternVisitor.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/LogicalIndexPointer.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/MatchNumberValuePointer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/Patterns.java (77%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/RowPatternToIrRewriter.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/ScalarValuePointer.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational/planner => node_commons/plan/relational/planner/rowpattern}/rowpattern/ValuePointer.java (87%) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 09ef349094d73..c199e7ebb0a8a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -24,9 +24,45 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.AggregationLabelSet; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.AggregationValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ClassifierValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.LogicalIndexPointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.MatchNumberValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; @@ -122,43 +158,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; 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.AssignUniqueId; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; -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.GroupNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Measure; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode; -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.PatternRecognitionNode; -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.RowNumberNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; -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.TableFunctionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.AggregationLabelSet; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.AggregationValuePointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ClassifierValuePointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.MatchNumberValuePointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ScalarValuePointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ValuePointer; 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.Literal; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java index 25830cc63ea03..550b358b462a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java @@ -16,30 +16,42 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; public interface ICoreQueryPlanVisitor extends IPlanVisitor { @@ -85,14 +97,11 @@ default R visitApply( return visitTwoChildProcess(node, context); } - default R visitAssignUniqueId( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId node, C context) { + default R visitAssignUniqueId(AssignUniqueId node, C context) { return visitSingleChildProcess(node, context); } - default R visitEnforceSingleRow( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode node, - C context) { + default R visitEnforceSingleRow(EnforceSingleRowNode node, C context) { return visitSingleChildProcess(node, context); } @@ -102,8 +111,7 @@ default R visitCorrelatedJoin( return visitTwoChildProcess(node, context); } - default R visitProject( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode node, C context) { + default R visitProject(ProjectNode node, C context) { return visitSingleChildProcess(node, context); } @@ -111,23 +119,19 @@ default R visitLimit(LimitNode node, C context) { return visitSingleChildProcess(node, context); } - default R visitOffset( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode node, C context) { + default R visitOffset(OffsetNode node, C context) { return visitSingleChildProcess(node, context); } - default R visitMergeSort( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode node, C context) { + default R visitMergeSort(MergeSortNode node, C context) { return visitMultiChildProcess(node, context); } - default R visitOutput( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode node, C context) { + default R visitOutput(OutputNode node, C context) { return visitSingleChildProcess(node, context); } - default R visitCollect( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode node, C context) { + default R visitCollect(CollectNode node, C context) { return visitMultiChildProcess(node, context); } @@ -151,13 +155,11 @@ default R visitValueFill(ValueFillNode node, C context) { return visitFill(node, context); } - default R visitSort( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode node, C context) { + default R visitSort(SortNode node, C context) { return visitSingleChildProcess(node, context); } - default R visitStreamSort( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode node, C context) { + default R visitStreamSort(StreamSortNode node, C context) { return visitSingleChildProcess(node, context); } @@ -165,14 +167,11 @@ default R visitGroup(GroupNode node, C context) { return visitSingleChildProcess(node, context); } - default R visitTopK( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode node, C context) { + default R visitTopK(TopKNode node, C context) { return visitMultiChildProcess(node, context); } - default R visitTopKRanking( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode node, - C context) { + default R visitTopKRanking(TopKRankingNode node, C context) { return visitSingleChildProcess(node, context); } @@ -196,9 +195,7 @@ default R visitGroupReference(GroupReference node, C context) { return visitPlan(node, context); } - default R visitAggregation( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode node, - C context) { + default R visitAggregation(AggregationNode node, C context) { return visitSingleChildProcess(node, context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java index 229c91cfd94fa..a7ebbc90f6025 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -604,7 +604,7 @@ public int hashCode() { return Objects.hash(resolvedFunction, arguments, distinct, filter, orderingScheme, mask); } - void verifyArguments(Step step) { + public void verifyArguments(Step step) { int expectedArgumentCount; if (step == Step.SINGLE || step == Step.PARTIAL) { expectedArgumentCount = resolvedFunction.getSignature().getArgumentTypes().size(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AssignUniqueId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AssignUniqueId.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java index bb4395950849c..251b242e0a556 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AssignUniqueId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CollectNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java index a6707f84bedb4..aac3be39dd4f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/EnforceSingleRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/EnforceSingleRowNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java index 154a04204be54..6fe7f60af3b11 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/EnforceSingleRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GapFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GapFillNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java index f94a7e45ee9e9..bfa59c8acb55c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GapFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GroupNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GroupNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java index 94ec6f1aa5e93..878ded203bec8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/GroupNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LinearFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LinearFillNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java index 24b2d0b965a09..aec04bbacfc35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LinearFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java @@ -17,11 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/relational/planner/node/MarkDistinctNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MarkDistinctNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java index 8a2b89c972ed7..c179c23677945 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MarkDistinctNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Measure.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/Measure.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Measure.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/Measure.java index 273f7e829026e..232aa50dc958e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Measure.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/Measure.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.queryengine.plan.relational.utils.TypeUtil; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MergeSortNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java index 42e65bb8d69af..8655c33243502 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/MergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java index 79b287995893f..3685ac09b5247 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java index 562af0ac9ed76..78c39a61c9fc6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OutputNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PatternRecognitionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PatternRecognitionNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java index 013d3b35cf083..e8f3dcb1f34f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PatternRecognitionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java @@ -17,19 +17,21 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PreviousFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PreviousFillNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java index 47a7f3f3e1d6f..cf15c232d1cd2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/PreviousFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java @@ -17,11 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/relational/planner/node/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java index 675dab2b99bed..ae2250a80a21f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/RowNumberNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/RowNumberNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java index 0b6eb585f781b..7387f578c2f36 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/RowNumberNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SemiJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SemiJoinNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java index 2a09594f0bc1e..9a6fadc2c9214 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SemiJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SortNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java index 5e9e55531c28c..f0f50147cf733 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/StreamSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/StreamSortNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java index 251c0084b1340..4f20385ebf968 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/StreamSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java index bc05ccf7e65d0..b0d070206ae55 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionProcessorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionProcessorNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java index 1225f6a24165a..1617397e12f2b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableFunctionProcessorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java index 313bf9ad61b5f..81e5227fab148 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKRankingNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKRankingNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java index d1f5bd11220f3..9c133af4c7db6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TopKRankingNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/UnionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/UnionNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java index 884d0fe4f568b..1519f84add88d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/UnionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -25,6 +25,7 @@ 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.planner.Symbol; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SetOperationNode; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValueFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValueFillNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java index 47054cec3451c..41b837b3da568 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValueFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java @@ -17,11 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/relational/planner/node/ValuesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValuesNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java index d2190b2b75f6f..8958a0146c67c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValuesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/WindowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/WindowNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java index b9799a0282d58..9658567723ce4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/WindowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/AggregationLabelSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationLabelSet.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/AggregationLabelSet.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationLabelSet.java index f002f3d0c1af0..bca2655aa815e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/AggregationLabelSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationLabelSet.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/AggregationValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/AggregationValuePointer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java index 3636e2673db14..30854d3c05e30 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/AggregationValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/ClassifierValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ClassifierValuePointer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/ClassifierValuePointer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ClassifierValuePointer.java index a06d3b32f4f11..1afb334bdd41a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/ClassifierValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ClassifierValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ExpressionAndValuePointers.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ExpressionAndValuePointers.java index 288fae8fca360..df454b44bb837 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ExpressionAndValuePointers.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrAlternation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrAlternation.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrAlternation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrAlternation.java index f698b923f2a52..d2affb2b2d3c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrAlternation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrAlternation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrAnchor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrAnchor.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrAnchor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrAnchor.java index 5c6651523582b..ec0d216c81ac5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrAnchor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrAnchor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -27,7 +27,7 @@ import java.util.Objects; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_START; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAnchor.Type.PARTITION_START; public class IrAnchor extends IrRowPattern { public enum Type { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrConcatenation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrConcatenation.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrConcatenation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrConcatenation.java index e846ce2a540f5..49d37c3ee23f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrConcatenation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrConcatenation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrEmpty.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrEmpty.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrEmpty.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrEmpty.java index ba1c4143c29ed..28edcf804951b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrEmpty.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrEmpty.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrExclusion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrExclusion.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrExclusion.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrExclusion.java index abd784d147bea..5c5cca9493bbd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrExclusion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrExclusion.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrLabel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrLabel.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrLabel.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrLabel.java index 35fb1b10a454f..9534d054349fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrLabel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrLabel.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrPatternAlternationOptimizer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrPatternAlternationOptimizer.java index ccb4e9a89f3eb..9cad8c5bd6821 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrPatternAlternationOptimizer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import com.google.common.collect.ImmutableList; @@ -25,7 +25,7 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.toImmutableList; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.zeroOrOne; /** * Remove empty pattern from pattern alternation and replace it with quantification of a diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrPermutation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrPermutation.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrPermutation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrPermutation.java index 5367f9dd026a8..a781fab5e331c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrPermutation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrPermutation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrQuantified.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrQuantified.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrQuantified.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrQuantified.java index 6031bf6430250..3ae19567096ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrQuantified.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrQuantified.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrQuantifier.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrQuantifier.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrQuantifier.java index 709e23e772279..1d8ff1b246fbf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrQuantifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrRowPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPattern.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrRowPattern.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPattern.java index 35a6597c52f98..fa60530eee84c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrRowPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrRowPatternFlattener.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPatternFlattener.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrRowPatternFlattener.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPatternFlattener.java index 98f7c1c88525e..5fecb723f194e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrRowPatternFlattener.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPatternFlattener.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrRowPatternVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPatternVisitor.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrRowPatternVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPatternVisitor.java index 4e2ec9b830c88..f4cdf024fea50 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/IrRowPatternVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPatternVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/LogicalIndexPointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/LogicalIndexPointer.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/LogicalIndexPointer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/LogicalIndexPointer.java index 7660f00492dce..1dee70133b5d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/LogicalIndexPointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/LogicalIndexPointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.LogicalIndexNavigation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/MatchNumberValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/MatchNumberValuePointer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/MatchNumberValuePointer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/MatchNumberValuePointer.java index d75dc9e5133a9..eb4ee668c74a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/MatchNumberValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/MatchNumberValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/Patterns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/Patterns.java similarity index 77% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/Patterns.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/Patterns.java index e46f918c2f8b5..127bb1ea46d8b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/Patterns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/Patterns.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import com.google.common.collect.ImmutableList; import java.util.Optional; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_END; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_START; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrQuantifier.oneOrMore; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrQuantifier.zeroOrMore; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAnchor.Type.PARTITION_END; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAnchor.Type.PARTITION_START; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.oneOrMore; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.zeroOrMore; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.zeroOrOne; public class Patterns { private Patterns() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/RowPatternToIrRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/RowPatternToIrRewriter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java index ed93c9900393b..7761b742dbf05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/RowPatternToIrRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAnchor.Type; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.Range; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrAnchor.Type; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AnchorPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.EmptyPattern; @@ -42,10 +42,10 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrQuantifier.oneOrMore; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrQuantifier.range; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrQuantifier.zeroOrMore; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.oneOrMore; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.range; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.zeroOrMore; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.zeroOrOne; public class RowPatternToIrRewriter extends AstVisitor { private final Analysis analysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/ScalarValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ScalarValuePointer.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/ScalarValuePointer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ScalarValuePointer.java index 5957242d97d7d..8e6cb7e749f7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/ScalarValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ScalarValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/ValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ValuePointer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/ValuePointer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ValuePointer.java index 1b73e62a7246d..2f35d1e7406b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/ValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ValuePointer.java @@ -12,6 +12,6 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; public interface ValuePointer {} 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 a72c4d00befe9..88dd48b8ff7c6 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 @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.common.header; import org.apache.iotdb.commons.schema.column.ColumnHeader; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode; import com.google.common.primitives.Bytes; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java index 33661fd206a57..46d87b886be5e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers.Assignment; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers.Assignment; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java index 37de296d54c56..70d1253e71c13 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrAlternation; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrAnchor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrConcatenation; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrEmpty; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrExclusion; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrPermutation; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrQuantified; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrRowPatternVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAlternation; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAnchor; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrConcatenation; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrEmpty; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrExclusion; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrPermutation; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantified; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPatternVisitor; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java index b94c546ac5497..95bb2fcd568c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.GroupedTopNBuilder; import org.apache.iotdb.db.queryengine.execution.operator.GroupedTopNRowNumberBuilder; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.NoChannelGroupByHash; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import com.google.common.base.Supplier; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableAggregator.java index 955532cea6d71..9c18dd1b42d56 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableAggregator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java index e416d4f43f0ce..50034a9dfbace 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java index ce7e91f84485a..f6c1e9f2d7bd8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; import org.apache.iotdb.db.queryengine.execution.operator.Operator; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java index ee58c827e4640..a1772e2d23198 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; import org.apache.iotdb.db.queryengine.execution.operator.Operator; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.primitives.Ints; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java index 3103055023b0e..fbe0cee409875 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.builder; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 759058fde317f..a392558428e46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.TableDateBinTimeRangeIterator; @@ -96,7 +97,6 @@ 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.ir.IrUtils; -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.AggregationTreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AlignedAggregationTreeDeviceViewScanNode; 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 8b7811f72839a..645b23b9db128 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 @@ -23,7 +23,25 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; @@ -70,32 +88,16 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; 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.ExceptNode; 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.GapFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableDiskUsageInformationSchemaTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import com.google.common.base.Joiner; import org.apache.tsfile.external.commons.lang3.Validate; @@ -715,13 +717,13 @@ public List visitTableScan(TableScanNode node, GraphContext context) { @Override public List visitAggregation( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode node, + org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Aggregation-%s", node.getPlanNodeId().getId())); boxValue.add(String.format("OutputSymbols: %s", node.getOutputSymbols())); int i = 0; - for (org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Aggregation + for (org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Aggregation aggregation : node.getAggregations().values()) { StringBuilder aggregator = new StringBuilder( @@ -754,7 +756,7 @@ public List visitAggregationTableScan( boxValue.add(String.format("QualifiedTableName: %s", node.getQualifiedObjectName().toString())); boxValue.add(String.format("OutputSymbols: %s", node.getOutputSymbols())); int i = 0; - for (org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Aggregation + for (org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Aggregation aggregation : node.getAggregations().values()) { StringBuilder aggregator = new StringBuilder( @@ -831,7 +833,7 @@ public List visitFilter( @Override public List visitProject( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode node, + org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Project-%s", node.getPlanNodeId().getId())); @@ -851,9 +853,7 @@ public List visitInto( } @Override - public List visitOutput( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode node, - GraphContext context) { + public List visitOutput(OutputNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("OutputNode-%s", node.getPlanNodeId().getId())); boxValue.add(String.format("OutputColumns-%s", node.getOutputColumnNames())); @@ -948,7 +948,7 @@ public List visitEnforceSingleRow(EnforceSingleRowNode node, GraphContex @Override public List visitOffset( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode node, + org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Offset-%s", node.getPlanNodeId().getId())); @@ -958,7 +958,7 @@ public List visitOffset( @Override public List visitSort( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode node, + org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Sort-%s", node.getPlanNodeId().getId())); @@ -967,9 +967,7 @@ public List visitSort( } @Override - public List visitStreamSort( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode node, - GraphContext context) { + public List visitStreamSort(StreamSortNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("StreamSort-%s", node.getPlanNodeId().getId())); boxValue.add(String.format("OrderingScheme: %s", node.getOrderingScheme())); @@ -999,7 +997,7 @@ public List visitGroup(GroupNode node, GraphContext context) { @Override public List visitMergeSort( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode node, + org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("MergeSort-%s", node.getPlanNodeId().getId())); @@ -1010,7 +1008,7 @@ public List visitMergeSort( @Override public List visitCollect( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode node, + org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Collect-%s", node.getPlanNodeId().getId())); @@ -1020,7 +1018,7 @@ public List visitCollect( @Override public List visitTopK( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode node, + org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("TopK-%s", node.getPlanNodeId().getId())); 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 c1405c60e99ba..bcef3ef602612 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 @@ -19,7 +19,27 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePieceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; @@ -121,30 +141,13 @@ 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.node.AlignedAggregationTreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.NonAlignedAggregationTreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableDiskUsageInformationSchemaTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeAlignedDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.ConstructTableDevicesBlackListNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.DeleteTableDeviceNode; @@ -656,32 +659,29 @@ public static PlanNode deserialize(ByteBuffer buffer, short nodeType) { return org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode.deserialize( buffer); case 1002: - return org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode.deserialize( - buffer); + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode + .deserialize(buffer); case 1003: - return org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode.deserialize( - buffer); + return OutputNode.deserialize(buffer); case 1004: return org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode.deserialize( buffer); case 1005: - return org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode.deserialize( + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode.deserialize( buffer); case 1006: - return org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode.deserialize( + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode.deserialize( buffer); case 1007: - return org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode - .deserialize(buffer); + return MergeSortNode.deserialize(buffer); case 1008: - return org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode.deserialize( + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode.deserialize( buffer); case 1009: - return org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode.deserialize( - buffer); - case 1010: - return org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode .deserialize(buffer); + case 1010: + return StreamSortNode.deserialize(buffer); case 1011: return JoinNode.deserialize(buffer); case 1012: @@ -691,7 +691,7 @@ public static PlanNode deserialize(ByteBuffer buffer, short nodeType) { case 1014: return ValueFillNode.deserialize(buffer); case 1015: - return org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode .deserialize(buffer); case 1016: return org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java index aee57659664d7..3aba471595787 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java index b4714360224b2..fa03234fe2b19 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index e8660b5a965cb..87d84b4d51892 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -20,8 +20,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Aggregation; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -33,17 +44,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.RelationType; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GapFillStartAndEndTimeExtractVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Aggregation; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode; -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.ValueFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; @@ -96,6 +96,9 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.lang.String.format; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.groupingSets; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isNumericType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingTranslator.sortItemToSortOrder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder; @@ -103,9 +106,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator.GROUP_KEY_SUFFIX; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GapFillStartAndEndTimeExtractVisitor.CAN_NOT_INFER_TIME_RANGE; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.groupingSets; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame.Type.GROUPS; 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 ad8133a982061..a3da7a10c0e8c 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 @@ -23,6 +23,23 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.AggregationLabelSet; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.AggregationValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ClassifierValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers.Assignment; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.LogicalIndexPointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.MatchNumberValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.RowPatternToIrRewriter; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -62,27 +79,10 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Measure; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.AggregationLabelSet; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.AggregationValuePointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ClassifierValuePointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers.Assignment; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.MatchNumberValuePointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.RowPatternToIrRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ScalarValuePointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ValuePointer; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; @@ -156,6 +156,8 @@ import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.schema.table.InformationSchema.INFORMATION_DATABASE; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.NavigationAnchor.LAST; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.NavigationMode.RUNNING; import static org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingTranslator.sortItemToSortOrder; @@ -165,8 +167,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.QueryPlanner.extractPatternRecognitionExpressions; import static org.apache.iotdb.db.queryengine.plan.relational.planner.QueryPlanner.pruneInvisibleFields; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractPredicates; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.CROSS; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.FULL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.IMPLICIT; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java index fe3db50d9e885..7394aef081fa9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -33,8 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; 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.EnforceSingleRowNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java index ce54b2b503a33..c08f7fd8f151b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultExpressionTraversalVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultTraversalVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; 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 01f062729ca44..b6737e43eb671 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 @@ -29,6 +29,9 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -56,9 +59,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode; -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.schema.CreateOrUpdateTableDeviceNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceFetchNode; @@ -101,11 +101,11 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode.COLUMN_NAME_PREFIX; import static org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet.LOGICAL_PLANNER; import static org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet.LOGICAL_PLAN_OPTIMIZE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.MetadataUtil.createQualifiedObjectName; import static org.apache.iotdb.db.queryengine.plan.relational.planner.QueryPlanner.visibleFields; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode.COLUMN_NAME_PREFIX; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountDevice.COUNT_DEVICE_HEADER_STRING; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDevice.getDeviceColumnHeaderList; import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java index 8688e9123dcbf..b9c1c6d4dbae8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java @@ -20,18 +20,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; import org.apache.iotdb.commons.partition.DataPartition; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; 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.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TableDeviceSourceNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; 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.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceFetchNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceQueryCountNode; 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 1b79d388d0ebc..dc444c1cb416f 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 @@ -35,10 +35,33 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -62,42 +85,19 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; 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.AggregationTreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AlignedAggregationTreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; 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.GapFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.NonAlignedAggregationTreeDeviceViewScanNode; -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.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; -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.TableDiskUsageInformationSchemaTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeAlignedDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; 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; @@ -144,10 +144,10 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; import static org.apache.iotdb.db.queryengine.plan.relational.function.FunctionKind.AGGREGATE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PushPredicateIntoTableScan.containsDiffFunction; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.TransformSortToStreamSort.isOrderByAllIdsAndTime; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.split; 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 14de7596ab4c8..fbd59e8aba955 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 @@ -22,6 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; @@ -40,7 +41,6 @@ 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java index 0f2384bded796..5c4ca45c3e937 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java @@ -19,32 +19,32 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; 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.CopyToNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode; -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.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.schema.AbstractTableDeviceQueryNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceQueryCountNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceQueryScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java index e61bf6f7be250..81d5dc5c7fad1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; 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 6d8a2569d0e33..630e56aa4aa5d 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 @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java index 03c8bba9a7e0f..50fee04510be4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java index 6def85481dedd..0c55cca58ec56 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java @@ -20,15 +20,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; 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.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Measure; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrLabel; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java index ff7b187aadbf8..c9960774eaaf7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; 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.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java index ee5e94e6b8d7d..17b7cddba5a90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java index 49b8709716486..f48d1ae89de7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; 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.GenericLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java index a6034c3a24a53..145dd971e16f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java index e1599bd767f67..700d12d413c82 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; 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.GenericLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java index bc0a5a4e62138..f5902b944893a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java index 87df600fe0141..f6e89ccc5c407 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java index df070ff6a3553..8927009b4c236 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -27,7 +28,6 @@ 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.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java index 8bea3672611fb..3f676fde68afd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java index aeaa11ce53591..080bb389b73a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -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.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java index d547305ed4deb..160c0e6fc9289 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java index 93fa0abbba90e..36c3e68d79618 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -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.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java index 2c378b78723fa..86357f1113c3d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SetOperationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java index 90914832dd254..e87e1991a6f05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java index 915be48a777f2..9b9071e2b10a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrPatternAlternationOptimizer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPatternFlattener; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrPatternAlternationOptimizer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrRowPatternFlattener; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java index 8a13c32767a54..ac5a2cf2b5215 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java index 30a6cced9e02b..47ab69b95813e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import com.google.common.collect.Maps; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java index 4b0af1793ce19..171a498b57ce6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java index a5c675b5fc8f3..783e99ad6df41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java index 4b0735ae1ee7c..157888055ed64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; 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.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java index 17125ef9a8021..b4f8568819703 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java index e13c2c1550255..59907a3540701 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java index 42a522c4e540e..660b70a6c2fef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java index 1f60a4ab6430f..daff76b7cc303 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java index 534299d166e56..3c931b2fbeeea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java index ca333145fdc32..10704d99e05ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Measure; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java index bf3360fda15ee..2fb5ba4cb612b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java index 8966b4c4a8aa4..bbc7730259814 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java index 1886ed39e85d6..811904e9d4168 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java index e9fd2e9db0078..3cde522534671 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java index d213b327af1a4..e4b4fe57a1ef7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java index d945ce117afbd..4904df33022e8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java index 71760f58aaa4e..1b4c4f3c3b66b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java index 7401a65fe07c8..4405ee3c3d4c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.WindowNode; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java index 69e33daeac245..020f037adfffb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; 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.Literal; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java index e7f20ef0114bc..9bd7f075e0926 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; @@ -34,12 +34,12 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.lang.Math.toIntExact; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.toTopNRankingType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.ChildReplacer.replaceChildren; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.window; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; public class PushDownLimitIntoWindow implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java index 67b50ab31df4c..69e24ee2265b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; 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.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java index d936c56db3545..f5fa14df40b8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java index d86ab6a651373..9f53c9f065d2b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java index 43cce40c74448..dec567bd2dd02 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java index 4678ec16b48da..a221025569f84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java index 2064e7b6863fd..07f5fa01e13af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java index b07531ef9a16d..95062b05777f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; @@ -38,8 +38,8 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.isEmpty; public class RemoveEmptyExceptBranches implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java index 1b4021f71163e..54326e8963a64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java index 4546dd4efc2c7..5ab98cc57ddee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java index 8af7e07af92ee..826b810dad842 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java index f5a860a6ff2db..a55f2ecd60822 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java index e782c7a94ac2c..fbe4f3e6515a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java index 16f3fde8f3232..fd0c33f9e4210 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java index 04dee3888bb14..541bda4ac50bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SetOperationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java index 509af165b8b37..904eb09cd7638 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java @@ -19,6 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; @@ -33,12 +38,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; 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.GroupNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SetOperationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; @@ -63,7 +63,7 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.concat; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java index e0ea8ffc7ec1f..5d5cc8e5417de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; @@ -26,8 +28,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java index e5cb6a96130e4..130972ea1e401 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; @@ -38,8 +38,8 @@ import java.util.stream.Stream; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java index 47177fe191093..778a57bd12062 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; @@ -45,8 +45,8 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java index 4fb95a4e00b62..8b992a8c7d7f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; @@ -40,9 +40,9 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java index 91c3edb6add02..b5c4326c5a6a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; @@ -50,13 +50,13 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.rewriteWithMasks; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Aggregation.groupingColumns; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java index bfb84bdc3794e..c746e86f66d04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; @@ -47,6 +47,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; @@ -54,7 +55,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.rewriteWithMasks; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Aggregation.groupingColumns; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java index c207b8541818a..2a02febf0525e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; @@ -45,10 +45,10 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Aggregation.groupingColumns; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java index f6aa213c24029..3ce8d32f0d2e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; @@ -40,11 +40,11 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Aggregation.groupingColumns; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index a2091c8e4e49d..ea45a1f4a3a57 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java index ebf24e7b278fb..377e9543c7574 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -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.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; @@ -48,10 +48,10 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.globalAggregation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.globalAggregation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java index 9f0efc02a7674..5f7229abcc257 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java @@ -21,12 +21,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; @@ -40,12 +40,12 @@ import java.util.function.Predicate; import static com.google.common.collect.ImmutableList.toImmutableList; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractConjuncts; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.semiJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java index 80fe79c7e5f42..223bb08e24b06 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java index cbe385fcec44f..f4e2719a089b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java index 5845ffd422105..1cf3ad7da2144 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java @@ -18,15 +18,15 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; 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.SymbolsExtractor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import com.google.common.collect.ImmutableList; @@ -41,8 +41,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode.RankingType.RANK; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.RANK; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; final class Util { private Util() {} 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 5fe33861cd4a4..b024aa7bc44cb 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 @@ -22,6 +22,8 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.function.BoundSignature; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java index 9b066809da874..936f7dc912551 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java index 8514bcbb32f46..daf2b49a19bb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java index d9b8cc1b59ae8..8307b75cd0618 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java index a186c676d3781..8b7006d40f6cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java @@ -19,10 +19,30 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java index faecdd41a9dca..08b3a5ce14f5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java @@ -19,7 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; 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.analyzer.Analysis; @@ -27,17 +35,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; 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.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; -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.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; import java.util.List; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java index b0ca41272e213..d77fdd03016cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java @@ -21,8 +21,11 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; 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.Assignments; @@ -32,9 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; @@ -60,12 +60,12 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableMap.toImmutableMap; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractConjuncts; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper.symbolMapper; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; 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 22a4433418324..d246d4fd59564 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 @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -27,10 +29,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.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.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; 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 6299e2976b430..396da1e0b5095 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 @@ -21,29 +21,29 @@ import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; 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.analyzer.Analysis; 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.CteScanNode; 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.GroupNode; 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.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.TableFunctionProcessorNode; 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; import java.util.HashSet; 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 23dc1c3c7b4c7..1708bd9e016c4 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 @@ -26,8 +26,14 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; @@ -55,16 +61,10 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; 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.AssignUniqueId; 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.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; -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.TreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java index f13b516101dd8..ab4023e3fed1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; 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.planner.plan.node.process.ExchangeNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; -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.EnforceSingleRowNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; import com.google.common.collect.Range; 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 d8f4d49ee87a9..eba43ad7a3151 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 @@ -20,17 +20,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; 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.GapFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; -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.ValueFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java index fafe3f304ce69..b28543ca2c041 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java @@ -20,7 +20,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.AggregationValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ClassifierValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.MatchNumberValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; @@ -29,21 +43,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; -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.Measure; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.AggregationValuePointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ClassifierValuePointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.MatchNumberValuePointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ScalarValuePointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ValuePointer; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; @@ -61,7 +61,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.groupingSets; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.groupingSets; public class SymbolMapper { private final Function mappingFunction; 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 e448a131f3130..d4213a2b7acd7 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 @@ -19,22 +19,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; 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.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; 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.MergeSortNode; -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.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java index fead848e1b2c1..47bdf10a013ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; @@ -29,10 +31,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.ir.IrUtils; -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.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; @@ -56,10 +56,10 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.globalAggregation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SimplePlanRewriter.rewriteWith; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.globalAggregation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode.Quantifier.ALL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; 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 ecc29d27e6a4f..11c35c12bbf47 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 @@ -20,6 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; @@ -27,15 +32,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.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; 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.UnionNode; import java.util.Map; 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 ec0a04b66eac9..7f2db2b0f987f 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 @@ -19,9 +19,31 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; 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.metadata.ColumnSchema; @@ -33,39 +55,17 @@ 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.DeterminismEvaluator; -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.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; 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.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; -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.PatternRecognitionNode; -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.RowNumberNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java index 706b24a567b3b..8f2496d3e2ba1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; 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.AggregationTreeDeviceViewScanNode; @@ -44,10 +44,10 @@ import java.util.Optional; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; public class Util { private Util() {} diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java index 609ec84716694..8af1e0e4ec191 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java @@ -19,25 +19,25 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrPatternAlternationOptimizer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrRowPatternFlattener; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrPatternAlternationOptimizer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPatternFlattener; import org.junit.Assert; import org.junit.Test; import java.util.Optional; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.alternation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.concatenation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.empty; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.excluded; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.label; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.permutation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.plusQuantified; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.questionMarkQuantified; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.rangeQuantified; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.starQuantified; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.alternation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.concatenation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.empty; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.excluded; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.label; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.permutation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.plusQuantified; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.questionMarkQuantified; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.rangeQuantified; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.starQuantified; public class IrRowPatternOptimizationTest { @Test diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java index 5c6c6da62cdb7..b520b9c63dca5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.ArrayView; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.IrRowPatternToProgramRewriter; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.MatchResult; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.Matcher; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.Program; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrRowPattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -36,15 +36,15 @@ import java.util.Map; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.alternation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.concatenation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.end; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.excluded; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.label; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.permutation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.questionMarkQuantified; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.starQuantified; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.start; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.alternation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.concatenation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.end; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.excluded; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.label; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.permutation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.questionMarkQuantified; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.starQuantified; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.start; import static org.mockito.Mockito.mock; public class MatcherTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java index c4c9644be48ed..a6677411139bc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java index 92829ef5b38ef..b7c6bb3c5ab5f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java index b9d38cfd35744..0a0866de6c6c6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java index 2227a26f93e18..0a46d62af6c0d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java @@ -35,6 +35,10 @@ import java.util.Optional; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; @@ -48,10 +52,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; 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 da39a91dd61c5..5fd29636d7f95 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 @@ -32,8 +32,12 @@ import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -60,12 +64,8 @@ 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.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.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.security.AllowAllAccessControl; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/DistinctTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/DistinctTest.java index 6cccf387a66fe..fe25406826a9a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/DistinctTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/DistinctTest.java @@ -30,6 +30,7 @@ import java.util.Optional; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; @@ -43,7 +44,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; public class DistinctTest { // ================================================================== diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java index 519f8ffecc251..4dab1896c4641 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java @@ -21,6 +21,9 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -31,9 +34,6 @@ 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.IntoNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; import org.junit.BeforeClass; import org.junit.Test; 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 8f3921584f3b4..9d083e7ded85c 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 @@ -23,6 +23,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -45,12 +51,6 @@ 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.MergeSortNode; -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.TopKNode; 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.SymbolReference; @@ -72,6 +72,8 @@ import java.util.List; import java.util.Optional; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; @@ -101,8 +103,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.PARTIAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.junit.Assert.assertEquals; 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 d15ebf4f8745d..2c0b41e65570c 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 @@ -21,7 +21,11 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -33,12 +37,8 @@ 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.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; import org.junit.BeforeClass; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java index 722c8ce992d47..2e98fd6566522 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -27,8 +29,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.TableLogicalPlanner; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.distribute.TableDistributedPlanner; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; 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 8547356dbdf66..aaae574ca516a 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 @@ -22,6 +22,12 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; @@ -34,12 +40,6 @@ 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.MergeSortNode; -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.TopKNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.junit.BeforeClass; 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 746bf06f53586..fd37737d83615 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 @@ -22,6 +22,11 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -32,11 +37,6 @@ 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.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.TopKNode; import org.junit.BeforeClass; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java index 9a0417131205f..9831957c36baf 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java @@ -39,6 +39,10 @@ import java.util.Optional; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; @@ -50,10 +54,6 @@ 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.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.DIVIDE; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; 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 4b65fc7f61c07..bb1642fd04502 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 @@ -22,6 +22,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; @@ -29,9 +32,6 @@ 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.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.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; 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 2f65a7ec5bf07..9da0789e54622 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 @@ -21,6 +21,8 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -31,8 +33,6 @@ 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.MergeSortNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode; 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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TreeViewTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TreeViewTest.java index 1dcd7d5487af5..bdbed5c3b3a4c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TreeViewTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TreeViewTest.java @@ -35,6 +35,9 @@ import java.util.Optional; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata.DEVICE_VIEW_TEST_TABLE; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata.TREE_VIEW_DB; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanAssert.assertPlan; @@ -50,9 +53,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.treeAlignedDeviceViewTableScan; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.treeDeviceViewTableScan; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.treeNonAlignedDeviceViewTableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.PARTIAL; public class TreeViewTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java index 8ed29e46fb581..320a2c9cf5e6a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java @@ -36,6 +36,7 @@ import java.util.Collections; import java.util.Optional; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.expression; @@ -46,7 +47,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; public class CorrelatedSubqueryTest { @Test diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java index 431610b582b0e..74df8302999e8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java @@ -57,6 +57,7 @@ import java.util.List; import java.util.Optional; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; @@ -69,7 +70,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.LAST; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java index 7b9b9b4cc1cfe..2de79e3f39976 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java @@ -22,18 +22,18 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.LogicalIndexPointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Measure; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.ScalarValuePointer; 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.Identifier; @@ -57,10 +57,10 @@ import java.util.Optional; import java.util.Set; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.concatenation; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.excluded; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.label; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.Patterns.starQuantified; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.concatenation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.excluded; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.label; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.starQuantified; import static org.junit.Assert.assertEquals; public class PatternRecognitionNodeSerdeTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java index 051f93ca04194..0c41f6928832e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java @@ -39,6 +39,9 @@ import java.util.Collections; import java.util.Optional; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; @@ -54,9 +57,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java index ff47c33ec8fa1..af2da6b93fab4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java index 8e66c9f19e71b..f13610286faac 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import java.util.Map; import java.util.Objects; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java index ccfe2813ef535..24fcf56003fee 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode; import java.util.Collection; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java index 7c82a1646b8c6..abd5e53f3cd7d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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.AggregationNode; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkState; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java index 6ff4a6b9e4ce2..94331480350c7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; 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.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java index eb82e059b6c40..310c3efb34585 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java index ff17bdfec3c95..586bdb7841674 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; 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.GroupNode; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java index e9ed8b6084b3b..e9e2b1afb978f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.ProjectNode; import static com.google.common.base.Preconditions.checkState; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.MatchResult.NO_MATCH; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java index 27c74560f8d65..a51251c659716 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; 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.MarkDistinctNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java index 7fc084b9cf7e7..31ad4b3fb9e41 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; 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.OffsetNode; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkState; 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 84a988c821db9..4735f71550a9a 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 @@ -19,9 +19,28 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; 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; @@ -29,37 +48,18 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; -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.AggregationTreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AlignedAggregationTreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; 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.GroupNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.NonAlignedAggregationTreeDeviceViewScanNode; -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.RowNumberNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SemiJoinNode; -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.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeAlignedDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java index be4280b15db63..1a35f6babf8db 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.PlanVisitor; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java index 7ee9192254e79..534fe545dc7d5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; 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.SemiJoinNode; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkState; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java index 3a95f579b3139..acf666e261501 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; 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.assertions.PlanMatchPattern.Ordering; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java index 706efd4eb6749..cc27d1321aec5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java index a272dba7e382b..f830a604c48b5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; 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.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java index 018a693e55cb9..4c9b332da67fe 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; 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.TopKNode; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java index 8d360cc1f8db3..9a028eb562353 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; 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.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode; import java.util.List; import java.util.Objects; From 41fe4087b4284d95a0bba3c09abb5a64881c7dff Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 13 Apr 2026 12:17:03 +0800 Subject: [PATCH 05/45] add IAstVisitor --- .../plan/planner/TableOperatorGenerator.java | 4 +- .../plan/relational/planner/Symbol.java | 4 +- .../planner/node/AggregationNode.java | 4 +- .../planner/node/AssignUniqueId.java | 2 +- .../relational/planner/node/CollectNode.java | 2 +- .../planner/node/EnforceSingleRowNode.java | 2 +- .../relational/planner/node/FillNode.java | 2 +- .../relational/planner/node/FilterNode.java | 4 +- .../relational/planner/node/GapFillNode.java | 2 +- .../relational/planner/node/JoinNode.java | 4 +- .../relational/planner/node/LimitNode.java | 2 +- .../planner/node/LinearFillNode.java | 2 +- .../planner/node/MarkDistinctNode.java | 2 +- .../planner/node/MergeSortNode.java | 2 +- .../relational/planner/node/OffsetNode.java | 2 +- .../relational/planner/node/OutputNode.java | 2 +- .../planner/node/PatternRecognitionNode.java | 2 +- .../planner/node/PreviousFillNode.java | 2 +- .../relational/planner/node/ProjectNode.java | 4 +- .../planner/node/RowNumberNode.java | 2 +- .../relational/planner/node/SemiJoinNode.java | 2 +- .../relational/planner/node/SortNode.java | 2 +- .../planner/node/TableFunctionNode.java | 2 +- .../node/TableFunctionProcessorNode.java | 2 +- .../relational/planner/node/TopKNode.java | 2 +- .../planner/node/TopKRankingNode.java | 2 +- .../relational/planner/node/UnionNode.java | 2 +- .../planner/node/ValueFillNode.java | 2 +- .../relational/planner/node/ValuesNode.java | 4 +- .../relational/planner/node/WindowNode.java | 4 +- .../rowpattern/AggregationValuePointer.java | 4 +- .../ExpressionAndValuePointers.java | 4 +- .../rowpattern/ScalarValuePointer.java | 2 +- .../sql/ast/CommonQueryAstVisitor.java | 36 ++++++++++++++ .../plan/relational/sql/ast/Expression.java | 47 +++++++++++++++++-- .../plan/relational/sql/ast/IAstVisitor.java | 17 +++++++ .../plan/relational/sql/ast/Node.java | 14 ++++-- .../sql/ast/StackableAstVisitor.java | 4 +- .../schemaregion/IoTDBSchemaRegionSource.java | 2 +- .../PipeTableStatementToPlanVisitor.java | 2 +- .../common/header/DatasetHeader.java | 2 +- .../process/copyto/CopyToOptions.java | 2 +- .../copyto/tsfile/CopyToTsFileOptions.java | 2 +- .../rowpattern/expression/Computation.java | 2 +- .../AbstractAggTableScanOperator.java | 2 +- ...formationSchemaContentSupplierFactory.java | 2 +- .../aggregation/AccumulatorFactory.java | 2 +- .../relational/ColumnTransformerBuilder.java | 4 +- .../db/queryengine/plan/Coordinator.java | 2 +- .../plan/analyze/AnalyzeUtils.java | 2 +- .../plan/analyze/PredicateUtils.java | 8 ++-- .../plan/analyze/TypeProvider.java | 2 +- .../config/TableConfigTaskVisitor.java | 4 +- ...ableModelStatementMemorySourceVisitor.java | 2 +- .../queryengine/plan/parser/ASTVisitor.java | 4 +- .../DataNodeTableOperatorGenerator.java | 4 +- .../planner/plan/TableModelTimePredicate.java | 2 +- .../plan/planner/plan/TimePredicate.java | 2 +- .../planner/plan/node/PlanGraphPrinter.java | 2 +- .../plan/planner/plan/node/PlanNode.java | 2 +- .../metadata/read/TableDeviceSourceNode.java | 2 +- .../plan/node/process/ExchangeNode.java | 2 +- .../analyzer/AggregationAnalyzer.java | 4 +- .../plan/relational/analyzer/Analysis.java | 6 +-- .../plan/relational/analyzer/Analyzer.java | 2 +- .../analyzer/CanonicalizationAware.java | 2 +- .../analyzer/ExpressionAnalysis.java | 2 +- .../analyzer/ExpressionAnalyzer.java | 8 ++-- .../analyzer/ExpressionTreeUtils.java | 4 +- .../plan/relational/analyzer/NodeRef.java | 2 +- .../analyzer/PatternRecognitionAnalysis.java | 2 +- .../analyzer/PatternRecognitionAnalyzer.java | 2 +- .../plan/relational/analyzer/RelationId.java | 2 +- .../plan/relational/analyzer/Scope.java | 2 +- .../analyzer/ScopeReferenceExtractor.java | 4 +- .../analyzer/StatementAnalyzer.java | 6 +-- .../ConvertPredicateToFilterVisitor.java | 4 +- .../ConvertPredicateToTimeFilterVisitor.java | 2 +- .../PredicateCombineIntoTableScanChecker.java | 2 +- .../PredicatePushIntoMetadataChecker.java | 2 +- .../PredicatePushIntoScanChecker.java | 2 +- .../analyzer/predicate/PredicateVisitor.java | 2 +- .../schema/CheckSchemaPredicateVisitor.java | 2 +- ...ConvertSchemaPredicateToFilterVisitor.java | 2 +- .../ExtractPredicateColumnNameVisitor.java | 2 +- .../tablefunction/TableArgumentAnalysis.java | 2 +- .../function/ResolvedFunctionCallBuilder.java | 2 +- .../plan/relational/metadata/Metadata.java | 2 +- .../metadata/TableMetadataImpl.java | 2 +- .../metadata/fetcher/SchemaPredicateUtil.java | 2 +- .../fetcher/TableDeviceSchemaFetcher.java | 2 +- .../plan/relational/planner/Assignments.java | 3 +- .../DataOrganizationSpecification.java | 2 + .../relational/planner/EqualityInference.java | 3 +- .../planner/ExpressionExtractor.java | 2 +- .../planner/ExpressionSymbolInliner.java | 3 +- .../planner/IrExpressionInterpreter.java | 3 +- .../relational/planner/IrTypeAnalyzer.java | 5 +- .../relational/planner/LiteralEncoder.java | 2 +- .../planner/LiteralInterpreter.java | 2 +- .../planner/NoOpSymbolResolver.java | 2 + .../relational/planner/NodeAndMappings.java | 1 + .../relational/planner/OrderingScheme.java | 2 + .../plan/relational/planner/PlanBuilder.java | 3 +- .../relational/planner/PredicateUtils.java | 2 +- .../plan/relational/planner/QueryPlanner.java | 5 +- .../plan/relational/planner/RelationPlan.java | 1 + .../relational/planner/RelationPlanner.java | 5 +- .../plan/relational/planner/ScopeAware.java | 4 +- .../relational/planner/SubqueryPlanner.java | 5 +- .../relational/planner/SymbolAllocator.java | 3 +- .../relational/planner/SymbolResolver.java | 2 + .../relational/planner/SymbolsExtractor.java | 3 +- .../planner/TableLogicalPlanner.java | 1 + .../relational/planner/TableModelPlanner.java | 2 +- .../relational/planner/TranslationMap.java | 5 +- .../TableDistributedPlanGenerator.java | 4 +- .../TableModelTypeProviderExtractor.java | 4 +- .../planner/ir/DefaultTraversalVisitor.java | 2 +- .../planner/ir/DeterminismEvaluator.java | 2 +- .../planner/ir/ExpressionNodeInliner.java | 2 +- .../planner/ir/ExpressionRewriter.java | 2 +- .../planner/ir/ExpressionTreeRewriter.java | 2 +- ...actCommonPredicatesExpressionRewriter.java | 2 +- .../GapFillStartAndEndTimeExtractVisitor.java | 6 +-- .../ir/GlobalTimePredicateExtractVisitor.java | 2 +- .../plan/relational/planner/ir/IrUtils.java | 2 +- .../ir/NormalizeOrExpressionRewriter.java | 2 +- ...correlatedScalarSubqueryReconstructor.java | 2 +- .../planner/ir/ReplaceSymbolInExpression.java | 4 +- .../planner/ir/SubExpressionExtractor.java | 4 +- .../planner/iterative/GroupReference.java | 2 +- .../rule/AggregationDecorrelation.java | 2 +- .../rule/CanonicalizeExpressionRewriter.java | 2 +- .../rule/EvaluateEmptyIntersect.java | 2 +- .../rule/ExpressionRewriteRuleSet.java | 4 +- .../iterative/rule/GatherAndMergeWindows.java | 4 +- .../iterative/rule/ImplementExceptAll.java | 2 +- .../rule/ImplementExceptDistinctAsUnion.java | 2 +- .../iterative/rule/ImplementIntersectAll.java | 2 +- .../ImplementIntersectDistinctAsUnion.java | 2 +- .../rule/ImplementPatternRecognition.java | 2 +- .../rule/ImplementTableFunctionSource.java | 2 +- .../iterative/rule/InlineProjections.java | 4 +- ...ipleDistinctAggregationToMarkDistinct.java | 2 +- .../rule/ProjectOffPushDownRule.java | 2 +- .../rule/PruneAggregationColumns.java | 2 +- .../rule/PruneAggregationSourceColumns.java | 2 +- .../iterative/rule/PruneApplyColumns.java | 2 +- .../iterative/rule/PruneApplyCorrelation.java | 2 +- .../rule/PruneApplySourceColumns.java | 2 +- .../rule/PruneAssignUniqueIdColumns.java | 2 +- .../rule/PruneCorrelatedJoinColumns.java | 2 +- .../rule/PruneCorrelatedJoinCorrelation.java | 2 +- .../rule/PruneEnforceSingleRowColumns.java | 2 +- .../rule/PruneExceptSourceColumns.java | 2 +- .../iterative/rule/PruneFillColumns.java | 2 +- .../iterative/rule/PruneFilterColumns.java | 2 +- .../iterative/rule/PruneGapFillColumns.java | 2 +- .../rule/PruneIntersectSourceColumns.java | 2 +- .../rule/PruneJoinChildrenColumns.java | 2 +- .../iterative/rule/PruneJoinColumns.java | 2 +- .../iterative/rule/PruneLimitColumns.java | 2 +- .../rule/PruneMarkDistinctColumns.java | 2 +- .../iterative/rule/PruneOffsetColumns.java | 2 +- .../PrunePatternRecognitionSourceColumns.java | 2 +- .../iterative/rule/PruneProjectColumns.java | 2 +- .../iterative/rule/PruneSortColumns.java | 2 +- .../PruneTableFunctionProcessorColumns.java | 2 +- ...neTableFunctionProcessorSourceColumns.java | 2 +- .../iterative/rule/PruneTableScanColumns.java | 2 +- .../iterative/rule/PruneTopKColumns.java | 2 +- .../iterative/rule/PruneUnionColumns.java | 2 +- .../rule/PruneUnionSourceColumns.java | 2 +- .../iterative/rule/PruneWindowColumns.java | 2 +- .../rule/PushDownFilterIntoWindow.java | 4 +- .../PushDownNegationsExpressionRewriter.java | 2 +- .../rule/PushLimitThroughProject.java | 2 +- .../rule/PushProjectionThroughUnion.java | 4 +- .../iterative/rule/PushTopKThroughUnion.java | 2 +- .../rule/RemoveDuplicateConditions.java | 2 +- .../rule/RemoveEmptyExceptBranches.java | 2 +- .../rule/RemoveEmptyUnionBranches.java | 2 +- .../iterative/rule/RemoveRedundantExists.java | 4 +- .../iterative/rule/RemoveTrivialFilters.java | 2 +- .../iterative/rule/SetOperationMerge.java | 2 +- .../rule/SetOperationNodeTranslator.java | 4 +- .../rule/SimplifyCountOverConstant.java | 4 +- .../iterative/rule/SimplifyExpressions.java | 2 +- .../SingleDistinctAggregationToGroupBy.java | 4 +- ...atedDistinctAggregationWithProjection.java | 2 +- ...dDistinctAggregationWithoutProjection.java | 2 +- ...elatedGlobalAggregationWithProjection.java | 4 +- ...tedGlobalAggregationWithoutProjection.java | 4 +- ...latedGroupedAggregationWithProjection.java | 2 +- ...edGroupedAggregationWithoutProjection.java | 2 +- .../rule/TransformCorrelatedJoinToJoin.java | 2 +- .../TransformCorrelatedScalarSubquery.java | 2 +- .../TransformExistsApplyToCorrelatedJoin.java | 2 +- ...TransformFilteringSemiJoinToInnerJoin.java | 4 +- ...rrelatedInPredicateSubqueryToSemiJoin.java | 2 +- .../TransformUncorrelatedSubqueryToJoin.java | 4 +- .../planner/iterative/rule/Util.java | 4 +- .../node/AggregationTableScanNode.java | 4 +- .../AggregationTreeDeviceViewScanNode.java | 4 +- ...gnedAggregationTreeDeviceViewScanNode.java | 4 +- .../relational/planner/node/ApplyNode.java | 4 +- .../relational/planner/node/CopyToNode.java | 2 +- .../planner/node/CorrelatedJoinNode.java | 6 +-- .../relational/planner/node/CteScanNode.java | 2 +- .../planner/node/DeviceTableScanNode.java | 4 +- .../relational/planner/node/ExceptNode.java | 2 +- .../relational/planner/node/ExchangeNode.java | 2 +- .../planner/node/ExplainAnalyzeNode.java | 2 +- .../node/InformationSchemaTableScanNode.java | 4 +- .../planner/node/IntersectNode.java | 2 +- .../relational/planner/node/IntoNode.java | 2 +- ...gnedAggregationTreeDeviceViewScanNode.java | 4 +- .../relational/planner/node/Patterns.java | 4 +- .../planner/node/SetOperationNode.java | 2 +- ...skUsageInformationSchemaTableScanNode.java | 4 +- .../planner/node/TableScanNode.java | 4 +- .../node/TreeAlignedDeviceViewScanNode.java | 4 +- .../planner/node/TreeDeviceViewScanNode.java | 4 +- .../TreeNonAlignedDeviceViewScanNode.java | 4 +- .../schema/AbstractTableDeviceQueryNode.java | 2 +- .../TableDeviceAttributeUpdateNode.java | 4 +- .../schema/TableDeviceQueryCountNode.java | 2 +- .../node/schema/TableDeviceQueryScanNode.java | 2 +- .../CheckSubqueryNodesAreRewritten.java | 2 +- .../planner/optimizations/JoinUtils.java | 4 +- .../optimizations/ParallelizeGrouping.java | 2 +- .../optimizations/PlanNodeDecorrelator.java | 4 +- .../PushAggregationIntoTableScan.java | 4 +- .../PushLimitOffsetIntoTableScan.java | 4 +- .../PushPredicateIntoTableScan.java | 6 +-- .../optimizations/SortElimination.java | 2 +- .../planner/optimizations/SymbolMapper.java | 4 +- .../TransformAggregationToStreamable.java | 2 +- ...tifiedComparisonApplyToCorrelatedJoin.java | 4 +- .../TransformSortToStreamSort.java | 2 +- .../UnaliasSymbolReferences.java | 4 +- .../planner/optimizations/Util.java | 2 +- .../relational/sql/ParameterExtractor.java | 2 +- .../sql/ast/AbstractQueryDeviceWithCache.java | 1 + .../sql/ast/AbstractTraverseDevice.java | 2 + .../plan/relational/sql/ast/AddColumn.java | 7 ++- .../relational/sql/ast/AliasedRelation.java | 7 ++- .../plan/relational/sql/ast/AllColumns.java | 8 +++- .../plan/relational/sql/ast/AllRows.java | 8 +++- .../sql/ast/AlterColumnDataType.java | 7 ++- .../plan/relational/sql/ast/AlterDB.java | 5 +- .../plan/relational/sql/ast/AlterPipe.java | 6 ++- .../relational/sql/ast/AnchorPattern.java | 7 ++- .../sql/ast/ArithmeticBinaryExpression.java | 8 +++- .../sql/ast/ArithmeticUnaryExpression.java | 8 +++- .../plan/relational/sql/ast/AsofJoinOn.java | 2 + .../sql/ast/AstMemoryEstimationHelper.java | 2 + .../plan/relational/sql/ast/AstVisitor.java | 21 +-------- .../relational/sql/ast/BetweenPredicate.java | 8 +++- .../relational/sql/ast/BinaryLiteral.java | 6 ++- .../relational/sql/ast/BooleanLiteral.java | 7 ++- .../plan/relational/sql/ast/Cast.java | 8 +++- .../plan/relational/sql/ast/ClearCache.java | 6 ++- .../sql/ast/CoalesceExpression.java | 8 +++- .../relational/sql/ast/ColumnDefinition.java | 6 ++- .../plan/relational/sql/ast/Columns.java | 8 +++- .../sql/ast/ComparisonExpression.java | 8 +++- .../plan/relational/sql/ast/CopyTo.java | 6 ++- .../plan/relational/sql/ast/CountDevice.java | 6 ++- .../relational/sql/ast/CountStatement.java | 8 +++- .../plan/relational/sql/ast/CreateDB.java | 5 +- .../sql/ast/CreateExternalService.java | 7 ++- .../relational/sql/ast/CreateFunction.java | 7 ++- .../plan/relational/sql/ast/CreateIndex.java | 7 ++- .../plan/relational/sql/ast/CreateModel.java | 7 ++- .../sql/ast/CreateOrUpdateDevice.java | 7 ++- .../plan/relational/sql/ast/CreatePipe.java | 6 ++- .../relational/sql/ast/CreatePipePlugin.java | 6 ++- .../plan/relational/sql/ast/CreateTable.java | 7 ++- .../plan/relational/sql/ast/CreateTopic.java | 6 ++- .../relational/sql/ast/CreateTraining.java | 7 ++- .../plan/relational/sql/ast/CreateView.java | 5 +- .../relational/sql/ast/CurrentDatabase.java | 8 +++- .../plan/relational/sql/ast/CurrentTime.java | 8 +++- .../plan/relational/sql/ast/CurrentUser.java | 8 +++- .../plan/relational/sql/ast/DataType.java | 2 + .../relational/sql/ast/DataTypeParameter.java | 7 ++- .../relational/sql/ast/DatabaseStatement.java | 1 + .../plan/relational/sql/ast/Deallocate.java | 7 ++- .../relational/sql/ast/DecimalLiteral.java | 7 ++- .../sql/ast/DefaultTraversalVisitor.java | 3 ++ .../plan/relational/sql/ast/Delete.java | 7 ++- .../plan/relational/sql/ast/DeleteDevice.java | 8 ++-- .../sql/ast/DereferenceExpression.java | 8 +++- .../relational/sql/ast/DescribeTable.java | 7 ++- .../relational/sql/ast/DoubleLiteral.java | 7 ++- .../plan/relational/sql/ast/DropColumn.java | 7 ++- .../plan/relational/sql/ast/DropDB.java | 7 ++- .../sql/ast/DropExternalService.java | 7 ++- .../plan/relational/sql/ast/DropFunction.java | 7 ++- .../plan/relational/sql/ast/DropIndex.java | 7 ++- .../plan/relational/sql/ast/DropModel.java | 7 ++- .../plan/relational/sql/ast/DropPipe.java | 6 ++- .../relational/sql/ast/DropPipePlugin.java | 6 ++- .../relational/sql/ast/DropSubscription.java | 6 ++- .../plan/relational/sql/ast/DropTable.java | 7 ++- .../plan/relational/sql/ast/DropTopic.java | 6 ++- .../plan/relational/sql/ast/EmptyPattern.java | 7 ++- .../plan/relational/sql/ast/Except.java | 7 ++- .../relational/sql/ast/ExcludedPattern.java | 7 ++- .../plan/relational/sql/ast/Execute.java | 7 ++- .../relational/sql/ast/ExecuteImmediate.java | 7 ++- .../relational/sql/ast/ExistsPredicate.java | 8 +++- .../plan/relational/sql/ast/Explain.java | 7 ++- .../relational/sql/ast/ExplainAnalyze.java | 7 ++- .../plan/relational/sql/ast/ExtendRegion.java | 7 ++- .../plan/relational/sql/ast/Extract.java | 8 +++- .../plan/relational/sql/ast/FetchDevice.java | 7 ++- .../relational/sql/ast/FieldReference.java | 8 +++- .../plan/relational/sql/ast/Fill.java | 6 ++- .../plan/relational/sql/ast/FloatLiteral.java | 6 ++- .../plan/relational/sql/ast/Flush.java | 5 +- .../plan/relational/sql/ast/FrameBound.java | 8 +++- .../plan/relational/sql/ast/FunctionCall.java | 8 +++- .../relational/sql/ast/GenericDataType.java | 7 ++- .../relational/sql/ast/GenericLiteral.java | 6 ++- .../plan/relational/sql/ast/GroupBy.java | 7 ++- .../relational/sql/ast/GroupingElement.java | 8 +++- .../plan/relational/sql/ast/GroupingSets.java | 8 +++- .../plan/relational/sql/ast/Identifier.java | 8 +++- .../plan/relational/sql/ast/IfExpression.java | 8 +++- .../relational/sql/ast/InListExpression.java | 8 +++- .../plan/relational/sql/ast/InPredicate.java | 8 +++- .../plan/relational/sql/ast/Insert.java | 6 ++- .../plan/relational/sql/ast/InsertRow.java | 5 +- .../plan/relational/sql/ast/InsertRows.java | 5 +- .../plan/relational/sql/ast/InsertTablet.java | 5 +- .../plan/relational/sql/ast/Intersect.java | 7 ++- .../sql/ast/IsNotNullPredicate.java | 8 +++- .../relational/sql/ast/IsNullPredicate.java | 8 +++- .../plan/relational/sql/ast/Join.java | 7 ++- .../plan/relational/sql/ast/JoinCriteria.java | 2 + .../plan/relational/sql/ast/JoinOn.java | 3 ++ .../plan/relational/sql/ast/JoinUsing.java | 2 + .../plan/relational/sql/ast/KillQuery.java | 7 ++- .../relational/sql/ast/LikePredicate.java | 8 +++- .../plan/relational/sql/ast/Limit.java | 8 +++- .../plan/relational/sql/ast/Literal.java | 8 +++- .../relational/sql/ast/LoadConfiguration.java | 5 +- .../plan/relational/sql/ast/LoadModel.java | 7 ++- .../plan/relational/sql/ast/LoadTsFile.java | 6 ++- .../relational/sql/ast/LogicalExpression.java | 8 +++- .../plan/relational/sql/ast/LongLiteral.java | 6 ++- .../relational/sql/ast/MeasureDefinition.java | 8 +++- .../relational/sql/ast/MigrateRegion.java | 7 ++- .../plan/relational/sql/ast/NaturalJoin.java | 2 + .../relational/sql/ast/NotExpression.java | 8 +++- .../relational/sql/ast/NullIfExpression.java | 8 +++- .../plan/relational/sql/ast/NullLiteral.java | 7 ++- .../relational/sql/ast/NumericParameter.java | 7 ++- .../plan/relational/sql/ast/Offset.java | 8 +++- .../sql/ast/OneOrMoreQuantifier.java | 6 ++- .../plan/relational/sql/ast/OrderBy.java | 7 ++- .../plan/relational/sql/ast/Parameter.java | 8 +++- .../sql/ast/PatternAlternation.java | 7 ++- .../sql/ast/PatternConcatenation.java | 7 ++- .../sql/ast/PatternPermutation.java | 7 ++- .../relational/sql/ast/PatternQuantifier.java | 7 ++- .../sql/ast/PatternRecognitionRelation.java | 8 +++- .../relational/sql/ast/PatternVariable.java | 7 ++- .../plan/relational/sql/ast/PipeEnriched.java | 7 ++- .../relational/sql/ast/PipeStatement.java | 2 + .../plan/relational/sql/ast/Prepare.java | 7 ++- .../relational/sql/ast/ProcessingMode.java | 7 ++- .../plan/relational/sql/ast/Property.java | 8 +++- .../relational/sql/ast/QualifiedName.java | 2 + .../ast/QuantifiedComparisonExpression.java | 8 +++- .../relational/sql/ast/QuantifiedPattern.java | 7 ++- .../plan/relational/sql/ast/Query.java | 6 ++- .../plan/relational/sql/ast/QueryBody.java | 6 ++- .../sql/ast/QuerySpecification.java | 8 +++- .../relational/sql/ast/RangeQuantifier.java | 7 ++- .../relational/sql/ast/ReconstructRegion.java | 7 ++- .../plan/relational/sql/ast/Relation.java | 7 ++- .../sql/ast/RelationalAuthorStatement.java | 6 ++- .../plan/relational/sql/ast/RemoveAINode.java | 7 ++- .../relational/sql/ast/RemoveConfigNode.java | 7 ++- .../relational/sql/ast/RemoveDataNode.java | 7 ++- .../plan/relational/sql/ast/RemoveRegion.java | 7 ++- .../plan/relational/sql/ast/RenameColumn.java | 6 ++- .../plan/relational/sql/ast/RenameTable.java | 6 ++- .../plan/relational/sql/ast/Row.java | 8 +++- .../plan/relational/sql/ast/RowPattern.java | 7 ++- .../sql/ast/SearchedCaseExpression.java | 8 +++- .../plan/relational/sql/ast/Select.java | 7 ++- .../plan/relational/sql/ast/SelectItem.java | 2 + .../relational/sql/ast/SetColumnComment.java | 7 ++- .../relational/sql/ast/SetConfiguration.java | 5 +- .../plan/relational/sql/ast/SetOperation.java | 6 ++- .../relational/sql/ast/SetProperties.java | 7 ++- .../relational/sql/ast/SetSqlDialect.java | 6 ++- .../relational/sql/ast/SetSystemStatus.java | 5 +- .../relational/sql/ast/SetTableComment.java | 7 ++- .../relational/sql/ast/ShowAIDevices.java | 7 ++- .../plan/relational/sql/ast/ShowAINodes.java | 7 ++- .../relational/sql/ast/ShowAvailableUrls.java | 7 ++- .../plan/relational/sql/ast/ShowCluster.java | 7 ++- .../relational/sql/ast/ShowClusterId.java | 7 ++- .../relational/sql/ast/ShowConfigNodes.java | 7 ++- .../relational/sql/ast/ShowConfiguration.java | 5 +- .../sql/ast/ShowCurrentDatabase.java | 7 ++- .../sql/ast/ShowCurrentSqlDialect.java | 7 ++- .../sql/ast/ShowCurrentTimestamp.java | 7 ++- .../relational/sql/ast/ShowCurrentUser.java | 7 ++- .../plan/relational/sql/ast/ShowDB.java | 7 ++- .../relational/sql/ast/ShowDataNodes.java | 7 ++- .../plan/relational/sql/ast/ShowDevice.java | 7 ++- .../sql/ast/ShowExternalService.java | 8 +++- .../relational/sql/ast/ShowFunctions.java | 7 ++- .../plan/relational/sql/ast/ShowIndex.java | 7 ++- .../relational/sql/ast/ShowLoadedModels.java | 7 ++- .../plan/relational/sql/ast/ShowModels.java | 7 ++- .../relational/sql/ast/ShowPipePlugins.java | 6 ++- .../plan/relational/sql/ast/ShowPipes.java | 6 ++- .../sql/ast/ShowQueriesStatement.java | 8 +++- .../plan/relational/sql/ast/ShowRegions.java | 6 ++- .../relational/sql/ast/ShowStatement.java | 8 +++- .../relational/sql/ast/ShowSubscriptions.java | 6 ++- .../plan/relational/sql/ast/ShowTables.java | 7 ++- .../plan/relational/sql/ast/ShowTopics.java | 6 ++- .../relational/sql/ast/ShowVariables.java | 7 ++- .../plan/relational/sql/ast/ShowVersion.java | 7 ++- .../sql/ast/SimpleCaseExpression.java | 8 +++- .../relational/sql/ast/SimpleGroupBy.java | 8 +++- .../plan/relational/sql/ast/SingleColumn.java | 8 +++- .../plan/relational/sql/ast/SkipTo.java | 7 ++- .../plan/relational/sql/ast/SortItem.java | 8 +++- .../sql/ast/StartExternalService.java | 7 ++- .../plan/relational/sql/ast/StartPipe.java | 6 ++- .../relational/sql/ast/StartRepairData.java | 5 +- .../plan/relational/sql/ast/Statement.java | 7 ++- .../sql/ast/StopExternalService.java | 7 ++- .../plan/relational/sql/ast/StopPipe.java | 6 ++- .../relational/sql/ast/StopRepairData.java | 5 +- .../relational/sql/ast/StringLiteral.java | 7 ++- .../sql/ast/SubqueryExpression.java | 8 +++- .../sql/ast/SubscriptionStatement.java | 2 + .../relational/sql/ast/SubsetDefinition.java | 7 ++- .../relational/sql/ast/SymbolReference.java | 8 +++- .../plan/relational/sql/ast/Table.java | 7 ++- .../sql/ast/TableFunctionArgument.java | 8 +++- .../sql/ast/TableFunctionInvocation.java | 7 ++- .../sql/ast/TableFunctionTableArgument.java | 8 +++- .../relational/sql/ast/TableSubquery.java | 7 ++- .../plan/relational/sql/ast/TimeRange.java | 2 + .../plan/relational/sql/ast/Trim.java | 8 +++- .../relational/sql/ast/TypeParameter.java | 7 ++- .../plan/relational/sql/ast/Union.java | 7 ++- .../plan/relational/sql/ast/UnloadModel.java | 7 ++- .../plan/relational/sql/ast/Update.java | 8 +++- .../relational/sql/ast/UpdateAssignment.java | 8 +++- .../plan/relational/sql/ast/Use.java | 7 ++- .../plan/relational/sql/ast/Values.java | 8 +++- .../sql/ast/VariableDefinition.java | 8 +++- .../sql/ast/ViewFieldDefinition.java | 5 +- .../plan/relational/sql/ast/WhenClause.java | 8 +++- .../relational/sql/ast/WindowDefinition.java | 7 ++- .../plan/relational/sql/ast/WindowFrame.java | 7 ++- .../relational/sql/ast/WindowReference.java | 7 ++- .../sql/ast/WindowSpecification.java | 8 +++- .../plan/relational/sql/ast/With.java | 7 ++- .../plan/relational/sql/ast/WithQuery.java | 7 ++- .../relational/sql/ast/WrappedStatement.java | 1 + .../sql/ast/ZeroOrMoreQuantifier.java | 6 ++- .../sql/ast/ZeroOrOneQuantifier.java | 6 ++- .../relational/sql/parser/AstBuilder.java | 4 +- .../plan/relational/sql/parser/SqlParser.java | 4 +- .../relational/sql/rewrite/ShowRewrite.java | 4 +- .../sql/rewrite/StatementRewrite.java | 2 +- .../plan/relational/sql/util/AstUtil.java | 4 +- .../sql/util/ExpressionFormatter.java | 4 +- .../plan/relational/sql/util/QueryUtil.java | 4 +- .../sql/util/RowPatternFormatter.java | 2 +- .../relational/sql/util/SqlFormatter.java | 4 +- .../impl/SchemaRegionMemoryImpl.java | 4 +- ...InsertTabletStatementExceptionVisitor.java | 2 +- ...nedTreeDeviceViewScanOperatorTreeTest.java | 4 +- .../AggregationTableScanTest.java | 2 +- .../node/process/IntoNodeSerdeTest.java | 2 +- .../node/process/WindowNodeSerdeTest.java | 4 +- .../node/source/SourceNodeSerdeTest.java | 2 +- .../relational/analyzer/AnalyzerTest.java | 4 +- .../plan/relational/analyzer/JoinTest.java | 4 +- .../relational/analyzer/TSBSMetadata.java | 2 +- .../relational/analyzer/TestMetadata.java | 2 +- .../relational/analyzer/TestPlanBuilder.java | 4 +- .../plan/relational/analyzer/TestUtils.java | 2 +- .../planner/CorrelatedSubqueryTest.java | 2 +- .../planner/CteMaterializerTest.java | 2 +- .../plan/relational/planner/ExampleTest.java | 2 +- .../PatternRecognitionNodeSerdeTest.java | 3 +- .../planner/PredicateUtilsTest.java | 2 +- .../planner/UncorrelatedSubqueryTest.java | 2 +- .../AggregationDeviceTableScanMatcher.java | 2 +- .../assertions/AggregationFunction.java | 4 +- .../AggregationFunctionMatcher.java | 2 +- .../AggregationFunctionProvider.java | 4 +- .../assertions/AggregationMatcher.java | 2 +- .../planner/assertions/AliasMatcher.java | 2 +- .../planner/assertions/AliasPresent.java | 2 +- .../assertions/AssignUniqueIdMatcher.java | 2 +- .../assertions/BaseStrictSymbolsMatcher.java | 2 +- .../planner/assertions/ColumnReference.java | 2 +- .../planner/assertions/CteScanMatcher.java | 2 +- .../assertions/DeviceTableScanMatcher.java | 2 +- .../assertions/ExchangeNodeMatcher.java | 2 +- .../planner/assertions/ExpressionMatcher.java | 4 +- .../assertions/ExpressionVerifier.java | 4 +- .../planner/assertions/FilterMatcher.java | 2 +- .../planner/assertions/JoinMatcher.java | 2 +- .../planner/assertions/OutputMatcher.java | 4 +- .../planner/assertions/PlanMatchPattern.java | 4 +- .../planner/assertions/PlanTestSymbol.java | 2 +- .../planner/assertions/RvalueMatcher.java | 2 +- .../StrictAssignedSymbolsMatcher.java | 2 +- .../assertions/StrictSymbolsMatcher.java | 2 +- .../planner/assertions/SymbolAlias.java | 2 +- .../planner/assertions/SymbolAliases.java | 4 +- .../TableFunctionProcessorMatcher.java | 2 +- .../planner/assertions/TableScanMatcher.java | 4 +- .../relational/planner/assertions/Util.java | 2 +- .../assertions/WindowFunctionMatcher.java | 2 +- .../TablePredicateConversionTest.java | 4 +- 534 files changed, 1624 insertions(+), 849 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/Symbol.java (94%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Expression.java (62%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IAstVisitor.java rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Node.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/StackableAstVisitor.java (92%) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index c199e7ebb0a8a..3533d425e5567 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; @@ -63,6 +64,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.MatchNumberValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; @@ -157,10 +159,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToTimestampLiteralVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; 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.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Symbol.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Symbol.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Symbol.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Symbol.java index eb90d8183e5a1..aa8a9d30b7c73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Symbol.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Symbol.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner; +package org.apache.iotdb.db.node_commons.plan.relational.planner; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java index a7ebbc90f6025..1506907ceace4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java @@ -22,6 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -30,8 +32,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; 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.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java index 251b242e0a556..94524a16b1940 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java index aac3be39dd4f2..2c6d618c30e4a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java index 6fe7f60af3b11..e972bd841244c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FillNode.java index 15f0c620324ef..fa1460989cd5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FillNode.java @@ -22,9 +22,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.Symbol; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java index 7195e839093df..3c61c991d8704 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java @@ -22,11 +22,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java index bfa59c8acb55c..c54bf62fbda8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java index 58dfa0998b941..47d23bba47683 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java @@ -21,13 +21,13 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.process.TwoChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; 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.NullLiteral; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java index 2149caa66f34f..33f23cfb33e7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java @@ -22,11 +22,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.OrderingScheme; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java index aec04bbacfc35..1b086368454dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java index c179c23677945..e15a22b7c8774 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java index 8655c33243502..27d87b65fee7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.OrderingScheme; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java index 3685ac09b5247..535f98db7c790 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java index 78c39a61c9fc6..94316bae454b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java index e8f3dcb1f34f7..7f1dca12b6707 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; @@ -29,7 +30,6 @@ 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.planner.OrderingScheme; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java index cf15c232d1cd2..5a5be97f9cffa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java index ae2250a80a21f..1adc31aee9e7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java @@ -22,12 +22,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Assignments; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java index 7387f578c2f36..78affaa40c631 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java index 9a6fadc2c9214..5059b21d8f61d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.process.TwoChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java index f0f50147cf733..2fe90f8bd9d5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java @@ -22,11 +22,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.OrderingScheme; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java index b0d070206ae55..e4c70990cf0a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java @@ -22,12 +22,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.TableMetadataImpl; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java index 1617397e12f2b..a8541a921d9f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java @@ -22,12 +22,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.TableMetadataImpl; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java index 81e5227fab148..a1cac72a39e62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java @@ -22,11 +22,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.OrderingScheme; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java index 9c133af4c7db6..246df489e788a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java @@ -22,11 +22,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java index 1519f84add88d..13741eebdb080 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SetOperationNode; import com.google.common.collect.ImmutableListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java index 41b837b3da568..97984a533d5d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java index 8958a0146c67c..dd1ccf0be1f28 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java @@ -22,12 +22,12 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java index 9658567723ce4..8af9a5d71bcce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java @@ -22,14 +22,14 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; 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.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java index 30854d3c05e30..77aef5b1f0e0b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -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.sql.ast.Expression; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ExpressionAndValuePointers.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ExpressionAndValuePointers.java index df454b44bb837..bd46675d0d407 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ExpressionAndValuePointers.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ExpressionAndValuePointers.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; -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.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ScalarValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ScalarValuePointer.java index 8e6cb7e749f7b..f8b7c4538d5c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ScalarValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ScalarValuePointer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java new file mode 100644 index 0000000000000..505fe6cd02b88 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java @@ -0,0 +1,36 @@ +/* + * 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.node_commons.plan.relational.sql.ast; + +import javax.annotation.Nullable; + +public abstract class CommonQueryAstVisitor implements IAstVisitor { + + public R process(Node node) { + return process(node, null); + } + + public R process(Node node, @Nullable C context) { + return node.accept(this, context); + } + + protected R visitNode(Node node, C context) { + return null; + } + + protected R visitExpression(Expression node, C context) { + return visitNode(node, context); + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java similarity index 62% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Expression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java index 9ebe61cdb35e5..a3b6a501065c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Expression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java @@ -17,8 +17,41 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; + +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.util.ExpressionFormatter; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -35,10 +68,14 @@ protected Expression(@Nullable NodeLocation location) { super(location); } - /** Accessible for {@link AstVisitor}, use {@link AstVisitor#process(Node, Object)} instead. */ + /** + * Accessible for {@link org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor}, use + * {@link org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor#process(Node, + * Object)} instead. + */ @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitExpression(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((CommonQueryAstVisitor) visitor).visitExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IAstVisitor.java new file mode 100644 index 0000000000000..64cc95e9f330f --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IAstVisitor.java @@ -0,0 +1,17 @@ +/* + * 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.node_commons.plan.relational.sql.ast; + +public interface IAstVisitor {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Node.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Node.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Node.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Node.java index 1f5a4e645ccfb..0f6cdc149f1c9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Node.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Node.java @@ -17,7 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; + +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; import org.apache.tsfile.utils.Accountable; @@ -34,9 +36,13 @@ protected Node(@Nullable NodeLocation location) { this.location = location; } - /** Accessible for {@link AstVisitor}, use {@link AstVisitor#process(Node, Object)} instead. */ - protected R accept(AstVisitor visitor, C context) { - return visitor.visitNode(this, context); + /** + * Accessible for {@link org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor}, use + * {@link org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor#process(Node, + * Object)} instead. + */ + protected R accept(IAstVisitor visitor, C context) { + return ((CommonQueryAstVisitor) visitor).visitNode(this, context); } public Optional getLocation() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StackableAstVisitor.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StackableAstVisitor.java index 92579dfc51633..14d5c785a7989 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StackableAstVisitor.java @@ -17,7 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; + +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import java.util.LinkedList; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java index d62dcfe9c3810..de848a7c80eee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java @@ -37,6 +37,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionSnapshotEvent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent; @@ -50,7 +51,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeOperateSchemaQueueNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import org.apache.iotdb.db.schemaengine.SchemaEngine; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java index e3047fb56a235..812c174a1f3f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.pipe.source.schemaregion; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateOrUpdateDevice; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; public class PipeTableStatementToPlanVisitor extends AstVisitor { @Override 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 88dd48b8ff7c6..f37fb5b731283 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 @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.common.header; import org.apache.iotdb.commons.schema.column.ColumnHeader; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.primitives.Bytes; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/CopyToOptions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/CopyToOptions.java index 68385784afb2a..51f0189954f11 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/CopyToOptions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/CopyToOptions.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.CopyToTsFileOptions; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.planner.RelationPlan; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java index 2b677c53d2bb1..d09597b5518bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java @@ -22,12 +22,12 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.RelationPlan; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java index 46d87b886be5e..d8712c05c5396 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers.Assignment; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java index 5b77ab661a85e..f0984a25bf053 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; 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.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; 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 index d7162b03be316..76a87c12bc1e1 100644 --- 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 @@ -64,6 +64,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TTableInfo; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; @@ -83,7 +84,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableDiskUsageInformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; 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.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.util.ReservedIdentifiers; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlKeywords; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java index 15b3d8da38fdd..eed3a0160a71a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java @@ -21,6 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.execution.aggregation.VarianceAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.BinaryGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.BlobGroupedApproxMostFrequentAccumulator; @@ -52,7 +53,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java index cf416a184a9ce..56869d22e6206 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java @@ -23,6 +23,8 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; @@ -33,7 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.MultiplicationResolver; import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.SubtractionResolver; 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.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; @@ -48,7 +49,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DecimalLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; 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 9342b3a4674b0..dc387e1e64620 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 @@ -37,6 +37,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryTimeoutRuntimeException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.PreparedStatementInfo; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; @@ -89,7 +90,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExecuteImmediate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExtendRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Flush; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.KillQuery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java index 2e0b0b52fdc09..2329e9a144108 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java @@ -30,13 +30,13 @@ import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.confignode.rpc.thrift.TRegionRouteMapResp; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java index 9b45d2c51fa55..55cfd18f16f48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; @@ -42,7 +43,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.PredicateSimplifier; import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.ReversePredicateVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.filter.basic.Filter; @@ -284,7 +284,7 @@ public static Filter convertPredicateToTimeFilter(Expression predicate) { } public static Filter convertPredicateToTimeFilter( - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression predicate, + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression predicate, ZoneId zoneId, TimeUnit currPrecision) { if (predicate == null) { @@ -312,7 +312,7 @@ public static Filter convertPredicateToFilter( } public static Filter convertPredicateToFilter( - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression predicate, + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression predicate, Map measurementColumnsIndexMap, Map schemaMap, String timeColumnName, @@ -442,7 +442,7 @@ public static boolean predicateCanPushIntoScan(Expression predicate) { } public static boolean predicateCanPushIntoScan( - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression predicate) { + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression predicate) { return new org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate .PredicatePushIntoScanChecker() .process(predicate, null); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java index 4dc2d5a4ae026..69ea9f63cb369 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.utils.TypeUtil; import com.google.common.collect.ImmutableMap; 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 9a622a751c33c..823d7c6f19d7a 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 @@ -45,6 +45,8 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; @@ -172,7 +174,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropSubscription; 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.ExtendRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Flush; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.KillQuery; @@ -181,7 +182,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadModel; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MigrateRegion; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Prepare; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; 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 932d941979223..e1a1c9a6d7bca 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.schema.column.ColumnHeader; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; 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; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; 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 c7a4acfcd59c8..9373eb39cbcb2 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 @@ -41,6 +41,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.ConstantContext; @@ -100,7 +101,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; @@ -5021,7 +5021,7 @@ private Property parseProperty(final IoTDBSqlParser.PropertyContext ctx) { .literalExpression())); } - private org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression parseExpression( + private org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression parseExpression( final IoTDBSqlParser.LiteralExpressionContext context) { if (context.STRING_LITERAL() != null) { return new org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index a392558428e46..f0cf2de1b5251 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -25,7 +25,9 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.TableDateBinTimeRangeIterator; @@ -94,7 +96,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.NonAlignedDeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceSchemaCache; -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.ir.IrUtils; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; @@ -113,7 +114,6 @@ 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.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java index dcdb79bf79e78..900a8b33d879c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.tsfile.read.filter.basic.Filter; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java index d424aa82d09a3..cd61a2f5737a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java @@ -43,7 +43,7 @@ static TimePredicate deserialize(ByteBuffer byteBuffer) { return new TreeModelTimePredicate(Expression.deserialize(byteBuffer)); } else { return new TableModelTimePredicate( - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression.deserialize( + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression.deserialize( byteBuffer)); } } 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 645b23b9db128..37b9af8f13932 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 @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; @@ -86,7 +87,6 @@ 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.DataOrganizationSpecification; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNode.java index f0ab28bc2cb8e..70e23228c7f2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNode.java @@ -23,8 +23,8 @@ import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.tsfile.utils.PublicBAOS; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 597e0ca43a31d..1917821333368 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 @@ -26,10 +26,10 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import java.util.Collections; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java index fa4e2e78d9887..7f3ef49a67f16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java @@ -23,11 +23,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java index 93f7847c5faaf..ed840490e6ada 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; @@ -31,7 +33,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentTime; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; @@ -44,7 +45,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; 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 4a0fe9daa570c..a86ab2e566f49 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 @@ -24,6 +24,9 @@ import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.schema.table.InformationSchema; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; @@ -37,13 +40,11 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.security.Identity; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; @@ -51,7 +52,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; 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 cab532fd2d386..2b24cae6b3be6 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 @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; -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.PipeEnriched; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java index 655909c046088..3a63d8cbd3fb2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import java.util.OptionalInt; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java index e86090e2c06b9..95bb7c3ce24a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -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.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index ee983c843c325..ae17573cae257 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -21,6 +21,10 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StackableAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; @@ -43,7 +47,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; @@ -61,7 +64,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; @@ -77,7 +79,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; @@ -92,7 +93,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StackableAstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java index ce4f8253863f3..f3ece7794c549 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultExpressionTraversalVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -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.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/NodeRef.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/NodeRef.java index 41564a8d6006d..33b99a326e0d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/NodeRef.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/NodeRef.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import static java.lang.System.identityHashCode; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java index 3ee1949c8d232..7967a37ab0c75 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -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.RangeQuantifier; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java index 2e71103eb951b..6a7b7f2296d9e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.Range; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExcludedPattern; -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.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java index 6afa4686cc740..10aab2a88841d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import java.util.Objects; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java index d06529c00506f..e3dba1c98b820 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java index 215022a0bac34..0971d3412405a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -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.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import java.util.Map; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index cff29c0d83a1a..35be3a44f08d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -25,6 +25,9 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -48,7 +51,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.TranslationMap; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AbstractQueryDeviceWithCache; @@ -95,7 +97,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FetchDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; @@ -128,7 +129,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java index 59cf8b43c7c8e..775c4920f5485 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java @@ -21,14 +21,14 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.sql.ast.BetweenPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java index 7368c5d28c2c6..fb99b1c1a67cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; 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.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java index e77f08da5859a..114438097a384 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; 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.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java index 1ecbb5704a281..274f028a50aa4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DecimalLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java index 600a4570e307c..e4696b87c78f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; 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.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java index e3c2c9b0e7cba..86da1373a0b7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; 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.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java index 435d1e4cc0c6d..c0b7cd8280292 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; 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.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java index f356ff79a7b7a..bcfab479cbc8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java @@ -32,10 +32,10 @@ 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.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicateVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; 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.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java index 92cb4d6408d28..e342e418809f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicateVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; 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.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java index c54cc5f1740c2..104ec8bed72f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.tablefunction; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Relation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/ResolvedFunctionCallBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/ResolvedFunctionCallBuilder.java index 37cc3009588b2..49d9366813456 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/ResolvedFunctionCallBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/ResolvedFunctionCallBuilder.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.function; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java index 82ee332361409..99290c93b82f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java @@ -26,13 +26,13 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinWindowFunction; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; import org.apache.iotdb.udf.api.relational.TableFunction; 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 000d9cddf808e..e504edd124eaf 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 @@ -32,6 +32,7 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher; @@ -47,7 +48,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java index c794ab3fba788..6e7727eb2c565 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java @@ -27,13 +27,13 @@ import org.apache.iotdb.commons.schema.filter.impl.singlechild.TagFilter; import org.apache.iotdb.commons.schema.filter.impl.values.PreciseFilter; import org.apache.iotdb.commons.schema.table.TsTable; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema.CheckSchemaPredicateVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema.ConvertSchemaPredicateToFilterVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; 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.LogicalExpression; import org.apache.tsfile.utils.Pair; 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 be8ddca051be4..68a793dab6498 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 @@ -29,6 +29,7 @@ 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.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; @@ -43,7 +44,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceSchemaCache; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceNormalSchema; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AbstractTraverseDevice; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FetchDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java index 04d2635b3dd70..8aac00762bda0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java @@ -19,7 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/DataOrganizationSpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/DataOrganizationSpecification.java index 3aac5faebb503..b9dfe6413d4d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/DataOrganizationSpecification.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/DataOrganizationSpecification.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java index f5ecd7d6eb7d7..1f8d6971396a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java @@ -18,10 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.SubExpressionExtractor; 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.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.utils.DisjointSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java index 3aba471595787..b963857823182 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java @@ -23,11 +23,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java index f792d4b78cda7..85a94f9d98e41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.HashMultiset; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java index ae17e5eab7bf3..23022ce566c3c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; @@ -36,7 +38,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; 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.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java index 442124b9b8d8b..e12695b6dc320 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java @@ -20,6 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; @@ -39,7 +42,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; @@ -52,7 +54,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java index dab0584413f85..a29f502d1231f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java index d43b9baa2a244..2139c8b1e78ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NoOpSymbolResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NoOpSymbolResolver.java index 37c3312c8c3d5..2d662b0dbc1c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NoOpSymbolResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NoOpSymbolResolver.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; + public class NoOpSymbolResolver implements SymbolResolver { public static final NoOpSymbolResolver INSTANCE = new NoOpSymbolResolver(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java index dab6d8209f9d7..d1f065d880230 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingScheme.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingScheme.java index 508408571bc45..d64961d36af8a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingScheme.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingScheme.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java index fa03234fe2b19..d4387de4c92f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java @@ -19,13 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java index 62531541c4e19..4947177be1430 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; 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.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index 87d84b4d51892..9fcb5e5a3fcc9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Aggregation; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -33,6 +34,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -47,7 +50,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; @@ -55,7 +57,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java index 62fcd72c0ee3d..cc8385db4ba0a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.RelationType; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; 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 a3da7a10c0e8c..485c2c230ef3e 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; @@ -40,6 +41,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.RowPatternToIrRewriter; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -91,7 +94,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Except; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRow; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; @@ -104,7 +106,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java index e757a82bed083..30916287aaf38 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.CanonicalizationAware; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.ResolvedField; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import java.util.OptionalInt; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java index 7394aef081fa9..95fdde1a48fa7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java @@ -19,9 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -38,11 +41,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java index 5840017e5c4fd..ce3b490914173 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java @@ -20,9 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Field; -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.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolResolver.java index e8df34b27527c..63e986c74b814 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolResolver.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; + public interface SymbolResolver { Object getValue(Symbol symbol); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java index c08f7fd8f151b..511ced88e6168 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java @@ -19,15 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultExpressionTraversalVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultTraversalVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; 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 b6737e43eb671..0885b156fb4e9 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 @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; 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 78f9729ece341..1c99a379e5357 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 @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.client.IClientManager; import org.apache.iotdb.commons.client.async.AsyncDataNodeInternalServiceClient; import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.QueryStateMachine; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; @@ -42,7 +43,6 @@ 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.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java index 0f831b8168b14..751e68463dbd4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.ResolvedField; @@ -26,7 +28,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; @@ -60,7 +61,7 @@ * boundary. * *

AST and IR expressions use the same class hierarchy ({@link - * org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression}, but differ in the following + * org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression}, but differ in the following * ways: *

  • AST expressions contain Identifiers, while IR expressions contain SymbolReferences *
  • FunctionCalls in AST expressions are SQL function names. In IR expressions, they contain an 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 dc444c1cb416f..ca738fd477e86 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 @@ -35,6 +35,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; @@ -62,6 +63,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -83,7 +85,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -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.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; @@ -105,7 +106,6 @@ 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.relational.sql.ast.CoalesceExpression; -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.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java index 5c4ca45c3e937..86645dd7f1125 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; @@ -34,12 +35,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; -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.CopyToNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; @@ -48,7 +49,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.AbstractTableDeviceQueryNode; 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.sql.ast.Expression; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java index 466e45506db85..354fc97909a4b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; 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; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java index 90061b22ce175..e4462ef7b9736 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionNodeInliner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionNodeInliner.java index e81b4840074a3..80ed9d2d43a61 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionNodeInliner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionNodeInliner.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java index 159655d4255b3..e61f331779476 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java index d84ac593306fa..4de5239984a90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java index dc8a0d916da15..f2ffd66db7cfb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java index c816956a7b063..9ddb9f5d3b9af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; 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.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java index 2ab6cac846e5a..ea78aeab9d9f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; 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.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java index 1d175c514178b..524c705346594 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; 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; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java index f5b3ff49d3102..7c50c1417d39d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.InListExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java index 49d4b7831e7d3..1311c51cb28c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java index 9368956558b62..e65f4e35cadff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/SubExpressionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/SubExpressionExtractor.java index 8f216b6823f3f..22825550b61ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/SubExpressionExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/SubExpressionExtractor.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -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.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import com.google.common.graph.SuccessorsFunction; import com.google.common.graph.Traverser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java index b33f1a4630328..9cbd4886734b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.Symbol; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java index 81d5dc5c7fad1..0e695aa16f231 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java index 977086b0f7ed9..b96d89fcca6dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; @@ -27,7 +28,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; 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; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java index 50fee04510be4..14db0d38cd3a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java index 0c55cca58ec56..9a37d27aca97f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java index c9960774eaaf7..81d29814976b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; 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.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java index 17b7cddba5a90..65be2c23fe7b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; 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; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java index f48d1ae89de7f..a49b5325e8486 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java @@ -21,13 +21,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; 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.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java index 145dd971e16f4..475a7ac170a05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java @@ -22,12 +22,12 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; 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; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java index 700d12d413c82..b3e035cc855ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java @@ -21,13 +21,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; 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.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java index f5902b944893a..8e63ee81518d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java index f6e89ccc5c407..227ca15f7eefa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java index 8927009b4c236..398a5401b8804 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -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.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java index e87e1991a6f05..9a210f2c06a13 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java index ac5a2cf2b5215..81760ef4fa026 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java index 47ab69b95813e..e6137d8c88ff0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.Maps; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java index 171a498b57ce6..428023dc25288 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -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.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java index 11dcaefba17a7..19acbb0744d96 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java index 942c5ba6e6390..e5d7612756937 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java index 746866102d2c0..9b246f2a5196f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java index 783e99ad6df41..503f6fc52c3e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java index d8bffc9c4c752..328ef56c1c430 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java index c8ec3adeea047..83ca9663f5d40 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java index b4f8568819703..665c8ea00fa97 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java index cc210653426ce..269750d37a896 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java index 8059da85a297a..b7db4a87d98e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java index 936ed1f35a2ec..08ca842efb7d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java index 59907a3540701..0ad7d6f98a948 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java index 9fabb9b5b1bf8..2fcda25f33bdf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java index fe553d0c51655..f097b70e9ddaf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -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.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java index a8e5d059c3227..28e2a930c05fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java index 2ed5a68024108..b63f269e04195 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java index 660b70a6c2fef..0c52819164967 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java index daff76b7cc303..3930e6590c639 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java index 10704d99e05ff..f7dcfbca4fd34 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java index 2fb5ba4cb612b..b6b79b8492418 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java index bbc7730259814..178045f4c65e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java index 811904e9d4168..4670118bba3f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java index 3cde522534671..ed72c555d752f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; 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 ffce0b6693e9d..f37b04d6c7604 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,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java index e4b4fe57a1ef7..ba8920284e6d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java index 4904df33022e8..0593953905fa5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java index 1b4c4f3c3b66b..0bfa98190cb13 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java index 4405ee3c3d4c6..81d5ac8b8f915 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java index 020f037adfffb..d0b322b4569cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; 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.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java index 211750fe639b9..434963b04bde6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; 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.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java index 9f53c9f065d2b..32cf9da774740 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java @@ -20,8 +20,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java index a221025569f84..9867255fe5856 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java index 07f5fa01e13af..c7a834135ffd4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java index 598a5d648bdf5..007b5d0f80f62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combinePredicates; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java index 95062b05777f5..9fa6c3defd393 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java index 54326e8963a64..a65f960ee7776 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java index 826b810dad842..ef60cc51354b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java index fb4aab42b268f..00f6c2ee77bb0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java index 541bda4ac50bd..307ff1bd3e2c9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java index 904eb09cd7638..e00397fa5cd95 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java @@ -19,11 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; @@ -36,11 +38,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -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.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java index 5d5cc8e5417de..54daf63446507 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java index db247ccb59eb4..3eead9da7f368 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter; @@ -28,7 +29,6 @@ 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.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java index 130972ea1e401..25bc4b28b2c5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java index 778a57bd12062..681bb47bf11cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java index 8b992a8c7d7f4..871aabe1f487f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java index b5c4326c5a6a2..6cb109521be75 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java index c746e86f66d04..84b61a71723f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java index 2a02febf0525e..7d301c13d338f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java index 3ce8d32f0d2e9..6ac7a7b6c865b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java index f47dcc024e65f..6ed2d80317c78 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index ea45a1f4a3a57..81d92ec108396 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -27,7 +28,6 @@ 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.Assignments; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java index 377e9543c7574..fc30dee8cf10e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java index 5f7229abcc257..14e89534f2686 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java index 223bb08e24b06..5e7d402bfcc26 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java index f4e2719a089b4..231825c0eb97a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java index 1cf3ad7da2144..5b370ae8dfe5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java @@ -18,16 +18,16 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; 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.SymbolsExtractor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; 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 b024aa7bc44cb..ec2e363996a9c 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 @@ -22,8 +22,10 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.function.BoundSignature; @@ -32,8 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; 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.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java index 936f7dc912551..d63e8930a2c2d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java @@ -21,15 +21,15 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.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.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java index daf2b49a19bb6..cf0a8a61bb7bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java @@ -21,15 +21,15 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.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.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java index 36605c54eb272..b8b88ebcfcbd3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; 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.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java index 3525f4fe5b8fc..bb1d07676b848 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java @@ -22,11 +22,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; 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.Symbol; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java index e669484a64f07..38906dadf1441 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java @@ -21,13 +21,13 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; 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.planner.plan.node.process.TwoChildProcessNode; -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.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java index ac56389b3b2fe..2ce5d3243a6e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java @@ -24,11 +24,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; 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.planner.plan.node.source.SourceNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.utils.cte.CteDataStore; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java index 3478c2d089dff..40c2a0476246c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java @@ -21,14 +21,14 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.AlignedDeviceEntry; 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.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 org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java index c5db4f3ede539..4ef0d79d9292f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.Symbol; import com.google.common.collect.ListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java index bce1021da9058..d149d2e3bcf16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java @@ -23,11 +23,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java index 80ab4f2a68e90..eb44f6c9f2a71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java @@ -22,9 +22,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.Symbol; import java.io.DataOutputStream; import java.io.IOException; 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 index 45e3cc534bb27..6b6810e0d9e58 100644 --- 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 @@ -21,13 +21,13 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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 java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java index 0a400e2b0901c..9e371fe6b1916 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.Symbol; import com.google.common.collect.ListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java index 8644a871d8d71..1483f9c6d8b1f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java @@ -22,11 +22,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java index 8307b75cd0618..4cbc0398f7397 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java @@ -21,15 +21,15 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.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.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java index 8b7006d40f6cc..4e0a315004b1f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; @@ -43,10 +44,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Property; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java index c0e9ad101d3d9..555a3a4c7f262 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.base.Function; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java index 340787f0a19fa..2c7cdb659ad35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java @@ -21,12 +21,12 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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; 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 e4de5df8da090..75be499fc459d 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 @@ -23,6 +23,8 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.PlanVisitor; @@ -30,8 +32,6 @@ 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.metadata.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java index 5dd0ee9e66214..66a7dcf686dd5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java @@ -21,13 +21,13 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.DeviceEntry; 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 java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java index 6ea1da9f2c0c8..a71d02c5b6856 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java @@ -21,12 +21,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.DeviceEntry; 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 org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java index d938cea022f3a..23f621fe7ee63 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java @@ -21,13 +21,13 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.DeviceEntry; 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 java.io.DataOutputStream; 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 129b46fd3b895..1b1140e467f58 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 @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TableDeviceSourceNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.schemaengine.schemaregion.attribute.update.DeviceAttributeCacheUpdater; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 a079d00a29256..a11ba8b3115a3 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 @@ -24,14 +24,14 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; -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.relational.sql.ast.UpdateAssignment; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; 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 4859bc5f86c50..e2bdc0a505e33 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 @@ -24,10 +24,10 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.sql.ast.Expression; import java.nio.ByteBuffer; import java.util.Collections; 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 d34b24459914f..51353cdb758ac 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 @@ -24,10 +24,10 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.sql.ast.Expression; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java index eab54f6251ca0..8ae53a204a30e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java index ef4e210272b3f..23c7b56996f46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.EqualityInference; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java index 08b3a5ce14f5d..bbe58496dfcd2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; 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.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java index d77fdd03016cc..bb889d7b33bd0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java @@ -21,23 +21,23 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -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.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; 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.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeCoercion; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; 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 d246d4fd59564..f9d2a2c7dfde7 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 @@ -20,18 +20,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.QueryId; 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.PlanVisitor; 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.SymbolAllocator; 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.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; 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 396da1e0b5095..986216ee6a988 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; @@ -34,17 +35,16 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.analyzer.Analysis; 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.CteScanNode; 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 org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import java.util.HashSet; import java.util.Map; 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 1708bd9e016c4..228797713571b 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 @@ -26,6 +26,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -34,6 +35,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; @@ -57,7 +60,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -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.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ReplaceSymbolInExpression; @@ -66,10 +68,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; 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; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; 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 eba43ad7a3151..893a1a4fed93a 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; @@ -29,7 +30,6 @@ 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 java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java index b28543ca2c041..319da2354bdcb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; @@ -35,16 +36,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.MatchNumberValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -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.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; 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 d4213a2b7acd7..ded0a303b20f8 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; 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.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java index 47bdf10a013ba..7deaafa41eeaf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java @@ -19,16 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.QueryId; 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.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.SimplePlanRewriter; -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.IrUtils; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; @@ -36,7 +37,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; 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.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; 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 11c35c12bbf47..ab55b77dccd8f 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; 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.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; 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 7f2db2b0f987f..c0fc037faa572 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; @@ -44,6 +45,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.metadata.ColumnSchema; @@ -52,7 +54,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.NodeAndMappings; 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.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; @@ -66,7 +67,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java index 8f2496d3e2ba1..58d4bd8e0af23 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -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.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java index d727acdc35e2b..cb024ad5fae75 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultTraversalVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; 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 6dd24a1bb3b7c..f2413d61a53af 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 @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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/AbstractTraverseDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractTraverseDevice.java index fa3f8cbcbd61e..07f4087168681 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 @@ -22,6 +22,8 @@ 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.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; 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/AddColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java index 6f271c042ffc9..cea01ddb3ac89 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Collections; @@ -76,8 +79,8 @@ public boolean isView() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitAddColumn(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitAddColumn(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java index ce9eff075b765..63548179d133a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -64,8 +67,8 @@ public List getColumnNames() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitAliasedRelation(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitAliasedRelation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllColumns.java index fd32acce6c7db..0921ea84fd18c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllColumns.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -78,8 +82,8 @@ public Optional getTarget() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitAllColumns(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitAllColumns(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllRows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllRows.java index f8cc6454c5b2a..31b268b30a4ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllRows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllRows.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -40,8 +44,8 @@ public AllRows(@Nonnull NodeLocation location) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitAllRows(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitAllRows(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java index a3e354d592e59..e6e4ac0228870 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import javax.annotation.Nullable; @@ -93,8 +96,8 @@ public String toString() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitAlterColumnDataType(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitAlterColumnDataType(this, context); } public QualifiedName getTableName() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java index 81537c3e0906b..bdf26bbd53202 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; import org.apache.tsfile.utils.RamUsageEstimator; @@ -45,8 +46,8 @@ public DatabaseSchemaStatement.DatabaseSchemaStatementType getType() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitAlterDB(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitAlterDB(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java index 5e47764bd12d1..237a855ff4e58 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Map; @@ -92,8 +94,8 @@ public boolean isReplaceAllConnectorAttributes() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitAlterPipe(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitAlterPipe(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java index 9063ed7e0ee68..be86cafb29dad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -49,8 +52,8 @@ public Type getType() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitAnchorPattern(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitAnchorPattern(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticBinaryExpression.java index 69fb130b705a6..39b30fc533a7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticBinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticBinaryExpression.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -106,8 +110,8 @@ public Expression getRight() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitArithmeticBinary(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitArithmeticBinary(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticUnaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticUnaryExpression.java index 4b3e0f9a77fa9..a15d689b65e48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticUnaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticUnaryExpression.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -110,8 +114,8 @@ public Sign getSign() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitArithmeticUnary(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitArithmeticUnary(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java index 16d48a41a6289..57ca7b5f2d5cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java index 65f4aa413f9ea..a874a9f22f81f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.Accountable; import org.apache.tsfile.utils.RamUsageEstimator; 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 0d06b7793c13a..96ce4aa008e1e 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 @@ -20,26 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import javax.annotation.Nullable; - -public abstract class AstVisitor { - - public R process(Node node) { - return process(node, null); - } - - public R process(Node node, @Nullable C context) { - return node.accept(this, context); - } - - protected R visitNode(Node node, C context) { - return null; - } - - protected R visitExpression(Expression node, C context) { - return visitNode(node, context); - } +public abstract class AstVisitor extends CommonQueryAstVisitor { protected R visitCurrentTime(CurrentTime node, C context) { return visitExpression(node, context); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BetweenPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BetweenPredicate.java index a421e65630d6f..d0224d4cb448d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BetweenPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BetweenPredicate.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -77,8 +81,8 @@ public Expression getMax() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitBetweenPredicate(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitBetweenPredicate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BinaryLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BinaryLiteral.java index d5baa741c7bef..1598d53d4f9b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BinaryLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BinaryLiteral.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; import com.google.common.base.CharMatcher; @@ -88,8 +90,8 @@ public byte[] getValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitBinaryLiteral(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitBinaryLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BooleanLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BooleanLiteral.java index 42f62559a7286..b2587075b1c25 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BooleanLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BooleanLiteral.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -64,8 +67,8 @@ public boolean getValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitBooleanLiteral(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitBooleanLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Cast.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Cast.java index 1b240db6d865b..fa6205b8ac43e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Cast.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Cast.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -100,8 +104,8 @@ public boolean isTypeOnly() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitCast(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitCast(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java index f661a3f114cdf..18ac8abb805b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.schema.cache.CacheClearOptions; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -52,8 +54,8 @@ public Set getOptions() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitClearCache(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitClearCache(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CoalesceExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CoalesceExpression.java index 05fccd1c01cda..58e7aa0fd127d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CoalesceExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CoalesceExpression.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -67,8 +71,8 @@ public List getOperands() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitCoalesceExpression(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitCoalesceExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java index d3e638c098d40..10abd82cd0b71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -94,8 +96,8 @@ public Optional getCharsetName() { } @Override - public R accept(final AstVisitor visitor, C context) { - return visitor.visitColumnDefinition(this, context); + public R accept(final IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitColumnDefinition(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Columns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Columns.java index 6fc00368fe3ef..53b3586ed5a6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Columns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Columns.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -50,8 +54,8 @@ public boolean isColumnsAsterisk() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitColumns(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitColumns(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ComparisonExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ComparisonExpression.java index 7935435407849..5bd0ab893dc6e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ComparisonExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ComparisonExpression.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -141,8 +145,8 @@ public Expression getRight() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitComparisonExpression(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitComparisonExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java index 676ec2e1edfc8..a407389f470c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import com.google.common.collect.ImmutableList; @@ -64,8 +66,8 @@ public CopyToOptions getOptions() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitCopyTo(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitCopyTo(this, context); } @Override 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 e288cd398721e..74c6487ef5e0d 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 @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.schema.column.ColumnHeader; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; @@ -60,8 +62,8 @@ public TsBlock getTsBlock(final Analysis analysis) { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitCountDevice(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitCountDevice(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java index 04193f4edbc9a..ac7dd7d168858 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -52,8 +56,8 @@ public Optional getWhere() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitCountStatement(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitCountStatement(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java index 1f22500c3e595..38ef0510912c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; import org.apache.tsfile.utils.RamUsageEstimator; @@ -46,8 +47,8 @@ public DatabaseSchemaStatement.DatabaseSchemaStatementType getType() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitCreateDB(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitCreateDB(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java index 36674368e9fd2..983ee8d477996 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -51,8 +54,8 @@ public String getClassName() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitCreateExternalService(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitCreateExternalService(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java index e7cafdca1395b..eb811feb4a6fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -68,8 +71,8 @@ public Optional getUriString() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitCreateFunction(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitCreateFunction(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java index cd21eed2406f9..b36c9354c2c6c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -74,8 +77,8 @@ public List getColumnList() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitCreateIndex(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitCreateIndex(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java index ff2b5ccb42977..f082461d9c855 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.List; @@ -46,8 +49,8 @@ public String getUri() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitCreateModel(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitCreateModel(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java index b597d6fd6aa29..2599770de94c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import javax.annotation.Nonnull; @@ -84,8 +87,8 @@ public List getAttributeValueList() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitCreateOrUpdateDevice(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitCreateOrUpdateDevice(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java index 269978e87bde0..af88f3d0728f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Map; @@ -73,8 +75,8 @@ public Map getSinkAttributes() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitCreatePipe(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitCreatePipe(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java index 5e2666aa15f85..dd7e8966a873c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Objects; @@ -63,8 +65,8 @@ public String getUriString() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitCreatePipePlugin(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitCreatePipePlugin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java index 03342885baa97..144dbaf046ad0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -87,8 +90,8 @@ public String getComment() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitCreateTable(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitCreateTable(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java index 64ea19f4051f7..43c4d2ac93eb3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Map; @@ -57,8 +59,8 @@ public Map getTopicAttributes() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitCreateTopic(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitCreateTopic(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java index 2b786f4303c25..0b6021778f762 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.List; @@ -42,8 +45,8 @@ public CreateTraining(String modelId, String targetSql) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitCreateTraining(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitCreateTraining(this, context); } public void setParameters(Map parameters) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java index 026da0c710d64..26b2ecabf92a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.tsfile.utils.RamUsageEstimator; @@ -68,8 +69,8 @@ public boolean isRestrict() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitCreateView(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitCreateView(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentDatabase.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentDatabase.java index e22baecca7f7c..e8df6f6c383de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentDatabase.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentDatabase.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -47,8 +51,8 @@ public List getChildren() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitCurrentDatabase(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitCurrentDatabase(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentTime.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentTime.java index 75223204013db..4de44aa80fd89 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentTime.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentTime.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -79,8 +83,8 @@ public Optional getPrecision() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitCurrentTime(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitCurrentTime(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentUser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentUser.java index 4849649d19e33..4769b0ec4fae2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentUser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentUser.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -47,8 +51,8 @@ public List getChildren() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitCurrentUser(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitCurrentUser(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataType.java index c0e3421efcb50..f8db6b451b7df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataType.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; + import javax.annotation.Nullable; public abstract class DataType extends Expression { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataTypeParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataTypeParameter.java index 8ed48ae30157c..89429a6ce6eed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataTypeParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataTypeParameter.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import javax.annotation.Nullable; public abstract class DataTypeParameter extends Node { @@ -28,7 +31,7 @@ protected DataTypeParameter(@Nullable NodeLocation location) { } @Override - protected R accept(AstVisitor visitor, C context) { - return visitor.visitDataTypeParameter(this, context); + protected R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitDataTypeParameter(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java index 960c2f7effe78..f9a27466044f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java index 2a977ae25df67..273876b4519e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -50,8 +53,8 @@ public Identifier getStatementName() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitDeallocate(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitDeallocate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DecimalLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DecimalLiteral.java index 1676e88070574..c625a5915ab2f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DecimalLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DecimalLiteral.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -54,8 +57,8 @@ public String getValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitDecimalLiteral(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitDecimalLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java index b23284ec477ce..468dbbff8d0ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + public abstract class DefaultTraversalVisitor extends AstVisitor { @Override protected Void visitExtract(Extract node, C context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java index 33cecba112215..5ab8264e28898 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java @@ -20,6 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.storageengine.dataregion.modification.TableDeletionEntry; import com.google.common.collect.ImmutableList; @@ -73,8 +76,8 @@ public Optional getWhere() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitDelete(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitDelete(this, context); } @Override 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 b5c319ebb2a44..30bdb1c177de2 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 @@ -24,6 +24,9 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceBlackListConstructor; @@ -35,7 +38,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; 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.planner.Symbol; 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; @@ -245,8 +247,8 @@ public static DeviceBlackListConstructor constructDevicePredicateUpdater( } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitDeleteDevice(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitDeleteDevice(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DereferenceExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DereferenceExpression.java index 76e86948e8e31..9a039d333c246 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DereferenceExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DereferenceExpression.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -63,8 +67,8 @@ public DereferenceExpression(NodeLocation location, Identifier field) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitDereferenceExpression(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitDereferenceExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java index bdb01fb9ff75f..488e74e5e4056 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -65,8 +68,8 @@ public Boolean getShowCreateView() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitDescribeTable(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitDescribeTable(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DoubleLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DoubleLiteral.java index 44c732e66f0e6..d82e828b7dd09 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DoubleLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DoubleLiteral.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -55,8 +58,8 @@ public double getValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitDoubleLiteral(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitDoubleLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java index cc95814ee0e30..4b1efff6cf8fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -75,8 +78,8 @@ public boolean isView() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitDropColumn(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitDropColumn(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java index 8f1ea9b191654..a5211c3ce3d1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -50,8 +53,8 @@ public boolean isExists() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitDropDB(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitDropDB(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java index 602554fa16bd9..aa6afb0d2e740 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -50,8 +53,8 @@ public boolean isForcedly() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitDropExternalService(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitDropExternalService(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java index 58c37c8db2a6c..0367aef3a3c70 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -44,8 +47,8 @@ public String getUdfName() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitDropFunction(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitDropFunction(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java index e19308d4259e7..b736ca40a6e56 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -57,8 +60,8 @@ public Identifier getIndexName() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitDropIndex(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitDropIndex(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java index cea9eee32820c..7490a195700c2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.List; @@ -40,8 +43,8 @@ public String getModelId() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitDropModel(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitDropModel(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java index f2ce39bc0fbe4..2ed092f7055e0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Objects; @@ -46,8 +48,8 @@ public boolean hasIfExistsCondition() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitDropPipe(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitDropPipe(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java index 368fb9b63c623..14d4e8b61f3a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Objects; @@ -47,8 +49,8 @@ public boolean hasIfExistsCondition() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitDropPipePlugin(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitDropPipePlugin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java index 940e6cd8e600d..338e401692504 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Objects; @@ -47,8 +49,8 @@ public boolean hasIfExistsCondition() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitDropSubscription(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitDropSubscription(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java index 4b7e8f31f7db1..0177554024f32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -61,8 +64,8 @@ public boolean isView() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitDropTable(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitDropTable(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java index 28b21ecf55837..b714e40202239 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Objects; @@ -47,8 +49,8 @@ public boolean hasIfExistsCondition() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitDropTopic(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitDropTopic(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java index 20485df6cf595..7bd0c3aff910a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -35,8 +38,8 @@ public EmptyPattern(NodeLocation location) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitEmptyPattern(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitEmptyPattern(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java index 1d300134651a2..9578925524573 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -57,8 +60,8 @@ public Relation getRight() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitExcept(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitExcept(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java index 066961a98b79c..5ca07c3cdfba1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -44,8 +47,8 @@ public RowPattern getPattern() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitExcludedPattern(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitExcludedPattern(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java index 7ae15183dab95..abdc77d60d0ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -59,8 +62,8 @@ public List getParameters() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitExecute(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitExecute(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java index 342d018f63144..24a076e852cca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -67,8 +70,8 @@ public List getParameters() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitExecuteImmediate(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitExecuteImmediate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExistsPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExistsPredicate.java index c87b704761c21..bc11727f67441 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExistsPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExistsPredicate.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -50,8 +54,8 @@ public Expression getSubquery() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitExists(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitExists(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java index f3a50175269e8..0950ea4720256 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -49,8 +52,8 @@ public Statement getStatement() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitExplain(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitExplain(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java index cd3df879fc55e..9440c60231c33 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -57,8 +60,8 @@ public boolean isVerbose() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitExplainAnalyze(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitExplainAnalyze(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java index 21bc09daf3dba..418badeeb66bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -66,8 +69,8 @@ public String toString() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitExtendRegion(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitExtendRegion(this, context); } public List getRegionIds() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Extract.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Extract.java index 3c85af1f4b695..84368bef86a45 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Extract.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Extract.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.Immutable; import org.apache.tsfile.utils.RamUsageEstimator; @@ -104,8 +108,8 @@ public Field getField() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitExtract(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitExtract(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java index 12d5d43ec3c26..588530279f892 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.utils.RamUsageEstimator; @@ -69,8 +72,8 @@ public List getPartitionKeyList() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitFetchDevice(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitFetchDevice(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FieldReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FieldReference.java index 26ce73eeb8ed4..4c26bce5a410f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FieldReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FieldReference.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -45,8 +49,8 @@ public int getFieldIndex() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitFieldReference(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitFieldReference(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java index 71c0e75e5c656..3ca319a7d1dbc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; import com.google.common.base.MoreObjects; @@ -106,8 +108,8 @@ public Optional> getFillGroupingElements() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitFill(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FloatLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FloatLiteral.java index 1611eef84e2a8..55702bc0e0073 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FloatLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FloatLiteral.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -57,8 +59,8 @@ public float getValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitFloatLiteral(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitFloatLiteral(this, context); } @SuppressWarnings("UnaryPlus") diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Flush.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Flush.java index a005a121c6a70..95f4f12bbe426 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Flush.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Flush.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; @@ -29,7 +30,7 @@ public Flush(final Statement innerTreeStatement, final MPPQueryContext context) } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitFlush(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitFlush(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FrameBound.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FrameBound.java index 2d901545b6113..d8e46b8b52abc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FrameBound.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FrameBound.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -67,8 +71,8 @@ public Optional getValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitFrameBound(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitFrameBound(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FunctionCall.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FunctionCall.java index 9119b68913ac6..ef741c30e7a95 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FunctionCall.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FunctionCall.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -169,8 +173,8 @@ public Optional getNullTreatment() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitFunctionCall(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitFunctionCall(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericDataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericDataType.java index ebc5b7880cd3a..98ae8dc16d227 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericDataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericDataType.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -68,8 +71,8 @@ public List getChildren() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitGenericDataType(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitGenericDataType(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericLiteral.java index 8a78fd4059c04..0bb7ec84b24db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericLiteral.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.tsfile.utils.Binary; @@ -79,8 +81,8 @@ public String getValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitGenericLiteral(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitGenericLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupBy.java index 00d201648ca8f..5507393828e3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupBy.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -57,8 +60,8 @@ public List getGroupingElements() { } @Override - protected R accept(AstVisitor visitor, C context) { - return visitor.visitGroupBy(this, context); + protected R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitGroupBy(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingElement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingElement.java index 17f1e9cc916bc..623e29e0cbc62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingElement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingElement.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import java.util.List; public abstract class GroupingElement extends Node { @@ -30,7 +34,7 @@ protected GroupingElement(NodeLocation location) { public abstract List getExpressions(); @Override - protected R accept(AstVisitor visitor, C context) { - return visitor.visitGroupingElement(this, context); + protected R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitGroupingElement(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingSets.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingSets.java index 8060e14a2c670..5f3f8a5ad830d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingSets.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingSets.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -74,8 +78,8 @@ public List getExpressions() { } @Override - protected R accept(AstVisitor visitor, C context) { - return visitor.visitGroupingSets(this, context); + protected R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitGroupingSets(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Identifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Identifier.java index d881a6998fcac..62eb91e0e180b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Identifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Identifier.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.base.CharMatcher; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; @@ -107,8 +111,8 @@ public String getCanonicalValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitIdentifier(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitIdentifier(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IfExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IfExpression.java index 4a6f41d4d2ab0..445a34755d249 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IfExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IfExpression.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -70,8 +74,8 @@ public Optional getFalseValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitIfExpression(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitIfExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InListExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InListExpression.java index fb8f8752a14ba..d9f6c46f2738b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InListExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InListExpression.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -81,8 +85,8 @@ public List getValues() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitInListExpression(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitInListExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InPredicate.java index 464e9af4d6f18..3cd4b6df98fea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InPredicate.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -59,8 +63,8 @@ public Expression getValueList() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitInPredicate(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitInPredicate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java index 6a499e958129c..a30bc09f81943 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.LongType; @@ -78,8 +80,8 @@ public Query getQuery() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitInsert(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitInsert(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java index 70b2e06236506..be35cefa5f092 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaValidator; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; @@ -38,8 +39,8 @@ public InsertRow(InsertRowStatement insertRowStatement, MPPQueryContext context) } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitInsertRow(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitInsertRow(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java index d35e68efcf52c..9e88af2cc93f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeUtils; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ITableDeviceSchemaValidation; @@ -47,8 +48,8 @@ public InsertRows(InsertRowsStatement insertRowsStatement, MPPQueryContext conte } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitInsertRows(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitInsertRows(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java index 8c1bccf28aba9..4834c97ba9416 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaValidator; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; @@ -43,8 +44,8 @@ public InsertTablet(InsertTabletStatement insertTabletStatement, MPPQueryContext } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitInsertTablet(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitInsertTablet(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java index a64bcbdaec5df..aea85876dc531 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -50,8 +53,8 @@ public List getRelations() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitIntersect(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitIntersect(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNotNullPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNotNullPredicate.java index 4db717ce69217..6eba9b749d5e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNotNullPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNotNullPredicate.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -67,8 +71,8 @@ public Expression getValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitIsNotNullPredicate(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitIsNotNullPredicate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNullPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNullPredicate.java index 0d297ebac8ec8..fe15a9663a828 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNullPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNullPredicate.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -67,8 +71,8 @@ public Expression getValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitIsNullPredicate(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitIsNullPredicate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java index 7d2043c78969f..4f708e59c1ac4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -111,8 +114,8 @@ public Optional getCriteria() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitJoin(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinCriteria.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinCriteria.java index da0cdbf312d42..d5f103c4553a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinCriteria.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinCriteria.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.Accountable; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java index 12035339eb56a..097353843043f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java index a9a22e4eb2631..021301187a680 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; 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 index 144fe957b867c..d8a3a733b2f91 100644 --- 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 @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -52,8 +55,8 @@ public List getChildren() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitKillQuery(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitKillQuery(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LikePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LikePredicate.java index 6f0490bfc44d4..6f74ba816f032 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LikePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LikePredicate.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -112,8 +116,8 @@ public Optional getEscape() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitLikePredicate(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitLikePredicate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java index b234d1b407491..5043e61a08b30 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -61,8 +65,8 @@ public Expression getRowCount() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitLimit(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitLimit(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Literal.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Literal.java index b60e5a454a78d..db22b2f265a3d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Literal.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Literal.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import javax.annotation.Nullable; @@ -31,8 +35,8 @@ protected Literal(@Nullable NodeLocation location) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitLiteral(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadConfiguration.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadConfiguration.java index b67ed2b3acf98..c22ebb0d11c43 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadConfiguration.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadConfiguration.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; @@ -28,7 +29,7 @@ public LoadConfiguration(Statement innerTreeStatement, MPPQueryContext context) } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitLoadConfiguration(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitLoadConfiguration(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java index 0fe11ebeeec7c..9b54c882b5670 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.List; @@ -47,8 +50,8 @@ public List getDeviceIdList() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitLoadModel(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitLoadModel(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java index 8deb97c2e5af6..52ee8bcd46b01 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java @@ -21,6 +21,8 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.db.storageengine.load.config.LoadTsFileConfigurator; @@ -307,8 +309,8 @@ public List getSubStatements() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitLoadTsFile(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitLoadTsFile(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LogicalExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LogicalExpression.java index de7dc1ad06294..1353729798c68 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LogicalExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LogicalExpression.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -83,8 +87,8 @@ public void setTerms(List terms) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitLogicalExpression(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitLogicalExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java index 930714f1181e3..a98e5e4b20d3d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.tsfile.utils.RamUsageEstimator; @@ -67,8 +69,8 @@ public long getParsedValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitLongLiteral(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitLongLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java index c61b5bd3ba5fc..715b4a3a5ea70 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -50,8 +54,8 @@ public Identifier getName() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitMeasureDefinition(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitMeasureDefinition(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java index e1cb03de65452..bcbc7282726b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -75,8 +78,8 @@ public String toString() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitMigrateRegion(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitMigrateRegion(this, context); } public int getRegionId() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NaturalJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NaturalJoin.java index 9dd25c6cc2c05..8b07b066e2c0c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NaturalJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NaturalJoin.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NotExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NotExpression.java index 617d2b5665878..90e05e2a3f03c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NotExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NotExpression.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -52,8 +56,8 @@ public Expression getValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitNotExpression(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitNotExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullIfExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullIfExpression.java index 96ac85152eb1e..6e8ee92456a0c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullIfExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullIfExpression.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -56,8 +60,8 @@ public Expression getSecond() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitNullIfExpression(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitNullIfExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullLiteral.java index 3dd4cab22b0d1..e8f71957ea1f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullLiteral.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import java.io.DataOutputStream; @@ -41,8 +44,8 @@ public NullLiteral(NodeLocation location) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitNullLiteral(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitNullLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NumericParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NumericParameter.java index c643f2582dd9a..0d51cef4dc02e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NumericParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NumericParameter.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -59,8 +62,8 @@ public List getChildren() { } @Override - protected R accept(AstVisitor visitor, C context) { - return visitor.visitNumericTypeParameter(this, context); + protected R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitNumericTypeParameter(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java index 378eb21119497..90aece43aa8ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -59,8 +63,8 @@ public Expression getRowCount() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitOffset(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitOffset(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java index b91c9016cc835..a4a1eb4d88e98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; public class OneOrMoreQuantifier extends PatternQuantifier { @@ -30,8 +32,8 @@ public OneOrMoreQuantifier(NodeLocation location, boolean greedy) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitOneOrMoreQuantifier(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitOneOrMoreQuantifier(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OrderBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OrderBy.java index c589acae3b965..de602de26e49c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OrderBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OrderBy.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -59,8 +62,8 @@ public List getSortItems() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitOrderBy(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitOrderBy(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java index 9f585304f60a4..06cf81664be0d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -48,8 +52,8 @@ public int getId() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitParameter(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitParameter(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java index 15f6f22d10073..288067cfa8ffa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -46,8 +49,8 @@ public List getPatterns() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitPatternAlternation(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitPatternAlternation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java index 6a43b61cd5653..95677770b9823 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -46,8 +49,8 @@ public List getPatterns() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitPatternConcatenation(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitPatternConcatenation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java index f44727a444e3b..9a14091f47cd6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -46,8 +49,8 @@ public List getPatterns() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitPatternPermutation(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitPatternPermutation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternQuantifier.java index e94249e93087f..fafd85463c6d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternQuantifier.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import java.util.List; @@ -39,8 +42,8 @@ public boolean isGreedy() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitPatternQuantifier(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitPatternQuantifier(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java index 156b5b251e75c..1d457d7943b00 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -106,8 +110,8 @@ public List getVariableDefinitions() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitPatternRecognitionRelation(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitPatternRecognitionRelation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java index 3189f78433a39..ed6fa17275f97 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -44,8 +47,8 @@ public Identifier getName() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitPatternVariable(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitPatternVariable(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java index 2d88c41e3fe34..d97e5d9da3086 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import javax.validation.constraints.NotNull; @@ -39,8 +42,8 @@ public PipeEnriched(final @NotNull Statement innerstatement) { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitPipeEnriched(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitPipeEnriched(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java index 2a7c9279f7e4b..d5826cebb9301 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java index 5b6cdbc431358..e90f36ab43cdf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -57,8 +60,8 @@ public Statement getSql() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitPrepare(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitPrepare(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java index b7b5e8f8870cf..c13ddc184489f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -44,8 +47,8 @@ public Mode getMode() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitProcessingMode(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitProcessingMode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java index 87557737477ef..b99045281df2c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -87,8 +91,8 @@ public Expression getNonDefaultValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitProperty(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitProperty(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QualifiedName.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QualifiedName.java index 32a148f632154..4a29ffb6ad72a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QualifiedName.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QualifiedName.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; + import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java index 18e7f8b7606a5..53133b57b1c0b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -85,8 +89,8 @@ public Expression getSubquery() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitQuantifiedComparisonExpression(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitQuantifiedComparisonExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java index a6e9cb0b2d2f3..0f69f74976b61 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -51,8 +54,8 @@ public PatternQuantifier getPatternQuantifier() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitQuantifiedPattern(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitQuantifiedPattern(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java index 5bed50b17d89b..7acc3411ac352 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.utils.cte.CteDataStore; import com.google.common.collect.ImmutableList; @@ -139,8 +141,8 @@ public CteDataStore getCteDataStore() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitQuery(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitQuery(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QueryBody.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QueryBody.java index 35fefdfbf3294..aa84cca0ed427 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QueryBody.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QueryBody.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import javax.annotation.Nullable; public abstract class QueryBody extends Relation { @@ -28,7 +30,7 @@ protected QueryBody(@Nullable NodeLocation location) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitQueryBody(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitQueryBody(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java index 5de61a2dde2e2..48abe9a2ece5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -126,8 +130,8 @@ public Optional getLimit() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitQuerySpecification(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitQuerySpecification(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java index dc62c47bb0436..6c47bb65ebfc4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -55,8 +58,8 @@ public Optional getAtMost() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitRangeQuantifier(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitRangeQuantifier(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java index 991f78f4bca3f..52e0411f28390 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -65,8 +68,8 @@ public String toString() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitReconstructRegion(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitReconstructRegion(this, context); } public int getDataNodeId() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Relation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Relation.java index 0bb39725468fd..88aef89607dc1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Relation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Relation.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + public abstract class Relation extends Node { protected Relation(NodeLocation location) { @@ -26,7 +29,7 @@ protected Relation(NodeLocation location) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitRelation(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitRelation(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java index 8fbf1339e4126..842002c501a9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java @@ -25,6 +25,8 @@ import org.apache.iotdb.commons.utils.AuthUtils; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.db.auth.AuthorityChecker; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.relational.type.AuthorRType; import org.apache.iotdb.db.utils.DataNodeAuthUtils; @@ -219,8 +221,8 @@ public boolean equals(Object o) { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitRelationalAuthorPlan(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitRelationalAuthorPlan(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java index ad1cff33b440b..2c83f0085be58 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -37,8 +40,8 @@ public RemoveAINode() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitRemoveAINode(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitRemoveAINode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java index d1f31ef53f4cd..4955f4b25798e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -42,8 +45,8 @@ public Integer getNodeId() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitRemoveConfigNode(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitRemoveConfigNode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java index c231541d554ff..8ad2dabe70ad1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -42,8 +45,8 @@ public List getNodeIds() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitRemoveDataNode(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitRemoveDataNode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java index 75e52918b74d9..c108f9e11fdb1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -66,8 +69,8 @@ public String toString() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitRemoveRegion(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitRemoveRegion(this, context); } public List getRegionIds() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java index 5e1277316a439..6faf40006211d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -87,8 +89,8 @@ public boolean isView() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitRenameColumn(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitRenameColumn(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java index 77c3296fee00b..4929e93dcb09b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -73,8 +75,8 @@ public boolean isView() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitRenameTable(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitRenameTable(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Row.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Row.java index 8510abb5b1b3f..ffabf13e31303 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Row.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Row.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -81,8 +85,8 @@ public List getItems() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitRow(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitRow(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RowPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RowPattern.java index af5bf76786017..e21bff8af6dfe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RowPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RowPattern.java @@ -19,13 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + public abstract class RowPattern extends Node { protected RowPattern(NodeLocation location) { super(location); } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitRowPattern(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitRowPattern(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SearchedCaseExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SearchedCaseExpression.java index c6ccd5dc6f493..89ca853e2d384 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SearchedCaseExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SearchedCaseExpression.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.external.commons.lang3.Validate; import org.apache.tsfile.utils.RamUsageEstimator; @@ -96,8 +100,8 @@ public Optional getDefaultValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitSearchedCaseExpression(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitSearchedCaseExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java index db644daa872b4..bb1a6f75f7956 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -56,8 +59,8 @@ public List getSelectItems() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitSelect(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitSelect(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SelectItem.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SelectItem.java index b5faf104287b8..671783a0c55c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SelectItem.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SelectItem.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + public abstract class SelectItem extends Node { protected SelectItem(NodeLocation location) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java index 8feefe9b637f6..f1175a5bbe17f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -76,8 +79,8 @@ public String getComment() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitSetColumnComment(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitSetColumnComment(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetConfiguration.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetConfiguration.java index 040452a511571..2ac9789cbe046 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetConfiguration.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetConfiguration.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; @@ -28,7 +29,7 @@ public SetConfiguration(Statement innerTreeStatement, MPPQueryContext context) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitSetConfiguration(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitSetConfiguration(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java index c470cbf1d9ca8..9402c39a5d908 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import java.util.List; public abstract class SetOperation extends QueryBody { @@ -34,8 +36,8 @@ public boolean isDistinct() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitSetOperation(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitSetOperation(this, context); } public abstract List getRelations(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java index 08289e31eaf53..b8e516371f156 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -75,8 +78,8 @@ public boolean ifExists() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitSetProperties(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitSetProperties(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java index fb0d7b763e323..eff31dc92a9ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.protocol.session.IClientSession; import com.google.common.collect.ImmutableList; @@ -49,8 +51,8 @@ public List getChildren() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitSetSqlDialect(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitSetSqlDialect(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSystemStatus.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSystemStatus.java index c767b67c96f95..2ebdb13cbd83f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSystemStatus.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSystemStatus.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; @@ -28,7 +29,7 @@ public SetSystemStatus(Statement innerTreeStatement, MPPQueryContext context) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitSetSystemStatus(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitSetSystemStatus(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java index ffc5491502790..b060f00be747b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -69,8 +72,8 @@ public boolean isView() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitSetTableComment(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitSetTableComment(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java index b65d716459f4b..8a6f77edce9eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.List; @@ -35,8 +38,8 @@ public ShowAIDevices() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowAIDevices(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowAIDevices(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java index 04fa5089ee653..5c3c73294ca85 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -41,8 +44,8 @@ public ShowAINodes(NodeLocation location) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowAINodes(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowAINodes(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java index e33e0bf8df23b..3742aa54de44c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -36,8 +39,8 @@ public ShowAvailableUrls() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowAvailableUrls(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowAvailableUrls(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java index a12a9eef06aca..ef5f7938ee13f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -61,8 +64,8 @@ public Optional getDetails() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowCluster(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowCluster(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java index a754a0542eab4..08114e0fbbc73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -41,8 +44,8 @@ public List getChildren() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowClusterId(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowClusterId(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java index 7c5bfb12829b4..ea8b28e1db69a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -41,8 +44,8 @@ public ShowConfigNodes(NodeLocation location) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowConfigNodes(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowConfigNodes(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfiguration.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfiguration.java index 2b9a3d7796a49..45a879efb5a63 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfiguration.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfiguration.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; @@ -28,7 +29,7 @@ public ShowConfiguration(Statement innerTreeStatement, MPPQueryContext context) } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowConfiguration(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowConfiguration(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java index 26c09f32c8fee..9d3c79c3e0abc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -41,8 +44,8 @@ public List getChildren() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowCurrentDatabase(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowCurrentDatabase(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java index a9d6af80c4ae9..17780d8d389d4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -41,8 +44,8 @@ public List getChildren() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowCurrentSqlDialect(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowCurrentSqlDialect(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java index 18a7f48dd2735..4cd49e2d3b1d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -41,8 +44,8 @@ public List getChildren() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowCurrentTimestamp(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowCurrentTimestamp(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java index ede46f87a3fd7..a7d77fb18b73e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -41,8 +44,8 @@ public List getChildren() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowCurrentUser(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowCurrentUser(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java index a19c3b9eca025..88cfeab3b431e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -42,8 +45,8 @@ public boolean isDetails() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitShowDB(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitShowDB(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java index b06e326fb9294..502916c33898a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -41,8 +44,8 @@ public ShowDataNodes(NodeLocation location) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowDataNodes(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowDataNodes(this, context); } @Override 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 f83b7df9837c8..c113c042d6d8c 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 @@ -22,6 +22,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; 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; @@ -135,8 +138,8 @@ public TsBlock getTsBlock(final Analysis analysis) { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitShowDevice(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitShowDevice(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java index ca713507e13b0..8c5bf94330a46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import java.util.Optional; public class ShowExternalService extends ShowStatement { @@ -34,7 +38,7 @@ public ShowExternalService( } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowExternalService(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowExternalService(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java index 8dc8311e22d1d..b63b34c24b49f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -40,8 +43,8 @@ public ShowFunctions(NodeLocation location) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowFunctions(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowFunctions(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java index ea2733ce58359..b725425106dfc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -49,8 +52,8 @@ public QualifiedName getTableName() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowIndex(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowIndex(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java index 5b37071ebed40..878c8fd843e1d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.List; @@ -41,8 +44,8 @@ public List getDeviceIdList() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowLoadedModels(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowLoadedModels(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java index 9b5a47fb5fcdd..18795a97985ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -51,8 +54,8 @@ public String getModelId() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowModels(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowModels(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java index 009b89d97dcfe..1d9c456f1261b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; import static com.google.common.base.MoreObjects.toStringHelper; @@ -29,8 +31,8 @@ public class ShowPipePlugins extends PipeStatement { RamUsageEstimator.shallowSizeOfInstance(ShowPipePlugins.class); @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowPipePlugins(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowPipePlugins(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java index 3dd581034e720..1d3ea3fb9061e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; import javax.annotation.Nullable; @@ -49,8 +51,8 @@ public boolean hasWhereClause() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitShowPipes(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitShowPipes(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java index 32a07e58fed9d..ae114d81a8822 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import java.util.Optional; public class ShowQueriesStatement extends ShowStatement { @@ -34,7 +38,7 @@ public ShowQueriesStatement( } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowQueriesStatement(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowQueriesStatement(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java index daca5026f5b71..20bb339b12f5e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -59,8 +61,8 @@ public List getNodeIds() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitShowRegions(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitShowRegions(this, context); } @Override 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 index 670e84c8b1d2d..c027c139996d8 100644 --- 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 @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -76,8 +80,8 @@ public Optional getLimit() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowStatement(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowStatement(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java index cb9456d362922..f22489c374d9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Objects; @@ -41,8 +43,8 @@ public String getTopicName() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitShowSubscriptions(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitShowSubscriptions(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java index 47d94b7c0d88a..b551fcfcd1b82 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -61,8 +64,8 @@ public boolean isDetails() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitShowTables(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitShowTables(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java index c630c1c51bf21..7e75a5509ead1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Objects; @@ -41,8 +43,8 @@ public String getTopicName() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitShowTopics(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitShowTopics(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java index dc0b0e8869e78..25eafbd5d7cf0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -41,8 +44,8 @@ public List getChildren() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowVariables(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowVariables(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java index 75ecf86e449a8..bd8284fff3c6b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -41,8 +44,8 @@ public List getChildren() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitShowVersion(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitShowVersion(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java index e8a4fdad0fe53..6b2e75ab2302a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.external.commons.lang3.Validate; import org.apache.tsfile.utils.RamUsageEstimator; @@ -106,8 +110,8 @@ public Optional getDefaultValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitSimpleCaseExpression(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitSimpleCaseExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleGroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleGroupBy.java index 2827480b86195..6fa8c6a3aa2b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleGroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleGroupBy.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -55,8 +59,8 @@ public List getExpressions() { } @Override - protected R accept(AstVisitor visitor, C context) { - return visitor.visitSimpleGroupBy(this, context); + protected R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitSimpleGroupBy(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java index f9786f9f8b6ed..690ad77c891dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -119,8 +123,8 @@ public String toString() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitSingleColumn(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitSingleColumn(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java index 1894f9f120a4d..fff00a4a40140 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -89,8 +92,8 @@ public Optional getIdentifier() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitSkipTo(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitSkipTo(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SortItem.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SortItem.java index 50fe12b2c5b07..bcdebb0c16fe7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SortItem.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SortItem.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -79,8 +83,8 @@ public NullOrdering getNullOrdering() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitSortItem(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitSortItem(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java index 3c72ecce395e3..f17904168a36d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -44,8 +47,8 @@ public String getServiceName() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitStartExternalService(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitStartExternalService(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java index 01410b7f3b1ce..73a542ec7ff60 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Objects; @@ -41,8 +43,8 @@ public String getPipeName() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitStartPipe(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitStartPipe(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartRepairData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartRepairData.java index 61623f8252331..24f68411fb553 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartRepairData.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartRepairData.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; @@ -28,7 +29,7 @@ public StartRepairData(Statement innerTreeStatement, MPPQueryContext context) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitStartRepairData(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitStartRepairData(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Statement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Statement.java index 6548748f7c159..5d5eac4d28da2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Statement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Statement.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import javax.annotation.Nullable; import java.util.Collections; @@ -32,8 +35,8 @@ protected Statement(final @Nullable NodeLocation location) { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitStatement(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitStatement(this, context); } /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java index 039c2c9b55905..043c6064107d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -44,8 +47,8 @@ public String getServiceName() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitStopExternalService(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitStopExternalService(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java index 5c1fca6cb87da..dc1764f26c75c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Objects; @@ -40,8 +42,8 @@ public String getPipeName() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitStopPipe(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitStopPipe(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopRepairData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopRepairData.java index 92934a97e4ebb..f69e0ceafee48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopRepairData.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopRepairData.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; @@ -28,7 +29,7 @@ public StopRepairData(Statement innerTreeStatement, MPPQueryContext context) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitStopRepairData(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitStopRepairData(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StringLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StringLiteral.java index 981ccd6c1e834..00a760efcfac1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StringLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StringLiteral.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -60,8 +63,8 @@ public int length() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitStringLiteral(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitStringLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubqueryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubqueryExpression.java index 97d2c9bc740e4..4e030899a13f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubqueryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubqueryExpression.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -49,8 +53,8 @@ public Query getQuery() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitSubqueryExpression(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitSubqueryExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java index 077ab4be887b3..f0d6a4689d8e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java index cd4a5adda9d0b..d29f62a6aa24f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.List; @@ -52,8 +55,8 @@ public List getIdentifiers() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitSubsetDefinition(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitSubsetDefinition(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SymbolReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SymbolReference.java index b1b05cfd550f9..a2307aeaa4236 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SymbolReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SymbolReference.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -46,8 +50,8 @@ public String getName() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitSymbolReference(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitSymbolReference(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java index bf397932ffd85..284c946e71c9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -49,8 +52,8 @@ public QualifiedName getName() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitTable(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitTable(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java index b170a0c507ee3..4b6effe38900d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -53,8 +57,8 @@ public Node getValue() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitTableFunctionArgument(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitTableFunctionArgument(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java index 38f362dc9142f..e6cd2ba61e4ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.List; @@ -50,8 +53,8 @@ public List getArguments() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitTableFunctionInvocation(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitTableFunctionInvocation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java index 63bba06daa30e..fd1cb6c5cf754 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -66,8 +70,8 @@ public void updateOrderBy(OrderBy orderBy) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitTableArgument(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitTableArgument(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java index 1036959ea4c78..67f20e355f3ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -50,8 +53,8 @@ public Query getQuery() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitTableSubquery(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitTableSubquery(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java index 9b756b61d048a..0b809d7288c44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Trim.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Trim.java index bebf51629f3da..b0cefe01163ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Trim.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Trim.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -82,8 +86,8 @@ public Optional getTrimCharacter() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitTrim(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitTrim(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TypeParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TypeParameter.java index f691bd2ea5488..1aa2b27afe32c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TypeParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TypeParameter.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -54,8 +57,8 @@ public List getChildren() { } @Override - protected R accept(AstVisitor visitor, C context) { - return visitor.visitTypeParameter(this, context); + protected R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitTypeParameter(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java index cda978b0312c1..b5070ef57dc2c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -50,8 +53,8 @@ public List getRelations() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitUnion(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitUnion(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java index f5bbb2d4989f5..d3dc492a48217 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import org.apache.tsfile.utils.RamUsageEstimator; import java.util.List; @@ -47,8 +50,8 @@ public List getDeviceIdList() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitUnloadModel(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitUnloadModel(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java index 1d4b3a8742efe..7509458b2522a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -63,8 +67,8 @@ public List getChildren() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitUpdate(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitUpdate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java index a1db1cc694075..6d64558e6c820 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -59,8 +63,8 @@ public Expression getValue() { } @Override - public R accept(final AstVisitor visitor, final C context) { - return visitor.visitUpdateAssignment(this, context); + public R accept(final IAstVisitor visitor, final C context) { + return ((AstVisitor) visitor).visitUpdateAssignment(this, context); } public void serialize(final ByteBuffer byteBuffer) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java index 1ada10d2aef93..e1aaac3819435 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -51,8 +54,8 @@ public Identifier getDatabaseId() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitUse(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitUse(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java index 4850571478de1..76963020e646a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -48,8 +52,8 @@ public List getRows() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitValues(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitValues(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java index b965e9154755e..dcf8a8b8a39fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -50,8 +54,8 @@ public Expression getExpression() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitVariableDefinition(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitVariableDefinition(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java index 376a8634f8bf7..8207d461b62c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import javax.annotation.Nullable; @@ -52,8 +53,8 @@ public Identifier getFrom() { return from; } - public R accept(final AstVisitor visitor, C context) { - return visitor.visitViewFieldDefinition(this, context); + public R accept(final IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitViewFieldDefinition(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WhenClause.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WhenClause.java index c46cb716ed6f3..4e5083c28c589 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WhenClause.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WhenClause.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -65,8 +69,8 @@ public Expression getResult() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitWhenClause(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitWhenClause(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java index ada49ae37e8c4..db3b633f35b08 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -50,8 +53,8 @@ public WindowSpecification getWindow() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitWindowDefinition(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitWindowDefinition(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowFrame.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowFrame.java index 9e5ec43b4cb76..b65df3e8c93bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowFrame.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowFrame.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -67,8 +70,8 @@ public Optional getEnd() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitWindowFrame(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitWindowFrame(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowReference.java index 9b797d812fa5a..04ce30ff119be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowReference.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -47,8 +50,8 @@ public Identifier getName() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitWindowReference(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitWindowReference(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java index 44a5779b49fda..fbd11934d3e81 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -73,8 +77,8 @@ public Optional getFrame() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitWindowSpecification(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitWindowSpecification(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java index 3fd654b660753..94993fa11b945 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -65,8 +68,8 @@ public List getQueries() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitWith(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitWith(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java index 3d7fb15e4f79b..17805684e0926 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -97,8 +100,8 @@ public boolean isMaterialized() { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitWithQuery(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitWithQuery(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java index 1e7a8c92baafa..544aabdfc3167 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java index 019906e025824..9e91c2f714e1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; public class ZeroOrMoreQuantifier extends PatternQuantifier { @@ -30,8 +32,8 @@ public ZeroOrMoreQuantifier(NodeLocation location, boolean greedy) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitZeroOrMoreQuantifier(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitZeroOrMoreQuantifier(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java index 791a5dd705f2f..063f70ef624ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; + import org.apache.tsfile.utils.RamUsageEstimator; public class ZeroOrOneQuantifier extends PatternQuantifier { @@ -30,8 +32,8 @@ public ZeroOrOneQuantifier(NodeLocation location, boolean greedy) { } @Override - public R accept(AstVisitor visitor, C context) { - return visitor.visitZeroOrOneQuantifier(this, context); + public R accept(IAstVisitor visitor, C context) { + return ((AstVisitor) visitor).visitZeroOrOneQuantifier(this, context); } @Override 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 5c4811967142a..d503bf421e7ad 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 @@ -34,6 +34,8 @@ import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; @@ -98,7 +100,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExtendRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; @@ -134,7 +135,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MigrateRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java index 377c88dfdb7ae..6eae7b0acf7bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.protocol.session.IClientSession; 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.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlBaseListener; 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 index d0e386e5926dc..1e655508232e6 100644 --- 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 @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; 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; @@ -26,10 +28,8 @@ 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.CountStatement; -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.Identifier; -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; 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 index 66bcd5f4ef1a3..32539fd6d224c 100644 --- 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 @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java index cb17a90c04f3c..568b5ef04b85b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; 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; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java index 2446b9841be5a..a2ed686639853 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; @@ -38,7 +40,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; @@ -58,7 +59,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java index f0bd840453e2e..0e74fecc95852 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java index e9eb828b29415..22fd95a883baf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AnchorPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.EmptyPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OneOrMoreQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternAlternation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternConcatenation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java index 5c259594c8b74..efa209cc6073e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; @@ -46,7 +48,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Except; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; @@ -58,7 +59,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Limit; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; 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 29daa08c8e809..f6ca0d14c7031 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 @@ -43,6 +43,8 @@ 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.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceAttributeUpdater; @@ -57,7 +59,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceSchemaCache; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableId; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.ConstructTableDevicesBlackListNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.DeleteTableDeviceNode; @@ -68,7 +69,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableNodeLocationAddNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java index 495f6ef266285..ebec8cecdbf0b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.exception.auth.AccessDeniedException; import org.apache.iotdb.db.exception.load.LoadRuntimeOutOfMemoryException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.rpc.TSStatusCode; public class LoadTableConvertedInsertTabletStatementExceptionVisitor diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java index d63caff333b35..60b71c6f7516c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java @@ -29,6 +29,8 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -46,12 +48,10 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.NonAlignedDeviceEntry; 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.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; 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.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java index f78cae18f37d5..f9e286cc15770 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.FirstAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.FirstByAccumulator; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastByDescAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastDescAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAccumulator; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java index b9480fe6c2200..4eb502cf3b36c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java @@ -23,13 +23,13 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewIntoNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.IntoNode; 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.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.FloatType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java index b7c6bb3c5ab5f..61d4f28c9d38b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java @@ -22,7 +22,9 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; @@ -34,8 +36,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -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.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java index b5603719c3519..53cf40079c95f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java @@ -24,13 +24,13 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.LastQueryScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowDiskUsageNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowQueriesNode; 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.planner.node.TableDiskUsageInformationSchemaTableScanNode; import org.apache.tsfile.enums.TSDataType; 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 5fd29636d7f95..104ff333ad1f2 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 @@ -32,12 +32,14 @@ import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -60,7 +62,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; -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; @@ -68,7 +69,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; 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; 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 9d083e7ded85c..5e29b5388cc55 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; @@ -29,6 +30,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -44,7 +46,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; -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.assertions.PlanMatchPattern; @@ -52,7 +53,6 @@ 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.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java index 49f23e0358c59..3fdf170f18368 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index 722212b78b78a..42462fd7ed18e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -28,6 +28,7 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; @@ -51,7 +52,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; 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.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; 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 bb1642fd04502..1b61ede335209 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 @@ -20,19 +20,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.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.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import java.util.List; 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 9da0789e54622..5fcccb5c0f7c5 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; @@ -30,7 +31,6 @@ 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.sql.ast.Statement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java index 320a2c9cf5e6a..2bb88f4082046 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java index 74df8302999e8..ee91ef2c106ff 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.schema.column.ColumnHeader; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; 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.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java index f05b7e5e437fc..20627be200235 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -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.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java index 2de79e3f39976..3a8a0f62a04ce 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; @@ -29,12 +30,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.LogicalIndexPointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; -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.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java index 66569e8241728..975fd892bbf89 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -27,7 +28,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.tsfile.utils.Pair; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java index 0c41f6928832e..02828970d7a9f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; 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.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java index af2da6b93fab4..41afbcc64d6e3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java index fbf3d4dd8bde7..31f9e3a879452 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.sql.ast.Expression; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java index f13610286faac..d0298aa6641c3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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.Symbol; import java.util.Map; import java.util.Objects; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java index 2f6dbfb90527d..c7f9f693acbdc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java index 24fcf56003fee..31ed99dd0f047 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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.Symbol; import java.util.Collection; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java index 178a9e1b3e666..3283109c522e7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.metadata.TableSchema; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java index 2b20e165943b5..6ec1a74728ad8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.Symbol; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java index 94331480350c7..5238abfc41d94 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; 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.Symbol; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java index 9ac9f8016848c..5c535a6895f1c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.Symbol; import java.util.Set; import java.util.function.Function; 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 cff4126cde71b..b487632ab44d1 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,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; -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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java index 8db77ad51ae8e..7b91aa1af3ba1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java @@ -21,10 +21,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import java.util.List; 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 index 9998146446be1..c795347c68f85 100644 --- 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 @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java index 52069bf3c8050..93cae8b9bcabc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java index 310c3efb34585..ee11f44f7f2f2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java index bd7fc1adb7555..5b23088a50009 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; @@ -30,7 +32,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DecimalLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java index 6a67644c5ee79..97528c06a8cd1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.sql.ast.Expression; import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkState; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java index 50eaf3eb10545..33ee22ca61c30 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java index ae328ead57b8b..e900b6aea9320 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import com.google.common.collect.ImmutableList; 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 4735f71550a9a..926bf80891f7a 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; @@ -41,12 +42,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; @@ -62,7 +63,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; 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; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanTestSymbol.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanTestSymbol.java index 2973de06e6a12..5fc9b67d90aa6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanTestSymbol.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanTestSymbol.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; public interface PlanTestSymbol { Symbol toSymbol(SymbolAliases aliases); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java index 5dc691db37f23..babf9c0b160ea 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.metadata.TableSchema; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java index cc27d1321aec5..997e000002c01 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.Symbol; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java index f80ecc2f3bf6a..14ed714a09284 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.Symbol; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAlias.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAlias.java index 0e01d178b357c..4bda25a170e52 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAlias.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAlias.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import static java.util.Objects.requireNonNull; 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 536a7b3b355b9..8d7fb9e6a2992 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 @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java index f830a604c48b5..2e288acb9bad9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; 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.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; 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 9d1f3091b27ff..e3787706563cc 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java index 17c26cb4a2145..c81ed2c1b3141 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.assertions.PlanMatchPattern.Ordering; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java index 9a028eb562353..9059b85a7d2d2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; 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.OrderingScheme; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol; import java.util.List; import java.util.Objects; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java index ee00556d30b56..d0f7607417a37 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.predicate; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; 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.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; From bcbd6d64f5a845a3ed749eb90e722cce68461880 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 13 Apr 2026 14:08:55 +0800 Subject: [PATCH 06/45] move ast node --- .../plan/planner/TableOperatorGenerator.java | 4 +-- .../planner/node/ValueFillNode.java | 2 +- .../ExpressionAndValuePointers.java | 2 +- .../sql/ast/ArithmeticBinaryExpression.java | 10 +++--- .../sql/ast/ArithmeticUnaryExpression.java | 10 +++--- .../relational/sql/ast/BetweenPredicate.java | 9 ++--- .../relational/sql/ast/BinaryLiteral.java | 9 ++--- .../relational/sql/ast/BooleanLiteral.java | 8 +++-- .../plan/relational/sql/ast/Cast.java | 11 +++--- .../sql/ast/CommonQueryAstVisitor.java | 36 +++++++++++++++++++ .../plan/relational/sql/ast/Expression.java | 8 ----- .../plan/relational/sql/ast/Extract.java | 10 +++--- .../plan/relational/sql/ast/Literal.java | 8 ++--- .../relational/sql/ast/StringLiteral.java | 9 ++--- .../thrift/impl/ClientRPCServiceImpl.java | 8 ++--- .../rowpattern/expression/Computation.java | 10 +++--- ...formationSchemaContentSupplierFactory.java | 2 +- .../relational/ColumnTransformerBuilder.java | 18 +++++----- .../db/queryengine/plan/Coordinator.java | 2 +- .../plan/analyze/AnalyzeUtils.java | 2 +- .../config/TableConfigTaskVisitor.java | 2 +- .../queryengine/plan/parser/ASTVisitor.java | 2 +- .../analyzer/AggregationAnalyzer.java | 12 +++---- .../plan/relational/analyzer/Analysis.java | 2 +- .../analyzer/ExpressionAnalyzer.java | 16 ++++----- .../analyzer/StatementAnalyzer.java | 14 ++++---- .../ConvertPredicateToFilterVisitor.java | 12 +++---- .../ConvertPredicateToTimeFilterVisitor.java | 4 +-- .../PredicateCombineIntoTableScanChecker.java | 6 ++-- .../PredicatePushIntoMetadataChecker.java | 16 ++++----- .../PredicatePushIntoScanChecker.java | 4 +-- .../analyzer/predicate/PredicateVisitor.java | 2 +- .../schema/CheckSchemaPredicateVisitor.java | 4 +-- ...ConvertSchemaPredicateToFilterVisitor.java | 6 ++-- .../ExtractPredicateColumnNameVisitor.java | 4 +-- .../metadata/fetcher/SchemaPredicateUtil.java | 2 +- .../planner/CastToBlobLiteralVisitor.java | 8 ++--- .../planner/CastToBooleanLiteralVisitor.java | 8 ++--- .../planner/CastToDateLiteralVisitor.java | 8 ++--- .../planner/CastToDoubleLiteralVisitor.java | 8 ++--- .../planner/CastToFloatLiteralVisitor.java | 8 ++--- .../planner/CastToInt32LiteralVisitor.java | 8 ++--- .../planner/CastToInt64LiteralVisitor.java | 8 ++--- .../planner/CastToStringLiteralVisitor.java | 8 ++--- .../CastToTimestampLiteralVisitor.java | 8 ++--- .../planner/IrExpressionInterpreter.java | 18 +++++----- .../relational/planner/IrTypeAnalyzer.java | 16 ++++----- .../relational/planner/LiteralEncoder.java | 8 ++--- .../planner/LiteralInterpreter.java | 8 ++--- .../relational/planner/PredicateUtils.java | 2 +- .../plan/relational/planner/QueryPlanner.java | 4 +-- .../relational/planner/SubqueryPlanner.java | 4 +-- .../planner/ir/DefaultTraversalVisitor.java | 6 ++-- .../planner/ir/ExpressionRewriter.java | 12 +++---- .../planner/ir/ExpressionTreeRewriter.java | 12 +++---- .../GapFillStartAndEndTimeExtractVisitor.java | 2 +- .../ir/GlobalTimePredicateExtractVisitor.java | 8 ++--- .../plan/relational/planner/ir/IrUtils.java | 8 ++--- ...correlatedScalarSubqueryReconstructor.java | 8 ++--- .../rule/CanonicalizeExpressionRewriter.java | 6 ++-- .../iterative/rule/ImplementExceptAll.java | 4 +-- .../rule/PruneCorrelatedJoinColumns.java | 2 +- .../rule/PushDownFilterIntoWindow.java | 2 +- .../iterative/rule/RemoveRedundantExists.java | 4 +-- .../iterative/rule/RemoveTrivialFilters.java | 2 +- .../RemoveUnreferencedScalarSubqueries.java | 2 +- .../rule/SetOperationNodeTranslator.java | 4 +-- ...atedDistinctAggregationWithProjection.java | 2 +- ...dDistinctAggregationWithoutProjection.java | 2 +- ...elatedGlobalAggregationWithProjection.java | 2 +- ...tedGlobalAggregationWithoutProjection.java | 2 +- ...latedGroupedAggregationWithProjection.java | 2 +- ...edGroupedAggregationWithoutProjection.java | 2 +- .../rule/TransformCorrelatedJoinToJoin.java | 2 +- .../TransformCorrelatedScalarSubquery.java | 6 ++-- .../TransformExistsApplyToCorrelatedJoin.java | 6 ++-- ...TransformFilteringSemiJoinToInnerJoin.java | 2 +- .../TransformUncorrelatedSubqueryToJoin.java | 4 +-- .../planner/optimizations/JoinUtils.java | 2 +- .../optimizations/PlanNodeDecorrelator.java | 2 +- .../PushPredicateIntoTableScan.java | 4 +-- ...tifiedComparisonApplyToCorrelatedJoin.java | 8 ++--- .../relational/sql/ParameterExtractor.java | 2 +- .../plan/relational/sql/ast/AsofJoinOn.java | 1 + .../plan/relational/sql/ast/AstVisitor.java | 36 ------------------- .../relational/sql/ast/DecimalLiteral.java | 1 + .../sql/ast/DefaultTraversalVisitor.java | 5 +++ .../relational/sql/ast/DoubleLiteral.java | 1 + .../plan/relational/sql/ast/Execute.java | 1 + .../relational/sql/ast/ExecuteImmediate.java | 2 ++ .../plan/relational/sql/ast/Fill.java | 1 + .../plan/relational/sql/ast/FloatLiteral.java | 1 + .../relational/sql/ast/GenericLiteral.java | 1 + .../plan/relational/sql/ast/LongLiteral.java | 1 + .../plan/relational/sql/ast/NullLiteral.java | 1 + .../relational/sql/parser/AstBuilder.java | 18 +++++----- .../plan/relational/sql/util/AstUtil.java | 4 +-- .../sql/util/ExpressionFormatter.java | 18 +++++----- .../plan/relational/sql/util/QueryUtil.java | 2 +- .../unary/scalar/ExtractTransformer.java | 2 +- .../SchemaRegionSimpleRecoverTest.java | 2 +- .../relational/analyzer/AggregationTest.java | 6 ++-- .../relational/analyzer/AsofJoinTest.java | 2 +- .../plan/relational/analyzer/TSBSTest.java | 6 ++-- .../relational/analyzer/TestMetadata.java | 2 +- .../planner/CorrelatedSubqueryTest.java | 2 +- .../plan/relational/planner/ExampleTest.java | 6 ++-- .../assertions/ExpressionVerifier.java | 12 +++---- .../informationschema/CurrentQueriesTest.java | 2 +- 109 files changed, 349 insertions(+), 337 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/ArithmeticBinaryExpression.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/ArithmeticUnaryExpression.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/BetweenPredicate.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/BinaryLiteral.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/BooleanLiteral.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Cast.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Extract.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Literal.java (78%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/StringLiteral.java (89%) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 3533d425e5567..31f63d3dc3928 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -65,6 +65,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; @@ -161,7 +162,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; @@ -210,6 +210,7 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; import static org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; @@ -227,7 +228,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.DESC_NULLS_LAST; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch.ONE; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition.LAST; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java index 97984a533d5d8..ea8e86b9e1c29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.sql.ast.Literal; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ExpressionAndValuePointers.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ExpressionAndValuePointers.java index bd46675d0d407..832c2ab07b623 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ExpressionAndValuePointers.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ExpressionAndValuePointers.java @@ -35,7 +35,7 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; public class ExpressionAndValuePointers { public static final ExpressionAndValuePointers TRUE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticBinaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java index 39b30fc533a7d..dc0580de7e629 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticBinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -111,7 +111,7 @@ public Expression getRight() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitArithmeticBinary(this, context); + return ((CommonQueryAstVisitor) visitor).visitArithmeticBinary(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticUnaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticUnaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java index a15d689b65e48..5dbc8a43fad4b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ArithmeticUnaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -115,7 +115,7 @@ public Sign getSign() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitArithmeticUnary(this, context); + return ((CommonQueryAstVisitor) visitor).visitArithmeticUnary(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BetweenPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BetweenPredicate.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BetweenPredicate.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BetweenPredicate.java index d0224d4cb448d..aa33bf291c3b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BetweenPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BetweenPredicate.java @@ -17,11 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BinaryLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BinaryLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java index 1598d53d4f9b8..fbbffded74939 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BinaryLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; import com.google.common.base.CharMatcher; @@ -91,7 +92,7 @@ public byte[] getValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitBinaryLiteral(this, context); + return ((CommonQueryAstVisitor) visitor).visitBinaryLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BooleanLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BooleanLiteral.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BooleanLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BooleanLiteral.java index b2587075b1c25..74e7a350b1cb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/BooleanLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BooleanLiteral.java @@ -17,10 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Cast.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Cast.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java index fa6205b8ac43e..a1dd0510d0750 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Cast.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java @@ -17,11 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -105,7 +106,7 @@ public boolean isTypeOnly() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitCast(this, context); + return ((CommonQueryAstVisitor) visitor).visitCast(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java index 505fe6cd02b88..a46eb495fce7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java @@ -33,4 +33,40 @@ protected R visitNode(Node node, C context) { protected R visitExpression(Expression node, C context) { return visitNode(node, context); } + + protected R visitArithmeticBinary(ArithmeticBinaryExpression node, C context) { + return visitExpression(node, context); + } + + protected R visitArithmeticUnary(ArithmeticUnaryExpression node, C context) { + return visitExpression(node, context); + } + + protected R visitBetweenPredicate(BetweenPredicate node, C context) { + return visitExpression(node, context); + } + + protected R visitCast(Cast node, C context) { + return visitExpression(node, context); + } + + protected R visitExtract(Extract node, C context) { + return visitExpression(node, context); + } + + protected R visitBooleanLiteral(BooleanLiteral node, C context) { + return visitLiteral(node, context); + } + + protected R visitLiteral(Literal node, C context) { + return visitExpression(node, context); + } + + protected R visitBinaryLiteral(BinaryLiteral node, C context) { + return visitLiteral(node, context); + } + + protected R visitStringLiteral(StringLiteral node, C context) { + return visitLiteral(node, context); + } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java index a3b6a501065c6..6fec19b8fbf99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java @@ -19,17 +19,10 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DecimalLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; @@ -48,7 +41,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Extract.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Extract.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Extract.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Extract.java index 84368bef86a45..be5f7698d8892 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Extract.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Extract.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.Immutable; @@ -109,7 +109,7 @@ public Field getField() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitExtract(this, context); + return ((CommonQueryAstVisitor) visitor).visitExtract(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Literal.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Literal.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Literal.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Literal.java index db22b2f265a3d..005b9e7ba1caf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Literal.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Literal.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; @@ -36,7 +34,7 @@ protected Literal(@Nullable NodeLocation location) { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitLiteral(this, context); + return ((CommonQueryAstVisitor) visitor).visitLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StringLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StringLiteral.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StringLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StringLiteral.java index 00a760efcfac1..6c68dbe6239ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StringLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StringLiteral.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; @@ -64,7 +65,7 @@ public int length() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitStringLiteral(this, context); + return ((CommonQueryAstVisitor) visitor).visitStringLiteral(this, context); } @Override 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 ee8c2c44e778b..3af7ad5bcdb6d 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 @@ -48,6 +48,10 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.protocol.basic.BasicOpenSessionResp; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; @@ -91,16 +95,12 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; import org.apache.iotdb.db.queryengine.plan.relational.security.TreeAccessCheckContext; import org.apache.iotdb.db.queryengine.plan.relational.sql.ParameterExtractor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Execute; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -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.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetSqlDialect; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java index d8712c05c5396..26c50a2c81427 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java @@ -22,11 +22,12 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers.Assignment; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import java.util.ArrayList; 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 index 76a87c12bc1e1..057c7fd4a1f29 100644 --- 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 @@ -65,6 +65,7 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; @@ -84,7 +85,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableDiskUsageInformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.util.ReservedIdentifiers; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlKeywords; import org.apache.iotdb.db.schemaengine.table.InformationSchemaUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java index 56869d22e6206..c26f5b0dcfac1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java @@ -24,7 +24,16 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; @@ -35,13 +44,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.MultiplicationResolver; import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.SubtractionResolver; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase; @@ -49,7 +52,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DecimalLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; @@ -59,7 +61,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; @@ -67,7 +68,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; 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 dc387e1e64620..1ec9713ce0275 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 @@ -38,6 +38,7 @@ import org.apache.iotdb.db.exception.query.QueryTimeoutRuntimeException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.PreparedStatementInfo; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; @@ -93,7 +94,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExtendRegion; 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.LoadConfiguration; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadModel; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MigrateRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java index 2329e9a144108..3037527a9d2b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java @@ -31,6 +31,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TRegionRouteMapResp; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; import org.apache.iotdb.db.protocol.client.ConfigNodeInfo; @@ -43,7 +44,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TimeRange; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertBaseStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; 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 823d7c6f19d7a..399d05bfc1fb6 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 @@ -46,6 +46,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -177,7 +178,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExtendRegion; 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.LoadConfiguration; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadModel; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; 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 9373eb39cbcb2..6bec90806fc28 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 @@ -5024,7 +5024,7 @@ private Property parseProperty(final IoTDBSqlParser.PropertyContext ctx) { private org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression parseExpression( final IoTDBSqlParser.LiteralExpressionContext context) { if (context.STRING_LITERAL() != null) { - return new org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral( + return new org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral( parseStringLiteral(context.getText())); } else if (context.INTEGER_LITERAL() != null) { return new org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java index ed840490e6ada..1a95230a1be92 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java @@ -20,20 +20,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentTime; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; @@ -43,7 +44,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; 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 a86ab2e566f49..ad46221c18fb7 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 @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; @@ -51,7 +52,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index ae17573cae257..2851d0b7afbc2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -22,9 +22,17 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StackableAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; @@ -48,12 +56,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Columns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; @@ -64,7 +66,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; @@ -93,7 +94,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index 35be3a44f08d8..bdf1fe9598b15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -26,8 +26,15 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -61,12 +68,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Columns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; @@ -97,7 +100,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FetchDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; @@ -123,7 +125,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinUsing; 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; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; @@ -167,7 +168,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StartPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopPipe; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java index 775c4920f5485..b76a9862166fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java @@ -22,14 +22,16 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; @@ -38,14 +40,12 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java index fb99b1c1a67cf..75830324fbdb2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java index 114438097a384..2096705ed2590 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java index 274f028a50aa4..ebd24d6cc37f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java @@ -19,14 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase; @@ -43,7 +45,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; @@ -51,7 +52,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java index e4696b87c78f6..aa71ad39dfbb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java index 86da1373a0b7b..544dbe21cfb76 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java index c0b7cd8280292..4604438ae311b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java index bcfab479cbc8d..2ad3196953110 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java @@ -32,9 +32,11 @@ 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.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicateVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; @@ -42,13 +44,11 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java index e342e418809f7..57470d804a623 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicateVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java index 6e7727eb2c565..2f94a868f67fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java @@ -27,12 +27,12 @@ import org.apache.iotdb.commons.schema.filter.impl.singlechild.TagFilter; import org.apache.iotdb.commons.schema.filter.impl.values.PreciseFilter; import org.apache.iotdb.commons.schema.table.TsTable; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema.CheckSchemaPredicateVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema.ConvertSchemaPredicateToFilterVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBlobLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBlobLiteralVisitor.java index 8b374825068b8..a6b348ce7bea0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBlobLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBlobLiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -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.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBooleanLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBooleanLiteralVisitor.java index f2019f0a2ab57..0786c01570bcb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBooleanLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBooleanLiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -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.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to boolean type public class CastToBooleanLiteralVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDateLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDateLiteralVisitor.java index f1225a1bf3177..ab1a5208bc8df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDateLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDateLiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -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.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.tsfile.utils.DateUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDoubleLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDoubleLiteralVisitor.java index c974ea3a079b0..ed4933d0b8fe6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDoubleLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDoubleLiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -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.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to double type public class CastToDoubleLiteralVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToFloatLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToFloatLiteralVisitor.java index e1a1e384594cb..03ca4cec25a65 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToFloatLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToFloatLiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -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.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to float type public class CastToFloatLiteralVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt32LiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt32LiteralVisitor.java index 822ef83ba4715..291bd6944b240 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt32LiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt32LiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -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.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to INT32 type public class CastToInt32LiteralVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt64LiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt64LiteralVisitor.java index 896d4c868e008..0493effe057b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt64LiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt64LiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -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.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to INT64 type public class CastToInt64LiteralVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToStringLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToStringLiteralVisitor.java index 726d817621a53..ec3c4702c9ffe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToStringLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToStringLiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -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.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.BytesUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToTimestampLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToTimestampLiteralVisitor.java index 69fd8445a5765..7f7b457d21516 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToTimestampLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToTimestampLiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -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.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.utils.DateTimeUtils; import java.time.ZoneId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java index 23022ce566c3c..be43a6e9e4795 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java @@ -21,7 +21,14 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; @@ -30,22 +37,15 @@ import org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; @@ -77,10 +77,10 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.MINUS; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.PLUS; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.MINUS; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.PLUS; import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java index e12695b6dc320..0a8891ccf4d7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java @@ -21,8 +21,16 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; @@ -30,19 +38,12 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; 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.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; @@ -60,7 +61,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeCoercionUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java index a29f502d1231f..443b8f1092222 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import com.google.common.collect.ImmutableList; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java index 2139c8b1e78ba..bcf56bc0d0032 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java @@ -20,18 +20,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -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.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.DateType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java index 4947177be1430..cff7e3280255a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java @@ -32,7 +32,7 @@ import java.util.Arrays; import static org.apache.iotdb.commons.conf.IoTDBConstant.TIME; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.OR; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.and; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index 9fcb5e5a3fcc9..a1184a159932a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -34,6 +34,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -47,7 +48,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.RelationType; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GapFillStartAndEndTimeExtractVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; @@ -100,6 +100,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.groupingSets; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isNumericType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingTranslator.sortItemToSortOrder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder; @@ -107,7 +108,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator.GROUP_KEY_SUFFIX; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GapFillStartAndEndTimeExtractVisitor.CAN_NOT_INFER_TIME_RANGE; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame.Type.GROUPS; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame.Type.RANGE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java index 95fdde1a48fa7..8faa5a1b2311f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -38,7 +39,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; 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.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; @@ -69,9 +69,9 @@ import static com.google.common.collect.Streams.stream; import static java.lang.String.format; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware.scopeAwareKey; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression.Quantifier.ALL; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java index 354fc97909a4b..16a33a2c5688a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java index e61f331779476..e1836527b06a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java @@ -19,18 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java index 4de5239984a90..3aeeb06e91157 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java @@ -19,12 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase; @@ -33,7 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; @@ -44,7 +45,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java index 9ddb9f5d3b9af..dac0bdffb76e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java @@ -21,10 +21,10 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java index ea78aeab9d9f8..808353c469520 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; @@ -47,7 +47,7 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.OR; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java index 524c705346594..53d6f4d2fd5d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; @@ -27,12 +29,10 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.relational.planner.NoOpSymbolResolver; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import com.google.common.collect.ImmutableList; @@ -50,8 +50,8 @@ import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toList; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; public final class IrUtils { private IrUtils() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java index 1311c51cb28c3..ce4d02255af2d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java @@ -20,7 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; @@ -29,20 +33,16 @@ import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java index b96d89fcca6dd..221ff21e20ca0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; @@ -42,9 +42,9 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; public class CanonicalizeExpressionRewriter { public static Expression canonicalizeExpression( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java index 65be2c23fe7b2..f4357428d65a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java @@ -22,13 +22,13 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; @@ -41,8 +41,8 @@ import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.SUBTRACT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Except.distinct; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.SUBTRACT; public class ImplementExceptAll implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java index 328ef56c1c430..a47537c0704e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java @@ -30,12 +30,12 @@ import java.util.Set; import static com.google.common.collect.Sets.intersection; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor.extractUnique; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.isAtMostScalar; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.isScalar; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; public class PruneCorrelatedJoinColumns extends ProjectOffPushDownRule { public PruneCorrelatedJoinColumns() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java index d0b322b4569cc..a5dc292cbe597 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java @@ -25,10 +25,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java index ef60cc51354b7..9c563cfd7a7d6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java @@ -29,10 +29,10 @@ import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; /** * Given: diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java index 00f6c2ee77bb0..1ee05bc2ed2f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java @@ -27,8 +27,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.filter; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; public class RemoveTrivialFilters implements Rule { private static final Pattern PATTERN = filter(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java index 955c7451d8222..0b86f487ee5d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java @@ -28,11 +28,11 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.RIGHT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.isAtLeastScalar; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.isScalar; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; public class RemoveUnreferencedScalarSubqueries implements Rule { private static final Pattern PATTERN = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java index e00397fa5cd95..35b7f726ebbdd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -40,7 +41,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SetOperationNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame; @@ -64,8 +64,8 @@ import static com.google.common.collect.Iterables.concat; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java index 681bb47bf11cc..b32f063537096 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java @@ -47,6 +47,7 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.type; @@ -54,7 +55,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java index 871aabe1f487f..0ff7599232873 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java @@ -42,13 +42,13 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.type; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java index 6cb109521be75..acb711e5dba08 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java @@ -53,6 +53,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; @@ -64,7 +65,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.empty; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java index 84b61a71723f0..c48992acf6de4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java @@ -50,6 +50,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; @@ -61,7 +62,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.empty; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java index 7d301c13d338f..952ad393309f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java @@ -47,6 +47,7 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Aggregation.groupingColumns; @@ -57,7 +58,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java index 6ac7a7b6c865b..617ae9c444fe0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java @@ -42,6 +42,7 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; @@ -52,7 +53,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java index 6ed2d80317c78..6669cd1230a51 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java @@ -37,10 +37,10 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index 81d92ec108396..01b79b83395a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -25,17 +25,17 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; 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.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; @@ -48,12 +48,12 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanNodeSearcher.searchFrom; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java index fc30dee8cf10e..8317431d4c9e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java @@ -23,6 +23,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; @@ -31,8 +33,6 @@ 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.optimizations.PlanNodeDecorrelator; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; @@ -52,9 +52,9 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java index 14e89534f2686..bc644b5f1c1c5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java @@ -43,13 +43,13 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.semiJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java index 231825c0eb97a..4ed253c764b0e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java @@ -22,12 +22,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; @@ -41,10 +41,10 @@ import java.util.Optional; import static com.google.common.base.Preconditions.checkState; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.empty; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java index 23c7b56996f46..f1089e7f20380 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java @@ -34,12 +34,12 @@ import java.util.Set; import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor.extractUnique; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.filterDeterministicConjuncts; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; public class JoinUtils { public static final String UNSUPPORTED_JOIN_CRITERIA = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java index bb889d7b33bd0..7995d7db63f58 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java @@ -27,6 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; @@ -36,7 +37,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeCoercion; 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 228797713571b..ca4b16eb85616 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 @@ -37,6 +37,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; @@ -71,7 +72,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.utils.TimestampPrecisionUtils; @@ -112,6 +112,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.RIGHT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; 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.plan.analyze.AnalyzeVisitor.getTimePartitionSlotList; @@ -134,7 +135,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.JoinUtils.processInnerJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.JoinUtils.processLimitedOuterJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java index 7deaafa41eeaf..977830d7af03a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java @@ -23,6 +23,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -34,8 +36,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils; 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.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; @@ -58,11 +58,11 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.globalAggregation; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SimplePlanRewriter.rewriteWith; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode.Quantifier.ALL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java index cb024ad5fae75..e23054a7c404f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java @@ -20,9 +20,9 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultTraversalVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java index 57ca7b5f2d5cb..82db3e09cebc0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; 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 96ce4aa008e1e..b79424b5efcf5 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 @@ -28,14 +28,6 @@ protected R visitCurrentTime(CurrentTime node, C context) { return visitExpression(node, context); } - protected R visitArithmeticBinary(ArithmeticBinaryExpression node, C context) { - return visitExpression(node, context); - } - - protected R visitBetweenPredicate(BetweenPredicate node, C context) { - return visitExpression(node, context); - } - protected R visitCoalesceExpression(CoalesceExpression node, C context) { return visitExpression(node, context); } @@ -44,10 +36,6 @@ protected R visitComparisonExpression(ComparisonExpression node, C context) { return visitExpression(node, context); } - protected R visitLiteral(Literal node, C context) { - return visitExpression(node, context); - } - protected R visitDoubleLiteral(DoubleLiteral node, C context) { return visitLiteral(node, context); } @@ -188,18 +176,6 @@ protected R visitSearchedCaseExpression(SearchedCaseExpression node, C context) return visitExpression(node, context); } - protected R visitStringLiteral(StringLiteral node, C context) { - return visitLiteral(node, context); - } - - protected R visitBinaryLiteral(BinaryLiteral node, C context) { - return visitLiteral(node, context); - } - - protected R visitBooleanLiteral(BooleanLiteral node, C context) { - return visitLiteral(node, context); - } - protected R visitInListExpression(InListExpression node, C context) { return visitExpression(node, context); } @@ -228,18 +204,10 @@ protected R visitNullLiteral(NullLiteral node, C context) { return visitLiteral(node, context); } - protected R visitArithmeticUnary(ArithmeticUnaryExpression node, C context) { - return visitExpression(node, context); - } - protected R visitNotExpression(NotExpression node, C context) { return visitExpression(node, context); } - protected R visitExtract(Extract node, C context) { - return visitExpression(node, context); - } - protected R visitWindowDefinition(WindowDefinition node, C context) { return visitNode(node, context); } @@ -332,10 +300,6 @@ protected R visitExists(ExistsPredicate node, C context) { return visitExpression(node, context); } - protected R visitCast(Cast node, C context) { - return visitExpression(node, context); - } - protected R visitFieldReference(FieldReference node, C context) { return visitExpression(node, context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DecimalLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DecimalLiteral.java index c625a5915ab2f..16b6e0d4a9ea4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DecimalLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DecimalLiteral.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java index 468dbbff8d0ae..6d09b2c20b85b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java @@ -19,7 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; public abstract class DefaultTraversalVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DoubleLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DoubleLiteral.java index d82e828b7dd09..90e5d6d242498 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DoubleLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DoubleLiteral.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java index abdc77d60d0ca..fbc02dcd62187 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java index 24a076e852cca..c3fb7d12f5c4c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java @@ -20,7 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java index 3ca319a7d1dbc..d8ccb35af2ebe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FloatLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FloatLiteral.java index 55702bc0e0073..3e7a3b447a693 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FloatLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FloatLiteral.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericLiteral.java index 0bb7ec84b24db..8f28c18e4bfa8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericLiteral.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java index a98e5e4b20d3d..f09888aadd15f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullLiteral.java index e8f71957ea1f2..12c9f9c07565b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullLiteral.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.tsfile.utils.RamUsageEstimator; 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 d503bf421e7ad..7daf59c37c61b 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 @@ -34,8 +34,17 @@ import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; @@ -46,13 +55,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AnchorPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ClearCache; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ColumnDefinition; @@ -101,7 +104,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExtendRegion; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Flush; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; @@ -126,7 +128,6 @@ 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; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadConfiguration; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadModel; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; @@ -220,7 +221,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopRepairData; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java index 568b5ef04b85b..445594b2f425e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java @@ -22,12 +22,12 @@ import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -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.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import com.google.common.graph.SuccessorsFunction; import com.google.common.graph.Traverser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java index a2ed686639853..5f35f78319035 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java @@ -19,17 +19,20 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllRows; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Columns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; @@ -40,7 +43,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; @@ -56,7 +58,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; @@ -72,7 +73,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleGroupBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java index 0e74fecc95852..7ef2b7fac4225 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; @@ -42,7 +43,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java index c8e11806f89a4..201b4bc099bf0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; 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 666f8010ab849..1286405c831f2 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 @@ -31,10 +31,10 @@ import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java index 0a46d62af6c0d..3e2bcec82ed5f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; @@ -39,6 +39,8 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; @@ -52,8 +54,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; // This test covers the remaining DistributionPlan cases that TSBSTest doesn't cover diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java index b846c73c9fbde..e55dade60e07e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java index 9831957c36baf..6fc6e2b48e306 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; @@ -43,6 +43,8 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.DIVIDE; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; @@ -54,8 +56,6 @@ 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.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.DIVIDE; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index 42462fd7ed18e..76f5ecdca1b99 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -29,6 +29,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; @@ -52,7 +53,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java index 2bb88f4082046..2bfb4395d0e22 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java index 20627be200235..78ce49f85193f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; @@ -35,6 +35,7 @@ import com.google.common.collect.ImmutableSet; import org.junit.Test; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; 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.any; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.anyTree; @@ -48,7 +49,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.LAST; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java index 5b23088a50009..a60849ecec339 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java @@ -19,14 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DecimalLiteral; @@ -47,7 +48,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java index 06bdc06216ca9..d9f00e2958829 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.informationschema; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; From f80cb252143aef21bdf11081dd0258c93999496c Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 13 Apr 2026 17:22:12 +0800 Subject: [PATCH 07/45] move ast nodes --- .../plan/planner/TableOperatorGenerator.java | 4 +- .../plan/relational/planner/Symbol.java | 2 +- .../planner/node/AggregationNode.java | 2 +- .../relational/planner/node/JoinNode.java | 4 +- .../sql/ast/ArithmeticBinaryExpression.java | 2 - .../sql/ast/ArithmeticUnaryExpression.java | 2 - .../relational/sql/ast/BetweenPredicate.java | 5 +- .../relational/sql/ast/BinaryLiteral.java | 2 - .../relational/sql/ast/BooleanLiteral.java | 5 +- .../plan/relational/sql/ast/Cast.java | 2 - .../sql/ast/CoalesceExpression.java | 8 +- .../sql/ast/CommonQueryAstVisitor.java | 84 +++++++++++++++++++ .../sql/ast/ComparisonExpression.java | 8 +- .../relational/sql/ast/CurrentDatabase.java | 8 +- .../plan/relational/sql/ast/CurrentTime.java | 8 +- .../plan/relational/sql/ast/CurrentUser.java | 8 +- .../relational/sql/ast/DecimalLiteral.java | 8 +- .../relational/sql/ast/DoubleLiteral.java | 8 +- .../plan/relational/sql/ast/Expression.java | 20 ----- .../plan/relational/sql/ast/Extract.java | 2 - .../plan/relational/sql/ast/FloatLiteral.java | 8 +- .../plan/relational/sql/ast/FunctionCall.java | 13 +-- .../relational/sql/ast/GenericLiteral.java | 8 +- .../plan/relational/sql/ast/InPredicate.java | 8 +- .../sql/ast/IsNotNullPredicate.java | 8 +- .../relational/sql/ast/IsNullPredicate.java | 8 +- .../relational/sql/ast/LikePredicate.java | 8 +- .../plan/relational/sql/ast/Literal.java | 2 - .../relational/sql/ast/LogicalExpression.java | 8 +- .../plan/relational/sql/ast/LongLiteral.java | 8 +- .../plan/relational/sql/ast/Node.java | 2 - .../plan/relational/sql/ast/NodeLocation.java | 2 +- .../relational/sql/ast/NotExpression.java | 8 +- .../plan/relational/sql/ast/NullLiteral.java | 8 +- .../sql/ast/SearchedCaseExpression.java | 9 +- .../sql/ast/SimpleCaseExpression.java | 9 +- .../relational/sql/ast/StringLiteral.java | 2 - .../relational/sql/ast/SymbolReference.java | 8 +- .../sql/ast/TableExpressionType.java | 2 +- .../thrift/impl/ClientRPCServiceImpl.java | 6 +- .../rowpattern/expression/Computation.java | 14 ++-- ...formationSchemaContentSupplierFactory.java | 2 +- .../relational/ColumnTransformerBuilder.java | 42 +++++----- .../plan/analyze/AnalyzeUtils.java | 12 +-- .../config/TableConfigTaskVisitor.java | 2 +- .../queryengine/plan/parser/ASTVisitor.java | 2 +- .../DataNodeTableOperatorGenerator.java | 4 +- .../analyzer/AggregationAnalyzer.java | 24 +++--- .../plan/relational/analyzer/Analysis.java | 4 +- .../analyzer/ExpressionAnalysis.java | 4 +- .../analyzer/ExpressionAnalyzer.java | 42 +++++----- .../analyzer/ExpressionTreeUtils.java | 2 +- .../analyzer/PatternRecognitionAnalysis.java | 2 +- .../analyzer/PatternRecognitionAnalyzer.java | 4 +- .../analyzer/StatementAnalyzer.java | 26 +++--- .../ConvertPredicateToFilterVisitor.java | 28 +++---- .../ConvertPredicateToTimeFilterVisitor.java | 22 ++--- .../PredicateCombineIntoTableScanChecker.java | 20 ++--- .../PredicatePushIntoMetadataChecker.java | 42 +++++----- .../PredicatePushIntoScanChecker.java | 20 ++--- .../analyzer/predicate/PredicateVisitor.java | 18 ++-- .../schema/CheckSchemaPredicateVisitor.java | 10 +-- ...ConvertSchemaPredicateToFilterVisitor.java | 20 ++--- .../ExtractPredicateColumnNameVisitor.java | 20 ++--- .../function/ResolvedFunctionCallBuilder.java | 2 +- .../metadata/fetcher/SchemaPredicateUtil.java | 4 +- .../plan/relational/planner/Assignments.java | 2 +- .../planner/CastToBlobLiteralVisitor.java | 10 +-- .../planner/CastToBooleanLiteralVisitor.java | 10 +-- .../planner/CastToDateLiteralVisitor.java | 10 +-- .../planner/CastToDoubleLiteralVisitor.java | 10 +-- .../planner/CastToFloatLiteralVisitor.java | 10 +-- .../planner/CastToInt32LiteralVisitor.java | 10 +-- .../planner/CastToInt64LiteralVisitor.java | 10 +-- .../planner/CastToStringLiteralVisitor.java | 10 +-- .../CastToTimestampLiteralVisitor.java | 10 +-- .../relational/planner/EqualityInference.java | 4 +- .../planner/ExpressionSymbolInliner.java | 2 +- .../planner/IrExpressionInterpreter.java | 24 +++--- .../relational/planner/IrTypeAnalyzer.java | 38 ++++----- .../relational/planner/LiteralEncoder.java | 10 +-- .../planner/LiteralInterpreter.java | 10 +-- .../relational/planner/PredicateUtils.java | 16 ++-- .../plan/relational/planner/QueryPlanner.java | 10 +-- .../relational/planner/RelationPlanner.java | 6 +- .../relational/planner/SubqueryPlanner.java | 6 +- .../relational/planner/SymbolAllocator.java | 4 +- .../relational/planner/SymbolsExtractor.java | 2 +- .../relational/planner/TranslationMap.java | 6 +- .../TableDistributedPlanGenerator.java | 6 +- .../planner/ir/DefaultTraversalVisitor.java | 18 ++-- .../planner/ir/DeterminismEvaluator.java | 2 +- .../planner/ir/ExpressionRewriter.java | 28 +++---- .../planner/ir/ExpressionTreeRewriter.java | 28 +++---- ...actCommonPredicatesExpressionRewriter.java | 4 +- .../GapFillStartAndEndTimeExtractVisitor.java | 20 ++--- .../ir/GlobalTimePredicateExtractVisitor.java | 28 +++---- .../plan/relational/planner/ir/IrUtils.java | 8 +- .../ir/NormalizeOrExpressionRewriter.java | 10 +-- ...correlatedScalarSubqueryReconstructor.java | 14 ++-- .../planner/ir/ReplaceSymbolInExpression.java | 2 +- .../rule/CanonicalizeExpressionRewriter.java | 14 ++-- .../iterative/rule/ImplementExceptAll.java | 6 +- .../rule/ImplementExceptDistinctAsUnion.java | 6 +- .../iterative/rule/ImplementIntersectAll.java | 4 +- .../ImplementIntersectDistinctAsUnion.java | 6 +- .../iterative/rule/InlineProjections.java | 2 +- .../rule/PushDownFilterIntoWindow.java | 4 +- .../PushDownNegationsExpressionRewriter.java | 16 ++-- .../rule/PushProjectionThroughUnion.java | 2 +- .../rule/RemoveDuplicateConditions.java | 2 +- .../iterative/rule/RemoveTrivialFilters.java | 2 +- .../rule/SetOperationNodeTranslator.java | 2 +- .../rule/SimplifyCountOverConstant.java | 2 +- .../iterative/rule/SimplifyExpressions.java | 2 +- .../TransformCorrelatedScalarSubquery.java | 4 +- .../TransformExistsApplyToCorrelatedJoin.java | 8 +- .../TransformUncorrelatedSubqueryToJoin.java | 2 +- .../node/AggregationTableScanNode.java | 2 +- .../planner/node/CorrelatedJoinNode.java | 2 +- .../planner/node/SetOperationNode.java | 2 +- .../planner/optimizations/JoinUtils.java | 2 +- .../optimizations/PlanNodeDecorrelator.java | 6 +- .../PushAggregationIntoTableScan.java | 4 +- .../PushPredicateIntoTableScan.java | 12 +-- .../planner/optimizations/SymbolMapper.java | 2 +- ...tifiedComparisonApplyToCorrelatedJoin.java | 22 ++--- .../UnaliasSymbolReferences.java | 4 +- .../relational/sql/ParameterExtractor.java | 9 +- .../sql/ast/AbstractQueryDeviceWithCache.java | 1 + .../sql/ast/AbstractTraverseDevice.java | 2 + .../plan/relational/sql/ast/AddColumn.java | 1 + .../relational/sql/ast/AliasedRelation.java | 1 + .../plan/relational/sql/ast/AllColumns.java | 1 + .../plan/relational/sql/ast/AllRows.java | 1 + .../sql/ast/AlterColumnDataType.java | 1 + .../plan/relational/sql/ast/AlterDB.java | 1 + .../relational/sql/ast/AnchorPattern.java | 1 + .../plan/relational/sql/ast/AsofJoinOn.java | 5 +- .../sql/ast/AstMemoryEstimationHelper.java | 1 + .../plan/relational/sql/ast/AstVisitor.java | 84 ------------------- .../relational/sql/ast/ColumnDefinition.java | 1 + .../plan/relational/sql/ast/Columns.java | 2 + .../plan/relational/sql/ast/CopyTo.java | 1 + .../plan/relational/sql/ast/CountDevice.java | 1 + .../relational/sql/ast/CountStatement.java | 1 + .../plan/relational/sql/ast/CreateDB.java | 1 + .../sql/ast/CreateExternalService.java | 1 + .../relational/sql/ast/CreateFunction.java | 1 + .../plan/relational/sql/ast/CreateIndex.java | 1 + .../plan/relational/sql/ast/CreateTable.java | 1 + .../plan/relational/sql/ast/CreateView.java | 1 + .../plan/relational/sql/ast/DataType.java | 1 + .../relational/sql/ast/DataTypeParameter.java | 1 + .../relational/sql/ast/DatabaseStatement.java | 1 + .../plan/relational/sql/ast/Deallocate.java | 1 + .../sql/ast/DefaultTraversalVisitor.java | 11 +++ .../plan/relational/sql/ast/Delete.java | 1 + .../plan/relational/sql/ast/DeleteDevice.java | 1 + .../sql/ast/DereferenceExpression.java | 1 + .../relational/sql/ast/DescribeTable.java | 1 + .../plan/relational/sql/ast/DropColumn.java | 1 + .../plan/relational/sql/ast/DropDB.java | 1 + .../sql/ast/DropExternalService.java | 1 + .../plan/relational/sql/ast/DropFunction.java | 1 + .../plan/relational/sql/ast/DropIndex.java | 1 + .../plan/relational/sql/ast/DropTable.java | 1 + .../plan/relational/sql/ast/EmptyPattern.java | 1 + .../plan/relational/sql/ast/Except.java | 1 + .../relational/sql/ast/ExcludedPattern.java | 1 + .../plan/relational/sql/ast/Execute.java | 1 + .../relational/sql/ast/ExecuteImmediate.java | 1 + .../relational/sql/ast/ExistsPredicate.java | 1 + .../plan/relational/sql/ast/Explain.java | 1 + .../relational/sql/ast/ExplainAnalyze.java | 1 + .../plan/relational/sql/ast/Fill.java | 2 + .../plan/relational/sql/ast/FrameBound.java | 1 + .../relational/sql/ast/GenericDataType.java | 2 + .../plan/relational/sql/ast/GroupBy.java | 1 + .../relational/sql/ast/GroupingElement.java | 1 + .../plan/relational/sql/ast/GroupingSets.java | 1 + .../plan/relational/sql/ast/Identifier.java | 2 + .../plan/relational/sql/ast/IfExpression.java | 1 + .../relational/sql/ast/InListExpression.java | 2 + .../plan/relational/sql/ast/Intersect.java | 1 + .../plan/relational/sql/ast/Join.java | 1 + .../plan/relational/sql/ast/KillQuery.java | 1 + .../plan/relational/sql/ast/Limit.java | 2 + .../plan/relational/sql/ast/LoadTsFile.java | 1 + .../relational/sql/ast/MeasureDefinition.java | 1 + .../relational/sql/ast/MigrateRegion.java | 1 + .../relational/sql/ast/NullIfExpression.java | 1 + .../relational/sql/ast/NumericParameter.java | 1 + .../plan/relational/sql/ast/Offset.java | 2 + .../sql/ast/OneOrMoreQuantifier.java | 1 + .../plan/relational/sql/ast/OrderBy.java | 1 + .../plan/relational/sql/ast/Parameter.java | 1 + .../sql/ast/PatternAlternation.java | 1 + .../sql/ast/PatternConcatenation.java | 1 + .../sql/ast/PatternPermutation.java | 1 + .../relational/sql/ast/PatternQuantifier.java | 1 + .../sql/ast/PatternRecognitionRelation.java | 1 + .../relational/sql/ast/PatternVariable.java | 1 + .../plan/relational/sql/ast/Prepare.java | 1 + .../relational/sql/ast/ProcessingMode.java | 1 + .../plan/relational/sql/ast/Property.java | 1 + .../ast/QuantifiedComparisonExpression.java | 2 + .../relational/sql/ast/QuantifiedPattern.java | 1 + .../plan/relational/sql/ast/Query.java | 1 + .../plan/relational/sql/ast/QueryBody.java | 1 + .../sql/ast/QuerySpecification.java | 1 + .../relational/sql/ast/RangeQuantifier.java | 2 + .../plan/relational/sql/ast/Relation.java | 1 + .../plan/relational/sql/ast/RenameColumn.java | 1 + .../plan/relational/sql/ast/RenameTable.java | 1 + .../plan/relational/sql/ast/Row.java | 2 + .../plan/relational/sql/ast/RowPattern.java | 1 + .../plan/relational/sql/ast/Select.java | 1 + .../plan/relational/sql/ast/SelectItem.java | 1 + .../relational/sql/ast/SetColumnComment.java | 1 + .../plan/relational/sql/ast/SetOperation.java | 1 + .../relational/sql/ast/SetProperties.java | 1 + .../relational/sql/ast/SetSqlDialect.java | 1 + .../relational/sql/ast/SetTableComment.java | 1 + .../plan/relational/sql/ast/ShowAINodes.java | 1 + .../plan/relational/sql/ast/ShowCluster.java | 1 + .../relational/sql/ast/ShowClusterId.java | 1 + .../relational/sql/ast/ShowConfigNodes.java | 1 + .../sql/ast/ShowCurrentDatabase.java | 1 + .../sql/ast/ShowCurrentSqlDialect.java | 1 + .../sql/ast/ShowCurrentTimestamp.java | 1 + .../relational/sql/ast/ShowCurrentUser.java | 1 + .../plan/relational/sql/ast/ShowDB.java | 1 + .../relational/sql/ast/ShowDataNodes.java | 1 + .../plan/relational/sql/ast/ShowDevice.java | 1 + .../sql/ast/ShowExternalService.java | 1 + .../relational/sql/ast/ShowFunctions.java | 1 + .../plan/relational/sql/ast/ShowIndex.java | 1 + .../sql/ast/ShowQueriesStatement.java | 1 + .../relational/sql/ast/ShowStatement.java | 1 + .../plan/relational/sql/ast/ShowTables.java | 1 + .../relational/sql/ast/ShowVariables.java | 1 + .../plan/relational/sql/ast/ShowVersion.java | 1 + .../relational/sql/ast/SimpleGroupBy.java | 1 + .../plan/relational/sql/ast/SingleColumn.java | 1 + .../plan/relational/sql/ast/SkipTo.java | 1 + .../plan/relational/sql/ast/SortItem.java | 1 + .../sql/ast/StartExternalService.java | 1 + .../plan/relational/sql/ast/Statement.java | 1 + .../sql/ast/StopExternalService.java | 1 + .../sql/ast/SubqueryExpression.java | 1 + .../relational/sql/ast/SubsetDefinition.java | 1 + .../plan/relational/sql/ast/Table.java | 1 + .../sql/ast/TableFunctionArgument.java | 1 + .../sql/ast/TableFunctionInvocation.java | 1 + .../sql/ast/TableFunctionTableArgument.java | 1 + .../relational/sql/ast/TableSubquery.java | 1 + .../plan/relational/sql/ast/TimeRange.java | 1 + .../plan/relational/sql/ast/Trim.java | 1 + .../plan/relational/sql/ast/Union.java | 1 + .../plan/relational/sql/ast/Update.java | 1 + .../relational/sql/ast/UpdateAssignment.java | 1 + .../plan/relational/sql/ast/Use.java | 1 + .../plan/relational/sql/ast/Values.java | 1 + .../sql/ast/VariableDefinition.java | 1 + .../sql/ast/ViewFieldDefinition.java | 1 + .../plan/relational/sql/ast/WhenClause.java | 2 + .../relational/sql/ast/WindowDefinition.java | 1 + .../plan/relational/sql/ast/WindowFrame.java | 1 + .../relational/sql/ast/WindowReference.java | 1 + .../sql/ast/WindowSpecification.java | 1 + .../plan/relational/sql/ast/With.java | 1 + .../plan/relational/sql/ast/WithQuery.java | 1 + .../sql/ast/ZeroOrMoreQuantifier.java | 1 + .../sql/ast/ZeroOrOneQuantifier.java | 1 + .../relational/sql/parser/AstBuilder.java | 38 ++++----- .../sql/parser/ParsingException.java | 2 +- .../plan/relational/sql/parser/SqlParser.java | 2 +- .../relational/sql/rewrite/ShowRewrite.java | 2 +- .../plan/relational/sql/util/AstUtil.java | 4 +- .../sql/util/ExpressionFormatter.java | 42 +++++----- .../plan/relational/sql/util/QueryUtil.java | 10 +-- .../impl/SchemaRegionMemoryImpl.java | 2 +- .../SchemaRegionSimpleRecoverTest.java | 2 +- ...nedTreeDeviceViewScanOperatorTreeTest.java | 12 +-- .../AggregationTableScanTest.java | 2 +- .../relational/analyzer/AggregationTest.java | 10 +-- .../relational/analyzer/AnalyzerTest.java | 2 +- .../relational/analyzer/AsofJoinTest.java | 5 +- .../analyzer/ExtractExpressionTest.java | 2 +- .../plan/relational/analyzer/JoinTest.java | 8 +- .../plan/relational/analyzer/TSBSTest.java | 16 ++-- .../relational/analyzer/TestMetadata.java | 4 +- .../planner/CorrelatedSubqueryTest.java | 6 +- .../planner/CteMaterializerTest.java | 8 +- .../relational/planner/CteSubqueryTest.java | 7 +- .../plan/relational/planner/ExampleTest.java | 14 ++-- .../PatternRecognitionNodeSerdeTest.java | 2 +- .../planner/UncorrelatedSubqueryTest.java | 14 ++-- .../assertions/AsofJoinClauseProvider.java | 4 +- .../assertions/ExpressionVerifier.java | 34 ++++---- .../planner/assertions/JoinMatcher.java | 2 +- .../planner/assertions/MatchResult.java | 2 +- .../planner/assertions/PlanMatchPattern.java | 2 +- .../planner/assertions/SymbolAliases.java | 2 +- .../TableFunctionProcessorMatcher.java | 2 +- .../informationschema/CurrentQueriesTest.java | 6 +- .../TablePredicateConversionTest.java | 6 +- 308 files changed, 942 insertions(+), 857 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/CoalesceExpression.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/ComparisonExpression.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/CurrentDatabase.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/CurrentTime.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/CurrentUser.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/DecimalLiteral.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/DoubleLiteral.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/FloatLiteral.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/FunctionCall.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/GenericLiteral.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/InPredicate.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/IsNotNullPredicate.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/IsNullPredicate.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/LikePredicate.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/LogicalExpression.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/LongLiteral.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/NodeLocation.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/NotExpression.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/NullLiteral.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/SearchedCaseExpression.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/SimpleCaseExpression.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/SymbolReference.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/TableExpressionType.java (96%) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 31f63d3dc3928..26193edf5bfb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -64,8 +64,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.MatchNumberValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; @@ -161,8 +163,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Symbol.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Symbol.java index aa8a9d30b7c73..430c8c1b48de1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Symbol.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Symbol.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java index 1506907ceace4..1e78e26bf2e1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java index 47d23bba47683..a681ae15c0d40 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java @@ -22,13 +22,13 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.process.TwoChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java index dc0580de7e629..78a8336e16d98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java @@ -20,8 +20,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java index 5dbc8a43fad4b..c904d8b2211b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java @@ -20,8 +20,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BetweenPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BetweenPredicate.java index aa33bf291c3b3..b9c0aacd7e89e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BetweenPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BetweenPredicate.java @@ -20,9 +20,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -83,7 +80,7 @@ public Expression getMax() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitBetweenPredicate(this, context); + return ((CommonQueryAstVisitor) visitor).visitBetweenPredicate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java index fbbffded74939..a0ba81bce1cf2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java @@ -20,8 +20,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; import com.google.common.base.CharMatcher; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BooleanLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BooleanLiteral.java index 74e7a350b1cb6..8255ba90c3483 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BooleanLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BooleanLiteral.java @@ -20,9 +20,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -70,7 +67,7 @@ public boolean getValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitBooleanLiteral(this, context); + return ((CommonQueryAstVisitor) visitor).visitBooleanLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java index a1dd0510d0750..839e21e9e8313 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java @@ -21,8 +21,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CoalesceExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CoalesceExpression.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CoalesceExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CoalesceExpression.java index 58e7aa0fd127d..4fddb358bfce3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CoalesceExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CoalesceExpression.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -72,7 +70,7 @@ public List getOperands() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitCoalesceExpression(this, context); + return ((CommonQueryAstVisitor) visitor).visitCoalesceExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java index a46eb495fce7d..ba48d5e002151 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java @@ -69,4 +69,88 @@ protected R visitBinaryLiteral(BinaryLiteral node, C context) { protected R visitStringLiteral(StringLiteral node, C context) { return visitLiteral(node, context); } + + protected R visitLongLiteral(LongLiteral node, C context) { + return visitLiteral(node, context); + } + + protected R visitDoubleLiteral(DoubleLiteral node, C context) { + return visitLiteral(node, context); + } + + protected R visitFloatLiteral(FloatLiteral node, C context) { + return visitLiteral(node, context); + } + + protected R visitDecimalLiteral(DecimalLiteral node, C context) { + return visitLiteral(node, context); + } + + protected R visitGenericLiteral(GenericLiteral node, C context) { + return visitLiteral(node, context); + } + + protected R visitNullLiteral(NullLiteral node, C context) { + return visitLiteral(node, context); + } + + protected R visitCurrentDatabase(CurrentDatabase node, C context) { + return visitExpression(node, context); + } + + protected R visitCurrentTime(CurrentTime node, C context) { + return visitExpression(node, context); + } + + protected R visitCurrentUser(CurrentUser node, C context) { + return visitExpression(node, context); + } + + protected R visitComparisonExpression(ComparisonExpression node, C context) { + return visitExpression(node, context); + } + + protected R visitCoalesceExpression(CoalesceExpression node, C context) { + return visitExpression(node, context); + } + + protected R visitInPredicate(InPredicate node, C context) { + return visitExpression(node, context); + } + + protected R visitNotExpression(NotExpression node, C context) { + return visitExpression(node, context); + } + + protected R visitLikePredicate(LikePredicate node, C context) { + return visitExpression(node, context); + } + + protected R visitIsNotNullPredicate(IsNotNullPredicate node, C context) { + return visitExpression(node, context); + } + + protected R visitIsNullPredicate(IsNullPredicate node, C context) { + return visitExpression(node, context); + } + + protected R visitLogicalExpression(LogicalExpression node, C context) { + return visitExpression(node, context); + } + + protected R visitSymbolReference(SymbolReference node, C context) { + return visitExpression(node, context); + } + + protected R visitSimpleCaseExpression(SimpleCaseExpression node, C context) { + return visitExpression(node, context); + } + + protected R visitSearchedCaseExpression(SearchedCaseExpression node, C context) { + return visitExpression(node, context); + } + + protected R visitFunctionCall(FunctionCall node, C context) { + return visitExpression(node, context); + } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ComparisonExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ComparisonExpression.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ComparisonExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ComparisonExpression.java index 5bd0ab893dc6e..5acb8a4049e91 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ComparisonExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ComparisonExpression.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -146,7 +144,7 @@ public Expression getRight() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitComparisonExpression(this, context); + return ((CommonQueryAstVisitor) visitor).visitComparisonExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentDatabase.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentDatabase.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentDatabase.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentDatabase.java index e8df6f6c383de..4a30f6ba48ea2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentDatabase.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentDatabase.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -52,7 +50,7 @@ public List getChildren() { @Override public R accept(final IAstVisitor visitor, final C context) { - return ((AstVisitor) visitor).visitCurrentDatabase(this, context); + return ((CommonQueryAstVisitor) visitor).visitCurrentDatabase(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentTime.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentTime.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentTime.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentTime.java index 4de44aa80fd89..2a880211bd1c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentTime.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentTime.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -84,7 +82,7 @@ public Optional getPrecision() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitCurrentTime(this, context); + return ((CommonQueryAstVisitor) visitor).visitCurrentTime(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentUser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentUser.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentUser.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentUser.java index 4769b0ec4fae2..6e252af1a0fba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CurrentUser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentUser.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -52,7 +50,7 @@ public List getChildren() { @Override public R accept(final IAstVisitor visitor, final C context) { - return ((AstVisitor) visitor).visitCurrentUser(this, context); + return ((CommonQueryAstVisitor) visitor).visitCurrentUser(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DecimalLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DecimalLiteral.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DecimalLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DecimalLiteral.java index 16b6e0d4a9ea4..c4af8b12fe9a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DecimalLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DecimalLiteral.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; @@ -59,7 +57,7 @@ public String getValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitDecimalLiteral(this, context); + return ((CommonQueryAstVisitor) visitor).visitDecimalLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DoubleLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DoubleLiteral.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DoubleLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DoubleLiteral.java index 90e5d6d242498..ae75e74260c8b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DoubleLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DoubleLiteral.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -60,7 +58,7 @@ public double getValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitDoubleLiteral(this, context); + return ((CommonQueryAstVisitor) visitor).visitDoubleLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java index 6fec19b8fbf99..d155ae3eaae5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java @@ -19,30 +19,10 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DecimalLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.util.ExpressionFormatter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Extract.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Extract.java index be5f7698d8892..ca57189a513a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Extract.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Extract.java @@ -20,8 +20,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.Immutable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FloatLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FloatLiteral.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FloatLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FloatLiteral.java index 3e7a3b447a693..f31acd24bf320 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FloatLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FloatLiteral.java @@ -17,12 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -61,7 +59,7 @@ public float getValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitFloatLiteral(this, context); + return ((CommonQueryAstVisitor) visitor).visitFloatLiteral(this, context); } @SuppressWarnings("UnaryPlus") diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FunctionCall.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FunctionCall.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FunctionCall.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FunctionCall.java index ef741c30e7a95..80e6f932d4b74 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FunctionCall.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FunctionCall.java @@ -17,11 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Window; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowReference; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowSpecification; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -174,7 +177,7 @@ public Optional getNullTreatment() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitFunctionCall(this, context); + return ((CommonQueryAstVisitor) visitor).visitFunctionCall(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericLiteral.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericLiteral.java index 8f28c18e4bfa8..165febdfad78b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericLiteral.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.tsfile.utils.Binary; @@ -83,7 +81,7 @@ public String getValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitGenericLiteral(this, context); + return ((CommonQueryAstVisitor) visitor).visitGenericLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InPredicate.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InPredicate.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InPredicate.java index 3cd4b6df98fea..1413cdaffae1c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InPredicate.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -64,7 +62,7 @@ public Expression getValueList() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitInPredicate(this, context); + return ((CommonQueryAstVisitor) visitor).visitInPredicate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNotNullPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNotNullPredicate.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java index 6eba9b749d5e5..9e65ac2e3d606 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNotNullPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -72,7 +70,7 @@ public Expression getValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitIsNotNullPredicate(this, context); + return ((CommonQueryAstVisitor) visitor).visitIsNotNullPredicate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNullPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNullPredicate.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNullPredicate.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNullPredicate.java index fe15a9663a828..8c43c74cce67f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IsNullPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNullPredicate.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -72,7 +70,7 @@ public Expression getValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitIsNullPredicate(this, context); + return ((CommonQueryAstVisitor) visitor).visitIsNullPredicate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LikePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LikePredicate.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LikePredicate.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LikePredicate.java index 6f74ba816f032..217c5d865be5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LikePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LikePredicate.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -117,7 +115,7 @@ public Optional getEscape() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitLikePredicate(this, context); + return ((CommonQueryAstVisitor) visitor).visitLikePredicate(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Literal.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Literal.java index 005b9e7ba1caf..cdcc1ca2be82e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Literal.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Literal.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; - import com.google.common.collect.ImmutableList; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LogicalExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LogicalExpression.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LogicalExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LogicalExpression.java index 1353729798c68..96b6178936b06 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LogicalExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LogicalExpression.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -88,7 +86,7 @@ public void setTerms(List terms) { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitLogicalExpression(this, context); + return ((CommonQueryAstVisitor) visitor).visitLogicalExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LongLiteral.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LongLiteral.java index f09888aadd15f..6a03b9434eae0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LongLiteral.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.tsfile.utils.RamUsageEstimator; @@ -71,7 +69,7 @@ public long getParsedValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitLongLiteral(this, context); + return ((CommonQueryAstVisitor) visitor).visitLongLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Node.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Node.java index 0f6cdc149f1c9..b028bf0ef523e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Node.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Node.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; - import org.apache.tsfile.utils.Accountable; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NodeLocation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NodeLocation.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NodeLocation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NodeLocation.java index 98f32813d7e33..0708f08c4b5bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NodeLocation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NodeLocation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NotExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NotExpression.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NotExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NotExpression.java index 90e05e2a3f03c..c66deb00d79ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NotExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NotExpression.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -57,7 +55,7 @@ public Expression getValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitNotExpression(this, context); + return ((CommonQueryAstVisitor) visitor).visitNotExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullLiteral.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullLiteral.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullLiteral.java index 12c9f9c07565b..d60c46d112512 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullLiteral.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.tsfile.utils.RamUsageEstimator; @@ -46,7 +44,7 @@ public NullLiteral(NodeLocation location) { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitNullLiteral(this, context); + return ((CommonQueryAstVisitor) visitor).visitNullLiteral(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SearchedCaseExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SearchedCaseExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java index 89ca853e2d384..79992f46dfed1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SearchedCaseExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java @@ -17,11 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import com.google.common.collect.ImmutableList; import org.apache.tsfile.external.commons.lang3.Validate; @@ -101,7 +100,7 @@ public Optional getDefaultValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitSearchedCaseExpression(this, context); + return ((CommonQueryAstVisitor) visitor).visitSearchedCaseExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java index 6b2e75ab2302a..bee8749a4dab1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java @@ -17,11 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import com.google.common.collect.ImmutableList; import org.apache.tsfile.external.commons.lang3.Validate; @@ -111,7 +110,7 @@ public Optional getDefaultValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitSimpleCaseExpression(this, context); + return ((CommonQueryAstVisitor) visitor).visitSimpleCaseExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StringLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StringLiteral.java index 6c68dbe6239ac..dc123a7a0fbe9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StringLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StringLiteral.java @@ -20,8 +20,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SymbolReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SymbolReference.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SymbolReference.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SymbolReference.java index a2307aeaa4236..3f4f9e1d6f6c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SymbolReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SymbolReference.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -51,7 +49,7 @@ public String getName() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitSymbolReference(this, context); + return ((CommonQueryAstVisitor) visitor).visitSymbolReference(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableExpressionType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableExpressionType.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableExpressionType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableExpressionType.java index 3d66db762b136..95b90c73f48e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableExpressionType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableExpressionType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; public enum TableExpressionType { ARITHMETIC_BINARY((short) 1), 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 3af7ad5bcdb6d..9b4bf576c0f74 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 @@ -50,7 +50,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.protocol.basic.BasicOpenSessionResp; @@ -95,11 +98,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; import org.apache.iotdb.db.queryengine.plan.relational.security.TreeAccessCheckContext; import org.apache.iotdb.db.queryengine.plan.relational.sql.ParameterExtractor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Execute; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetSqlDialect; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java index 26c50a2c81427..f652f7ce885a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java @@ -26,16 +26,16 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import java.util.ArrayList; import java.util.HashMap; 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 index 057c7fd4a1f29..9631ad7a4ef20 100644 --- 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 @@ -64,6 +64,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TTableInfo; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; @@ -84,7 +85,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableDiskUsageInformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.util.ReservedIdentifiers; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlKeywords; import org.apache.iotdb.db.schemaengine.table.InformationSchemaUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java index c26f5b0dcfac1..31f6e7b266ed3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java @@ -30,10 +30,31 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; @@ -45,30 +66,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.SubtractionResolver; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DecimalLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java index 3037527a9d2b0..2e6b8bca68fc1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java @@ -30,20 +30,20 @@ import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.confignode.rpc.thrift.TRegionRouteMapResp; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; 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.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TimeRange; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertBaseStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; 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 399d05bfc1fb6..650999844056a 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 @@ -47,6 +47,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -180,7 +181,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.KillQuery; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadConfiguration; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadModel; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MigrateRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Prepare; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; 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 6bec90806fc28..f377ff91d206b 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 @@ -5027,7 +5027,7 @@ private org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression pars return new org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral( parseStringLiteral(context.getText())); } else if (context.INTEGER_LITERAL() != null) { - return new org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral( + return new org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral( context.getText()); } throw new UnsupportedOperationException("Currently other expressions are not supported"); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index f0cf2de1b5251..acf48f3b97a52 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -28,6 +28,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.TableDateBinTimeRangeIterator; @@ -114,8 +116,6 @@ 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.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java index 1a95230a1be92..6156d81142b58 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java @@ -24,34 +24,34 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentTime; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; 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 ad46221c18fb7..33c7d45b11f7c 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 @@ -26,6 +26,8 @@ import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -48,9 +50,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java index 95bb7c3ce24a8..f0d6a68f32de3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 2851d0b7afbc2..60fb35dc17415 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -28,11 +28,32 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StackableAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; @@ -56,33 +77,15 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Columns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DecimalLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode; @@ -91,12 +94,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java index f3ece7794c549..d9b0bcfeb2220 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultExpressionTraversalVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java index 7967a37ab0c75..9ee8cb4fd61ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java index 6a7b7f2296d9e..ac5ab55413dfe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java @@ -21,11 +21,11 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.Range; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index bdf1fe9598b15..19a77bc90747f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -30,11 +30,24 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -70,9 +83,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Columns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CopyTo; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateDB; @@ -104,33 +115,25 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingElement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRow; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertTablet; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; 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.LikePredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Limit; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; @@ -146,7 +149,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetOperation; @@ -160,7 +162,6 @@ 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; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleGroupBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo; @@ -170,7 +171,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionArgument; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java index b76a9862166fe..d679e9527d105 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java @@ -25,28 +25,28 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java index 75830324fbdb2..e1e0531a99af8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -20,22 +20,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java index 2096705ed2590..6c94071e9740a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java @@ -20,22 +20,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import java.util.List; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java index ebd24d6cc37f4..54bcf9d2502d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java @@ -25,34 +25,34 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DecimalLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java index aa71ad39dfbb6..3ada53cdc3b2d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java @@ -20,20 +20,20 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java index 544dbe21cfb76..5e579686aef78 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java @@ -20,19 +20,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; /** * This class provides a visitor of {@link Expression}, which can be extended to create a visitor diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java index 4604438ae311b..e593edc504b8e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java @@ -24,15 +24,15 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java index 2ad3196953110..27f779fb3125c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java @@ -33,23 +33,23 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicateVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java index 57470d804a623..bf5d70fd96864 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java @@ -20,21 +20,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicateVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; public class ExtractPredicateColumnNameVisitor extends PredicateVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/ResolvedFunctionCallBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/ResolvedFunctionCallBuilder.java index 49d9366813456..83bef5960613a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/ResolvedFunctionCallBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/ResolvedFunctionCallBuilder.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.function; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java index 2f94a868f67fa..206cea783b5ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java @@ -28,13 +28,13 @@ import org.apache.iotdb.commons.schema.filter.impl.values.PreciseFilter; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema.CheckSchemaPredicateVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema.ConvertSchemaPredicateToFilterVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java index 8aac00762bda0..9d287e49eb221 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java @@ -21,7 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBlobLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBlobLiteralVisitor.java index a6b348ce7bea0..634df74109f12 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBlobLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBlobLiteralVisitor.java @@ -21,14 +21,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBooleanLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBooleanLiteralVisitor.java index 0786c01570bcb..55c8f504db4b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBooleanLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBooleanLiteralVisitor.java @@ -21,14 +21,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; // return NULL, if we cannot parse literal to boolean type public class CastToBooleanLiteralVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDateLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDateLiteralVisitor.java index ab1a5208bc8df..f348e3c1ca538 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDateLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDateLiteralVisitor.java @@ -21,14 +21,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.tsfile.utils.DateUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDoubleLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDoubleLiteralVisitor.java index ed4933d0b8fe6..766f25f198953 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDoubleLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDoubleLiteralVisitor.java @@ -21,14 +21,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; // return NULL, if we cannot parse literal to double type public class CastToDoubleLiteralVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToFloatLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToFloatLiteralVisitor.java index 03ca4cec25a65..75c14c5487597 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToFloatLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToFloatLiteralVisitor.java @@ -21,14 +21,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; // return NULL, if we cannot parse literal to float type public class CastToFloatLiteralVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt32LiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt32LiteralVisitor.java index 291bd6944b240..b599c68837346 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt32LiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt32LiteralVisitor.java @@ -21,14 +21,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; // return NULL, if we cannot parse literal to INT32 type public class CastToInt32LiteralVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt64LiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt64LiteralVisitor.java index 0493effe057b4..b4f6e33a1f178 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt64LiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt64LiteralVisitor.java @@ -21,14 +21,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; // return NULL, if we cannot parse literal to INT64 type public class CastToInt64LiteralVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToStringLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToStringLiteralVisitor.java index ec3c4702c9ffe..8d12c763923d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToStringLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToStringLiteralVisitor.java @@ -21,14 +21,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.BytesUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToTimestampLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToTimestampLiteralVisitor.java index 7f7b457d21516..37e67f3cfe3c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToTimestampLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToTimestampLiteralVisitor.java @@ -21,14 +21,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.utils.DateTimeUtils; import java.time.ZoneId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java index 1f8d6971396a4..a1fc187cfbca1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.SubExpressionExtractor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.utils.DisjointSet; import com.google.common.annotations.VisibleForTesting; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java index 85a94f9d98e41..b6b8b75476d56 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multiset; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java index be43a6e9e4795..839fa174de741 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java @@ -26,9 +26,21 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; @@ -38,20 +50,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeCoercion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java index 0a8891ccf4d7d..524d42b9a501b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java @@ -27,10 +27,29 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; @@ -39,29 +58,10 @@ 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.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeCoercionUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java index 443b8f1092222..8778b6a77cebf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java @@ -22,13 +22,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import com.google.common.collect.ImmutableList; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java index bcf56bc0d0032..78f5d5476f98c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java @@ -22,16 +22,16 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.DateType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java index cff7e3280255a..56a5b15fb9b31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.tsfile.utils.Pair; @@ -33,10 +33,10 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.TIME; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.OR; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.and; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.or; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.and; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.or; public class PredicateUtils { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index a1184a159932a..305704922dd42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -35,8 +35,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -48,16 +52,12 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.RelationType; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GapFillStartAndEndTimeExtractVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; @@ -101,6 +101,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isNumericType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingTranslator.sortItemToSortOrder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder; @@ -108,7 +109,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator.GROUP_KEY_SUFFIX; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GapFillStartAndEndTimeExtractVisitor.CAN_NOT_INFER_TIME_RANGE; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame.Type.GROUPS; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame.Type.RANGE; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame.Type.ROWS; 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 485c2c230ef3e..08019d395d01e 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 @@ -41,7 +41,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.RowPatternToIrRewriter; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -89,8 +92,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Except; @@ -104,7 +105,6 @@ 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.LoadTsFile; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java index 8faa5a1b2311f..20c0f8e3ed8dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java @@ -24,8 +24,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -39,12 +42,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; 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.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java index ce3b490914173..61b8d1f5b16e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java @@ -22,11 +22,11 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Field; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java index 511ced88e6168..eae053776407a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java index 751e68463dbd4..f3672ff584d9e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java @@ -21,6 +21,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.ResolvedField; @@ -29,13 +32,10 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; 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.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.util.AstUtil; 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 ca738fd477e86..281833570cf8b 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 @@ -63,7 +63,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -105,10 +108,7 @@ 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.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java index 16a33a2c5688a..850f74d048b91 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java @@ -22,19 +22,19 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; public abstract class DefaultTraversalVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java index e4462ef7b9736..55293393123b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java index e1836527b06a0..ca519aeabcdd1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java @@ -23,35 +23,35 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java index 3aeeb06e91157..222b431f0904e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java @@ -23,39 +23,39 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java index f2ffd66db7cfb..1ddf586d4f9a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -34,10 +34,10 @@ import static java.util.Collections.emptySet; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combinePredicates; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractPredicates; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.OR; public final class ExtractCommonPredicatesExpressionRewriter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java index dac0bdffb76e4..e95e54bc01363 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java @@ -22,24 +22,24 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import javax.annotation.Nullable; import java.time.ZoneId; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.OR; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; public class GapFillStartAndEndTimeExtractVisitor diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java index 808353c469520..4beed6cf23a3f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java @@ -21,24 +21,24 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.utils.Pair; @@ -48,8 +48,8 @@ import java.util.Set; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.OR; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; public class GlobalTimePredicateExtractVisitor extends AstVisitor, GlobalTimePredicateExtractVisitor.Context> { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java index 53d6f4d2fd5d7..36ab8923f58c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java @@ -20,8 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; @@ -29,11 +33,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.relational.planner.NoOpSymbolResolver; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java index 7c50c1417d39d..e8281c3e4643c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultimap; @@ -36,10 +36,10 @@ import java.util.Set; import static com.google.common.collect.ImmutableList.toImmutableList; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.or; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; public final class NormalizeOrExpressionRewriter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java index ce4d02255af2d..05f507126104c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java @@ -22,8 +22,15 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -33,15 +40,8 @@ import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java index e65f4e35cadff..e1a19c2d8edb2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java @@ -21,8 +21,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java index 221ff21e20ca0..2cab086c71df9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java @@ -20,21 +20,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java index f4357428d65a2..be890aca5d071 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java @@ -23,15 +23,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java index a49b5325e8486..64eb1cad23a87 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java @@ -21,14 +21,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; @@ -36,8 +36,8 @@ import org.apache.tsfile.read.common.type.LongType; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; public class ImplementExceptDistinctAsUnion implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java index 475a7ac170a05..18b54f1c9bf71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java @@ -22,13 +22,13 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java index b3e035cc855ab..5fb01ec8078ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java @@ -21,14 +21,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; @@ -36,8 +36,8 @@ import org.apache.tsfile.read.common.type.LongType; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; public class ImplementIntersectDistinctAsUnion implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java index 398a5401b8804..a5a545613d92e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java index a5dc292cbe597..bd88893e96593 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java @@ -24,12 +24,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java index 434963b04bde6..4492a11f98abe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import com.google.common.collect.ImmutableMap; import org.apache.tsfile.read.common.type.DoubleType; @@ -39,13 +39,13 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.IS_DISTINCT_FROM; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combinePredicates; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractPredicates; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.IS_DISTINCT_FROM; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; public final class PushDownNegationsExpressionRewriter { public static Expression pushDownNegations( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java index 9867255fe5856..7d2a8cf27ece6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java index 007b5d0f80f62..00671d417b860 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combinePredicates; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractPredicates; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java index 1ee05bc2ed2f8..b720724378f74 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java @@ -21,8 +21,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java index 35b7f726ebbdd..fe4e24867a462 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java @@ -27,6 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; @@ -42,7 +43,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.utils.constant.SqlConstant; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java index 54daf63446507..e376f7c4781f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java @@ -23,13 +23,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java index 3eead9da7f368..62732d4af05b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter; @@ -29,7 +30,6 @@ 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.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableSet; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index 01b79b83395a4..d1c8a25a8045e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -26,6 +26,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; @@ -33,9 +35,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java index 8317431d4c9e1..c1822a2b62a19 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java @@ -25,6 +25,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; @@ -33,9 +36,6 @@ 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.optimizations.PlanNodeDecorrelator; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; @@ -53,9 +53,9 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java index 4ed253c764b0e..c2ab5d05a4934 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java @@ -24,12 +24,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; 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 ec2e363996a9c..4420fd7355e49 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 @@ -26,6 +26,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; 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.function.BoundSignature; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java index 38906dadf1441..8af3f2855075f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java @@ -25,10 +25,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; 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.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java index 555a3a4c7f262..6f48f5fca83ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java index f1089e7f20380..ff56aff31ac6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java @@ -21,10 +21,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.EqualityInference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java index 7995d7db63f58..0156fd790ecc5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java @@ -28,7 +28,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; 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.Assignments; @@ -37,8 +39,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeCoercion; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; @@ -62,12 +62,12 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper.symbolMapper; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; public class PlanNodeDecorrelator { private final PlannerContext plannerContext; 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 f9d2a2c7dfde7..aaea83b797b5e 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 @@ -24,6 +24,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -32,8 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; 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.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableSet; import org.apache.tsfile.utils.Pair; 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 ca4b16eb85616..2a32cb91a5823 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 @@ -35,9 +35,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; @@ -68,11 +73,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import com.google.common.collect.ImmutableList; @@ -113,6 +113,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.RIGHT; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; 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.plan.analyze.AnalyzeVisitor.getTimePartitionSlotList; @@ -135,7 +136,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.JoinUtils.processInnerJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.JoinUtils.processLimitedOuterJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; /** * Optimization phase: Logical plan planning. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java index 319da2354bdcb..bdb1f34b8fbf6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java @@ -37,6 +37,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; @@ -45,7 +46,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java index 977830d7af03a..68b53fadb5bb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java @@ -25,7 +25,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; @@ -36,11 +41,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils; 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.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import com.google.common.collect.ImmutableList; @@ -60,15 +60,15 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.NOT_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SimplePlanRewriter.rewriteWith; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode.Quantifier.ALL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.NOT_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; 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 c0fc037faa572..68ebb677accab 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 @@ -46,6 +46,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; 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.metadata.ColumnSchema; @@ -67,8 +69,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java index e23054a7c404f..0323f4ef1769e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultTraversalVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; @@ -67,12 +68,8 @@ public static List extractParameters(Statement statement) { .getLocation() .orElseThrow( () -> new SemanticException("Parameter node must have a location")), - Comparator.comparing( - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation - ::getLineNumber) - .thenComparing( - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation - ::getColumnNumber))) + Comparator.comparing(NodeLocation::getLineNumber) + .thenComparing(NodeLocation::getColumnNumber))) .collect(toImmutableList()); } 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 f2413d61a53af..eb03d4e09faeb 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 @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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/AbstractTraverseDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractTraverseDevice.java index 07f4087168681..0c0f56f01dfb3 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 @@ -23,7 +23,9 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; 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/AddColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java index cea01ddb3ac89..63bbc7d46255a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java index 63548179d133a..b6c7a8d14a2ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllColumns.java index 0921ea84fd18c..00a58d2e44c50 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllColumns.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllRows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllRows.java index 31b268b30a4ce..4cad8430b75d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllRows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllRows.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java index e6e4ac0228870..742b3ba71a1df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java index bdf26bbd53202..0b5e485f6ff71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java index be86cafb29dad..a50cafd47f071 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java index 82db3e09cebc0..ce3e0fa0889a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java @@ -21,7 +21,10 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; @@ -33,8 +36,8 @@ import java.util.Objects; import static com.google.common.base.MoreObjects.toStringHelper; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; public class AsofJoinOn extends JoinOn { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java index a874a9f22f81f..238a3bdfc043e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.tsfile.utils.Accountable; import org.apache.tsfile.utils.RamUsageEstimator; 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 b79424b5efcf5..50694d4b687e7 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 @@ -24,30 +24,6 @@ public abstract class AstVisitor extends CommonQueryAstVisitor { - protected R visitCurrentTime(CurrentTime node, C context) { - return visitExpression(node, context); - } - - protected R visitCoalesceExpression(CoalesceExpression node, C context) { - return visitExpression(node, context); - } - - protected R visitComparisonExpression(ComparisonExpression node, C context) { - return visitExpression(node, context); - } - - protected R visitDoubleLiteral(DoubleLiteral node, C context) { - return visitLiteral(node, context); - } - - protected R visitFloatLiteral(FloatLiteral node, C context) { - return visitLiteral(node, context); - } - - protected R visitDecimalLiteral(DecimalLiteral node, C context) { - return visitLiteral(node, context); - } - protected R visitStatement(Statement node, C context) { return visitNode(node, context); } @@ -88,10 +64,6 @@ protected R visitDeallocate(Deallocate node, C context) { return visitStatement(node, context); } - protected R visitGenericLiteral(GenericLiteral node, C context) { - return visitLiteral(node, context); - } - protected R visitWith(With node, C context) { return visitNode(node, context); } @@ -156,26 +128,10 @@ protected R visitWhenClause(WhenClause node, C context) { return visitExpression(node, context); } - protected R visitInPredicate(InPredicate node, C context) { - return visitExpression(node, context); - } - - protected R visitFunctionCall(FunctionCall node, C context) { - return visitExpression(node, context); - } - protected R visitProcessingMode(ProcessingMode node, C context) { return visitNode(node, context); } - protected R visitSimpleCaseExpression(SimpleCaseExpression node, C context) { - return visitExpression(node, context); - } - - protected R visitSearchedCaseExpression(SearchedCaseExpression node, C context) { - return visitExpression(node, context); - } - protected R visitInListExpression(InListExpression node, C context) { return visitExpression(node, context); } @@ -200,14 +156,6 @@ protected R visitNullIfExpression(NullIfExpression node, C context) { return visitExpression(node, context); } - protected R visitNullLiteral(NullLiteral node, C context) { - return visitLiteral(node, context); - } - - protected R visitNotExpression(NotExpression node, C context) { - return visitExpression(node, context); - } - protected R visitWindowDefinition(WindowDefinition node, C context) { return visitNode(node, context); } @@ -240,30 +188,10 @@ protected R visitAllColumns(AllColumns node, C context) { return visitSelectItem(node, context); } - protected R visitLikePredicate(LikePredicate node, C context) { - return visitExpression(node, context); - } - - protected R visitIsNotNullPredicate(IsNotNullPredicate node, C context) { - return visitExpression(node, context); - } - - protected R visitIsNullPredicate(IsNullPredicate node, C context) { - return visitExpression(node, context); - } - - protected R visitLongLiteral(LongLiteral node, C context) { - return visitLiteral(node, context); - } - protected R visitParameter(Parameter node, C context) { return visitExpression(node, context); } - protected R visitLogicalExpression(LogicalExpression node, C context) { - return visitExpression(node, context); - } - protected R visitSubqueryExpression(SubqueryExpression node, C context) { throw new SemanticException("Only TableSubquery is supported now"); } @@ -508,22 +436,10 @@ protected R visitSimpleGroupBy(SimpleGroupBy node, C context) { return visitGroupingElement(node, context); } - protected R visitSymbolReference(SymbolReference node, C context) { - return visitExpression(node, context); - } - protected R visitQuantifiedComparisonExpression(QuantifiedComparisonExpression node, C context) { return visitExpression(node, context); } - protected R visitCurrentDatabase(CurrentDatabase node, C context) { - return visitExpression(node, context); - } - - protected R visitCurrentUser(CurrentUser node, C context) { - return visitExpression(node, context); - } - protected R visitDataType(DataType node, C context) { return visitExpression(node, context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java index 10abd82cd0b71..327185b7177fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Columns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Columns.java index 53b3586ed5a6a..5b1f98a9ce548 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Columns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Columns.java @@ -22,6 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java index a407389f470c1..c8bacb7fe922e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import com.google.common.collect.ImmutableList; 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 74c6487ef5e0d..4d01dfb5c6480 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 @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; 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/CountStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java index ac7dd7d168858..5ae24c9711983 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java index 38ef0510912c0..f8a924449f203 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java index 983ee8d477996..712a77c9161f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java index eb811feb4a6fa..c1e2c32bfcfe1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java index b36c9354c2c6c..449a004c98b95 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java index 144dbaf046ad0..c55c753309a0a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java index 26b2ecabf92a0..84da5662ecc26 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataType.java index f8db6b451b7df..9499b1a32ea9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataType.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataTypeParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataTypeParameter.java index 89429a6ce6eed..fb0ee409d6f0d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataTypeParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataTypeParameter.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java index f9a27466044f3..00c9b8a17b0c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java index 273876b4519e1..7dc361affe48b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java index 6d09b2c20b85b..28a51ad93f363 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java @@ -23,9 +23,20 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; public abstract class DefaultTraversalVisitor extends AstVisitor { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java index 5ab8264e28898..57cbfde4850f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.storageengine.dataregion.modification.TableDeletionEntry; import com.google.common.collect.ImmutableList; 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 30bdb1c177de2..aff7b5098fea6 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 @@ -27,6 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceBlackListConstructor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DereferenceExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DereferenceExpression.java index 9a039d333c246..6d211a6c3aac6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DereferenceExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DereferenceExpression.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java index 488e74e5e4056..8eb5a7b50b305 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java index 4b1efff6cf8fb..715cd5b7ae287 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java index a5211c3ce3d1a..1274a84e4c8ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java index aa6afb0d2e740..1c0517ae7b4af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java index 0367aef3a3c70..34944cdb775da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java index b736ca40a6e56..2da5f5eec8cb4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java index 0177554024f32..ce32dca6cd781 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java index 7bd0c3aff910a..5f722913ab830 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java index 9578925524573..fe91668020b7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java index 5ca07c3cdfba1..8fea448bfc1ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java index fbc02dcd62187..ca4804513ca2b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java index c3fb7d12f5c4c..cc78bc12bb126 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExistsPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExistsPredicate.java index bc11727f67441..aa715c20844ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExistsPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExistsPredicate.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java index 0950ea4720256..8a2298d2e635b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java index 9440c60231c33..3f3a1ffc2547a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java index d8ccb35af2ebe..ec0e74e904390 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java @@ -21,7 +21,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; import com.google.common.base.MoreObjects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FrameBound.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FrameBound.java index d8e46b8b52abc..648695dd0dfe1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FrameBound.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FrameBound.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericDataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericDataType.java index 98ae8dc16d227..0d3a98b197ef8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericDataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericDataType.java @@ -21,6 +21,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupBy.java index 5507393828e3e..5c9a41f6292f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupBy.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingElement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingElement.java index 623e29e0cbc62..510dfb3454291 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingElement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingElement.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingSets.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingSets.java index 5f3f8a5ad830d..fde0c87a8434f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingSets.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingSets.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Identifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Identifier.java index 62eb91e0e180b..4df8755c19fd4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Identifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Identifier.java @@ -22,6 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; import com.google.common.base.CharMatcher; import com.google.common.base.Strings; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IfExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IfExpression.java index 445a34755d249..ec7af811dffe1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IfExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IfExpression.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InListExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InListExpression.java index d9f6c46f2738b..040eefc456364 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InListExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InListExpression.java @@ -22,6 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java index aea85876dc531..e140260249a94 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java index 4f708e59c1ac4..23dd3e4990e7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; 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 index d8a3a733b2f91..e42e28e631ea1 100644 --- 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java index 5043e61a08b30..57f1195d63cf9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java @@ -21,7 +21,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java index 52ee8bcd46b01..e827226a38808 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.db.storageengine.load.config.LoadTsFileConfigurator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java index 715b4a3a5ea70..fffd801230e83 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java index bcbc7282726b0..d1dce0ee121d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullIfExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullIfExpression.java index 6e8ee92456a0c..b3a24df28a779 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullIfExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullIfExpression.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NumericParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NumericParameter.java index 0d51cef4dc02e..a47c01d84c68f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NumericParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NumericParameter.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java index 90aece43aa8ee..67aefccafb44f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java @@ -21,7 +21,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java index a4a1eb4d88e98..2796d11010a01 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OrderBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OrderBy.java index de602de26e49c..41b0f06a86440 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OrderBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OrderBy.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java index 06cf81664be0d..5461a710dc66a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java index 288067cfa8ffa..a212893bca35b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java index 95677770b9823..e3a83bcf0fbb7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java index 9a14091f47cd6..c63a0f96cd6cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternQuantifier.java index fafd85463c6d9..0467833ef8f15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternQuantifier.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java index 1d457d7943b00..66ee566312ed7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java index ed6fa17275f97..be1597fc95299 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java index e90f36ab43cdf..2002d3c4b56cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java index c13ddc184489f..68a480ab866ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java index b99045281df2c..9dc31502de199 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java index 53133b57b1c0b..9ff795ebbf249 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java @@ -19,9 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java index 0f69f74976b61..5f46277e405cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java index 7acc3411ac352..976f621e411c2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.utils.cte.CteDataStore; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QueryBody.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QueryBody.java index aa84cca0ed427..f860ad08dbb38 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QueryBody.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QueryBody.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java index 48abe9a2ece5d..d91f2b7e88f73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java index 6c47bb65ebfc4..035cd678eb857 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java @@ -20,7 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Relation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Relation.java index 88aef89607dc1..deef466130cd9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Relation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Relation.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; public abstract class Relation extends Node { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java index 6faf40006211d..68bf883f82bda 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java index 4929e93dcb09b..460cd021e9224 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Row.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Row.java index ffabf13e31303..db1bbc847d470 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Row.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Row.java @@ -22,6 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RowPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RowPattern.java index e21bff8af6dfe..946b4a321a55a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RowPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RowPattern.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; public abstract class RowPattern extends Node { protected RowPattern(NodeLocation location) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java index bb1a6f75f7956..54d6f7e3b9c3f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SelectItem.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SelectItem.java index 671783a0c55c4..7ba3185af7446 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SelectItem.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SelectItem.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; public abstract class SelectItem extends Node { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java index f1175a5bbe17f..9861bc265e02a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java index 9402c39a5d908..19eb9904c5b93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java index b8e516371f156..4b1aaf82a86b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java index eff31dc92a9ab..5e25de19134eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.protocol.session.IClientSession; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java index b060f00be747b..7b62628d48a85 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java index 5c3c73294ca85..79f1b43c3ffbf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java index ef5f7938ee13f..27487d2a4f47e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java index 08114e0fbbc73..eba2397f5accc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java index ea8b28e1db69a..7c49ae201184e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java index 9d3c79c3e0abc..2e22cfacdc3a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java index 17780d8d389d4..8505044d4ff7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java index 4cd49e2d3b1d7..342958953bbdf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java index a7d77fb18b73e..0527aa7ffa2b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java index 88cfeab3b431e..b59d745d17d52 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java index 502916c33898a..59cf7f202c167 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; 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 c113c042d6d8c..7956610522779 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 @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; 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/ShowExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java index 8c5bf94330a46..b8762fc2867d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java index b63b34c24b49f..7a2dd4084ed71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java index b725425106dfc..82979deeafeeb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java index ae114d81a8822..6f19b37f3bc2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import java.util.Optional; 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 index c027c139996d8..30e2a5980bcb1 100644 --- 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 @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java index b551fcfcd1b82..27c8e4b5c3e99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java index 25eafbd5d7cf0..5a080b3a7768f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java index bd8284fff3c6b..c1787e118a959 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleGroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleGroupBy.java index 6fa8c6a3aa2b9..6439274c749bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleGroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleGroupBy.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java index 690ad77c891dc..bc29707118436 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java index fff00a4a40140..6f4ad9cd9970a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SortItem.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SortItem.java index bcdebb0c16fe7..6f550f144e273 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SortItem.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SortItem.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java index f17904168a36d..fbac4afabd513 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Statement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Statement.java index 5d5eac4d28da2..cb37fefafa890 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Statement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Statement.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java index 043c6064107d5..b6567062d8ae2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubqueryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubqueryExpression.java index 4e030899a13f5..c30971e1dcb10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubqueryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubqueryExpression.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java index d29f62a6aa24f..4a88598123696 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java index 284c946e71c9f..36ef865bfffdf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java index 4b6effe38900d..67b4eff50eb1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java index e6cd2ba61e4ab..6045e3c7f8e4b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java index fd1cb6c5cf754..1080c2a36ac63 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java index 67f20e355f3ba..7b10cad2e20b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java index 0b809d7288c44..c5c410d6fc7a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Trim.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Trim.java index b0cefe01163ee..b316244e609b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Trim.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Trim.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java index b5070ef57dc2c..a121a60bcb748 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java index 7509458b2522a..48dabe19b669b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java index 6d64558e6c820..2a73b2a58a779 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java index e1aaac3819435..5b00d5b201ded 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java index 76963020e646a..21f5bb5c494c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java index dcf8a8b8a39fd..a5a6ea558d736 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java index 8207d461b62c3..ad88124cd5037 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WhenClause.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WhenClause.java index 4e5083c28c589..4645f0c591563 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WhenClause.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WhenClause.java @@ -22,6 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java index db3b633f35b08..379839780f978 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowFrame.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowFrame.java index b65df3e8c93bd..d324dbd8bb7bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowFrame.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowFrame.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowReference.java index 04ce30ff119be..1fae52e706b78 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowReference.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java index fbd11934d3e81..93c26d5c8a5cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java index 94993fa11b945..6abaf10d81eae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java index 17805684e0926..63601e78a6a18 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java index 9e91c2f714e1b..8404d7f74ecaf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java index 063f70ef624ac..7671f33cd261b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.tsfile.utils.RamUsageEstimator; 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 7daf59c37c61b..b354befae6175 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 @@ -40,11 +40,30 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; @@ -57,10 +76,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AnchorPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ClearCache; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ColumnDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Columns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CopyTo; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountStatement; @@ -74,9 +91,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTopic; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTraining; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateView; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Deallocate; @@ -84,7 +98,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DescribeTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; 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.DropFunction; @@ -107,7 +120,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Flush; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingElement; @@ -115,31 +127,22 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; 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.LoadConfiguration; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadModel; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MigrateRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OneOrMoreQuantifier; @@ -173,7 +176,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetColumnComment; @@ -211,7 +213,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTopics; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVariables; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVersion; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleGroupBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo; @@ -224,7 +225,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableExpressionType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionArgument; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ParsingException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ParsingException.java index 3dfc72a46a890..bb830551d0dad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ParsingException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ParsingException.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.antlr.v4.runtime.RecognitionException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java index 6eae7b0acf7bb..bb549f926c107 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlBaseListener; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlLexer; 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 index 1e655508232e6..9ec0259779d4d 100644 --- 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; @@ -28,7 +29,6 @@ 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.CountStatement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java index 445594b2f425e..b564204cc78b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java @@ -23,11 +23,11 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import com.google.common.graph.SuccessorsFunction; import com.google.common.graph.Traverser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java index 5f35f78319035..be4e0191bed79 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java @@ -25,56 +25,56 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Columns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DecimalLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingElement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; 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.QuantifiedComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleGroupBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java index 7ef2b7fac4225..c57fa1d879b5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java @@ -19,18 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; @@ -38,7 +39,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QueryBody; 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.SearchedCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; 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 f6ca0d14c7031..b31d9e8b21942 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 @@ -45,6 +45,7 @@ import org.apache.iotdb.db.exception.metadata.SeriesOverflowException; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceAttributeUpdater; @@ -69,7 +70,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableNodeLocationAddNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; 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.metric.ISchemaRegionMetric; 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 1286405c831f2..8da702dbc0b49 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 @@ -32,10 +32,10 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java index 60b71c6f7516c..6e45015297e09 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java @@ -27,10 +27,12 @@ import org.apache.iotdb.commons.schema.table.column.TagColumnSchema; import org.apache.iotdb.commons.schema.table.column.TimeColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -42,6 +44,7 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.DeviceIteratorScanOperator; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.queryengine.plan.planner.DataNodeTableOperatorGenerator; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; @@ -51,9 +54,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; @@ -98,8 +98,8 @@ public class NonAlignedTreeDeviceViewScanOperatorTreeTest { "root.NonAlignedTreeDeviceViewScanOperatorTreeTest"; private static final String tableDbName = "test"; private static final String tableViewName = "view1"; - private final TableOperatorGenerator tableOperatorGenerator = - new TableOperatorGenerator(new TestMetadata()); + private final DataNodeTableOperatorGenerator tableOperatorGenerator = + new DataNodeTableOperatorGenerator(new TestMetadata()); private final List deviceIds = new ArrayList<>(); private final List measurementSchemas = new ArrayList<>(); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java index f9e286cc15770..71281e64ee1bd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.FirstAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.FirstByAccumulator; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastByDescAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastDescAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAccumulator; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.enums.TSDataType; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java index 3e2bcec82ed5f..46c5364fecf1a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -41,6 +41,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; @@ -54,7 +55,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; // This test covers the remaining DistributionPlan cases that TSBSTest doesn't cover public class AggregationTest { 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 104ff333ad1f2..26a219c368b08 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 @@ -40,6 +40,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -69,7 +70,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; 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.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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java index e55dade60e07e..59c3757558d3f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java @@ -21,11 +21,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java index 5dbdf2903ee7f..bdc6028e4bb78 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import com.google.common.collect.ImmutableMap; import org.junit.BeforeClass; 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 5e29b5388cc55..0a8223519a4a9 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 @@ -30,7 +30,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -52,8 +54,6 @@ 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.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import com.google.common.collect.ImmutableList; @@ -75,6 +75,8 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AnalyzerTest.analyzeSQL; @@ -103,8 +105,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java index 6fc6e2b48e306..7ae0c40a92627 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java @@ -20,15 +20,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -45,6 +45,9 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.DIVIDE; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; @@ -56,9 +59,6 @@ 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.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; @Ignore // TODO public class TSBSTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index 76f5ecdca1b99..c6d553be5305d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -28,8 +28,10 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; @@ -52,8 +54,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TreeDeviceViewSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java index 2bfb4395d0e22..03f81dacb25ee 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java @@ -21,12 +21,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java index ee91ef2c106ff..2e6b4b4fd5dac 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java @@ -24,7 +24,10 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.schema.column.ColumnHeader; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; @@ -33,9 +36,6 @@ import org.apache.iotdb.db.queryengine.plan.execution.QueryExecution; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -58,6 +58,7 @@ import java.util.Optional; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; @@ -70,7 +71,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.LAST; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; import static org.powermock.api.mockito.PowerMockito.mockStatic; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java index e4b9bf5edc3a4..3697845c06875 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java @@ -24,6 +24,8 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.schema.column.ColumnHeader; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; @@ -32,9 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.execution.QueryExecution; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -53,12 +52,12 @@ import java.util.List; import java.util.Optional; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; 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.output; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.when; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java index 78ce49f85193f..51b9b38e927dd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java @@ -21,14 +21,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -36,6 +36,8 @@ import org.junit.Test; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; 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.any; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.anyTree; @@ -49,8 +51,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.LAST; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java index 3a8a0f62a04ce..0edd828bbe924 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java @@ -31,12 +31,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.LogicalIndexPointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java index 02828970d7a9f..412fa540c3b40 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -42,6 +42,9 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; @@ -57,9 +60,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; public class UncorrelatedSubqueryTest { private PlanTester planTester; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java index e83201b8f759e..35f7e99fa0f6a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java index a60849ecec339..ef7dbd70e6920 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java @@ -24,31 +24,31 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DecimalLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java index 33ee22ca61c30..6529b484185a2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.sql.ast.ComparisonExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MatchResult.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MatchResult.java index 91f53ff7eb4ef..361b477f799e1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MatchResult.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MatchResult.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import static java.util.Objects.requireNonNull; 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 926bf80891f7a..601aa3d5c8e98 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 @@ -42,6 +42,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; @@ -61,7 +62,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeAlignedDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; 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 8d7fb9e6a2992..47d8bf02ace46 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 @@ -21,10 +21,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java index 2e288acb9bad9..287b734f5ffc5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java @@ -21,10 +21,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; 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.sql.ast.SymbolReference; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java index d9f00e2958829..0a63e815d9157 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.informationschema; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import org.junit.Test; @@ -40,13 +40,13 @@ import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.STATEMENT_TABLE_MODEL; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.STATE_TABLE_MODEL; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.USER_TABLE_MODEL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; 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.filter; 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.output; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; public class CurrentQueriesTest { private final PlanTester planTester = new PlanTester(); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java index d0f7607417a37..03d54083a2f7c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java @@ -20,13 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.predicate; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.read.common.type.IntType; import org.apache.tsfile.read.common.type.LongType; From 5702c4991b1cfd827ecebb2ee537023c2a563bb3 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 13 Apr 2026 17:30:12 +0800 Subject: [PATCH 08/45] fix tests --- .../db/queryengine/plan/relational/analyzer/AsofJoinTest.java | 1 + .../db/queryengine/plan/relational/planner/CteSubqueryTest.java | 1 + .../plan/relational/planner/assertions/ExchangeNodeMatcher.java | 2 +- .../plan/relational/planner/assertions/PlanMatchingVisitor.java | 2 +- .../plan/relational/predicate/TablePredicateConversionTest.java | 2 ++ 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java index 59c3757558d3f..6305379123d09 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java index 3697845c06875..0be52409320b9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java index 93cae8b9bcabc..8f69473085840 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; 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.ExchangeNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference; import static com.google.common.base.Preconditions.checkState; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java index 1a35f6babf8db..4c2ff978ec9b6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java @@ -60,7 +60,7 @@ public MatchResult visitTableExchange(ExchangeNode node, PlanMatchPattern patter @Override public MatchResult visitProject(ProjectNode node, PlanMatchPattern pattern) { - MatchResult result = super.visitProject(node, pattern); + MatchResult result = visitSingleChildProcess(node, pattern); if (!result.isMatch()) { return result; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java index 03d54083a2f7c..b52487a66f634 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java @@ -21,7 +21,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; From ec3e3eb579869ed86bf8fd05a4a8def68114e122 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 13 Apr 2026 17:47:00 +0800 Subject: [PATCH 09/45] fix --- .../pipe/source/PipeConfigTreePatternParseVisitor.java | 2 +- .../plan/planner/TableOperatorGenerator.java | 2 +- .../db/consensus/statemachine/BaseStateMachine.java | 2 +- .../statemachine/dataregion/DataExecutionVisitor.java | 2 +- .../dataregion/DataRegionStateMachine.java | 2 +- .../dataregion/IoTConsensusDataRegionStateMachine.java | 2 +- .../schemaregion/SchemaExecutionVisitor.java | 2 +- .../schemaregion/SchemaRegionStateMachine.java | 2 +- .../plan/planner/plan/node/IPlanVisitor.java | 2 -- .../plan/planner/plan/node/PlanNode.java | 5 ++--- .../plan/node/process/MultiChildProcessNode.java | 2 +- .../plan/planner/plan/node/process/ProcessNode.java | 2 +- .../plan/node/process/SingleChildProcessNode.java | 2 +- .../plan/relational/planner/node/AggregationNode.java | 6 +++--- .../plan/relational/planner/node/AssignUniqueId.java | 6 +++--- .../plan/relational/planner/node/CollectNode.java | 6 +++--- .../relational/planner/node/EnforceSingleRowNode.java | 6 +++--- .../plan/relational/planner/node/FillNode.java | 6 +++--- .../plan/relational/planner/node/FilterNode.java | 6 +++--- .../plan/relational/planner/node/GapFillNode.java | 6 +++--- .../plan/relational/planner/node/GroupNode.java | 6 +++--- .../plan/relational/planner/node/JoinNode.java | 6 +++--- .../plan/relational/planner/node/LimitNode.java | 6 +++--- .../plan/relational/planner/node/LinearFillNode.java | 6 +++--- .../plan/relational/planner/node/MarkDistinctNode.java | 6 +++--- .../plan/relational/planner/node/MergeSortNode.java | 6 +++--- .../plan/relational/planner/node/OffsetNode.java | 6 +++--- .../plan/relational/planner/node/OutputNode.java | 6 +++--- .../planner/node/PatternRecognitionNode.java | 6 +++--- .../plan/relational/planner/node/PreviousFillNode.java | 6 +++--- .../plan/relational/planner/node/ProjectNode.java | 6 +++--- .../plan/relational/planner/node/RowNumberNode.java | 6 +++--- .../plan/relational/planner/node/SemiJoinNode.java | 6 +++--- .../plan/relational/planner/node/SortNode.java | 6 +++--- .../plan/relational/planner/node/StreamSortNode.java | 6 +++--- .../relational/planner/node/TableFunctionNode.java | 6 +++--- .../planner/node/TableFunctionProcessorNode.java | 6 +++--- .../plan/relational/planner/node/TopKNode.java | 6 +++--- .../plan/relational/planner/node/TopKRankingNode.java | 6 +++--- .../plan/relational/planner/node/UnionNode.java | 6 +++--- .../plan/relational/planner/node/ValueFillNode.java | 6 +++--- .../plan/relational/planner/node/ValuesNode.java | 6 +++--- .../plan/relational/planner/node/WindowNode.java | 6 +++--- .../binary/factory}/factory/HmacStrategiesFactory.java | 2 +- .../common/schema/PipeSchemaRegionWritePlanEvent.java | 2 +- .../receiver/visitor/PipePlanToStatementVisitor.java | 2 +- .../evolvable/request/PipeTransferPlanNodeReq.java | 2 +- .../evolvable/request/PipeTransferTabletBinaryReq.java | 2 +- .../payload/request/IoTConsensusV2TabletBinaryReq.java | 2 +- .../source/schemaregion/IoTDBSchemaRegionSource.java | 2 +- .../schemaregion/PipePlanTablePatternParseVisitor.java | 2 +- .../PipePlanTablePrivilegeParseVisitor.java | 2 +- .../schemaregion/PipePlanTreePatternParseVisitor.java | 2 +- .../PipePlanTreePrivilegeParseVisitor.java | 2 +- .../schemaregion/PipeTableStatementToPlanVisitor.java | 2 +- .../schemaregion/PipeTreeStatementToPlanVisitor.java | 2 +- .../schemaregion/SchemaRegionListeningFilter.java | 2 +- .../schemaregion/SchemaRegionListeningQueue.java | 2 +- .../thrift/impl/DataNodeInternalRPCServiceImpl.java | 2 +- .../execution/executor/RegionWriteExecutor.java | 2 +- .../execution/relational/ColumnTransformerBuilder.java | 10 +++++----- .../execution/memory/StatementMemorySourceVisitor.java | 2 +- .../memory/TableModelStatementMemorySourceVisitor.java | 2 +- .../plan/optimization/AggregationPushDown.java | 2 +- .../plan/optimization/ColumnInjectionPushDown.java | 2 +- .../plan/optimization/LimitOffsetPushDown.java | 2 +- .../OrderByExpressionWithLimitChangeToTopK.java | 2 +- .../queryengine/plan/optimization/PlanOptimizer.java | 2 +- .../plan/optimization/PredicatePushDown.java | 2 +- .../plan/planner/DataNodeTableOperatorGenerator.java | 2 +- .../plan/planner/LocalExecutionPlanContext.java | 2 +- .../plan/planner/LocalExecutionPlanner.java | 2 +- .../queryengine/plan/planner/LogicalPlanBuilder.java | 2 +- .../queryengine/plan/planner/LogicalPlanVisitor.java | 2 +- .../db/queryengine/plan/planner/LogicalPlanner.java | 2 +- .../plan/planner/OperatorTreeGenerator.java | 2 +- .../queryengine/plan/planner/SubPlanTypeExtractor.java | 2 +- .../queryengine/plan/planner/TemplatedLogicalPlan.java | 2 +- .../plan/planner/TemplatedLogicalPlanBuilder.java | 2 +- .../plan/planner/distribution/DistributionPlanner.java | 2 +- .../plan/planner/distribution/ExchangeNodeAdder.java | 2 +- .../plan/planner/distribution/NodeGroupContext.java | 2 +- .../distribution/SimpleFragmentParallelPlanner.java | 2 +- .../plan/planner/distribution/SourceRewriter.java | 2 +- .../distribution/WriteFragmentParallelPlanner.java | 2 +- .../planner/memory/PipelineMemoryEstimatorFactory.java | 2 +- .../planner/plan/AbstractFragmentParallelPlanner.java | 2 +- .../plan/planner/plan/LogicalQueryPlan.java | 2 +- .../db/queryengine/plan/planner/plan/PlanFragment.java | 2 +- .../plan/planner/plan/node/BaseSourceRewriter.java | 2 ++ .../plan/planner/plan/node/ExplainAnalyzeNode.java | 1 + .../plan/planner/plan/node/PlanGraphPrinter.java | 1 + .../plan/planner/plan/node/PlanNodeType.java | 1 + .../plan/planner/plan/node/PlanNodeUtil.java | 1 + .../plan/planner/plan/node/SimplePlanVisitor.java | 2 ++ .../plan/planner/plan/node/WritePlanNode.java | 1 + .../planner/plan/node/load/LoadSingleTsFileNode.java | 2 +- .../plan/planner/plan/node/load/LoadTsFileNode.java | 2 +- .../planner/plan/node/load/LoadTsFilePieceNode.java | 2 +- .../node/metadata/read/AbstractSchemaMergeNode.java | 2 +- .../plan/node/metadata/read/CountSchemaMergeNode.java | 2 +- .../node/metadata/read/DeviceSchemaFetchScanNode.java | 2 +- .../plan/node/metadata/read/DevicesCountNode.java | 2 +- .../plan/node/metadata/read/DevicesSchemaScanNode.java | 2 +- .../node/metadata/read/LevelTimeSeriesCountNode.java | 2 +- .../node/metadata/read/LogicalViewSchemaScanNode.java | 2 +- .../metadata/read/NodeManagementMemoryMergeNode.java | 2 +- .../plan/node/metadata/read/NodePathsConvertNode.java | 2 +- .../plan/node/metadata/read/NodePathsCountNode.java | 2 +- .../node/metadata/read/NodePathsSchemaScanNode.java | 2 +- .../node/metadata/read/PathsUsingTemplateScanNode.java | 2 +- .../plan/node/metadata/read/SchemaFetchMergeNode.java | 2 +- .../plan/node/metadata/read/SchemaFetchScanNode.java | 2 +- .../plan/node/metadata/read/SchemaQueryMergeNode.java | 2 +- .../node/metadata/read/SchemaQueryOrderByHeatNode.java | 2 +- .../plan/node/metadata/read/SchemaQueryScanNode.java | 2 +- .../node/metadata/read/SeriesSchemaFetchScanNode.java | 2 +- .../plan/node/metadata/read/TableDeviceSourceNode.java | 2 +- .../plan/node/metadata/read/TimeSeriesCountNode.java | 2 +- .../node/metadata/read/TimeSeriesSchemaScanNode.java | 2 +- .../plan/node/metadata/write/ActivateTemplateNode.java | 2 +- .../metadata/write/AlterEncodingCompressorNode.java | 2 +- .../plan/node/metadata/write/AlterTimeSeriesNode.java | 2 +- .../node/metadata/write/BatchActivateTemplateNode.java | 2 +- .../metadata/write/ConstructSchemaBlackListNode.java | 2 +- .../metadata/write/CreateAlignedTimeSeriesNode.java | 2 +- .../node/metadata/write/CreateMultiTimeSeriesNode.java | 2 +- .../plan/node/metadata/write/CreateTimeSeriesNode.java | 2 +- .../node/metadata/write/DeactivateTemplateNode.java | 2 +- .../plan/node/metadata/write/DeleteTimeSeriesNode.java | 2 +- .../write/InternalBatchActivateTemplateNode.java | 2 +- .../write/InternalCreateMultiTimeSeriesNode.java | 2 +- .../metadata/write/InternalCreateTimeSeriesNode.java | 2 +- .../node/metadata/write/PreDeactivateTemplateNode.java | 2 +- .../write/RollbackPreDeactivateTemplateNode.java | 2 +- .../metadata/write/RollbackSchemaBlackListNode.java | 2 +- .../node/metadata/write/view/AlterLogicalViewNode.java | 2 +- .../write/view/ConstructLogicalViewBlackListNode.java | 2 +- .../metadata/write/view/CreateLogicalViewNode.java | 2 +- .../metadata/write/view/DeleteLogicalViewNode.java | 2 +- .../write/view/RollbackLogicalViewBlackListNode.java | 2 +- .../plan/node/pipe/PipeEnrichedDeleteDataNode.java | 2 +- .../planner/plan/node/pipe/PipeEnrichedInsertNode.java | 2 +- .../plan/node/pipe/PipeEnrichedNonWritePlanNode.java | 2 +- .../plan/node/pipe/PipeEnrichedWritePlanNode.java | 2 +- .../plan/node/pipe/PipeOperateSchemaQueueNode.java | 2 +- .../planner/plan/node/process/AI/InferenceNode.java | 2 +- .../plan/node/process/ActiveRegionScanMergeNode.java | 2 +- .../plan/node/process/AggregationMergeSortNode.java | 2 +- .../planner/plan/node/process/AggregationNode.java | 2 +- .../plan/planner/plan/node/process/CollectNode.java | 2 +- .../planner/plan/node/process/ColumnInjectNode.java | 2 +- .../planner/plan/node/process/DeviceMergeNode.java | 2 +- .../planner/plan/node/process/DeviceViewIntoNode.java | 2 +- .../plan/planner/plan/node/process/DeviceViewNode.java | 2 +- .../plan/planner/plan/node/process/ExchangeNode.java | 2 +- .../plan/planner/plan/node/process/FillNode.java | 2 +- .../plan/planner/plan/node/process/FilterNode.java | 2 +- .../planner/plan/node/process/GroupByLevelNode.java | 2 +- .../plan/planner/plan/node/process/GroupByTagNode.java | 2 +- .../plan/node/process/HorizontallyConcatNode.java | 2 +- .../plan/planner/plan/node/process/IntoNode.java | 2 +- .../plan/planner/plan/node/process/LimitNode.java | 2 +- .../plan/planner/plan/node/process/MergeSortNode.java | 2 +- .../plan/planner/plan/node/process/OffsetNode.java | 2 +- .../plan/planner/plan/node/process/ProjectNode.java | 2 +- .../plan/node/process/RawDataAggregationNode.java | 2 +- .../plan/node/process/SingleDeviceViewNode.java | 2 +- .../node/process/SlidingWindowAggregationNode.java | 2 +- .../plan/planner/plan/node/process/SortNode.java | 2 +- .../plan/planner/plan/node/process/TopKNode.java | 2 +- .../plan/planner/plan/node/process/TransformNode.java | 2 +- .../planner/plan/node/process/TwoChildProcessNode.java | 2 +- .../plan/node/process/join/FullOuterTimeJoinNode.java | 2 +- .../plan/node/process/join/InnerTimeJoinNode.java | 2 +- .../plan/node/process/join/LeftOuterTimeJoinNode.java | 2 +- .../plan/node/process/last/LastQueryCollectNode.java | 2 +- .../plan/node/process/last/LastQueryMergeNode.java | 2 +- .../planner/plan/node/process/last/LastQueryNode.java | 2 +- .../plan/node/process/last/LastQueryTransformNode.java | 2 +- .../plan/planner/plan/node/sink/IdentitySinkNode.java | 2 +- .../planner/plan/node/sink/MultiChildrenSinkNode.java | 2 +- .../plan/planner/plan/node/sink/ShuffleSinkNode.java | 2 +- .../plan/planner/plan/node/sink/SinkNode.java | 2 +- .../node/source/AlignedSeriesAggregationScanNode.java | 2 +- .../plan/node/source/AlignedSeriesScanNode.java | 2 +- .../planner/plan/node/source/DeviceRegionScanNode.java | 2 +- .../planner/plan/node/source/LastQueryScanNode.java | 2 +- .../plan/node/source/SeriesAggregationScanNode.java | 2 +- .../plan/planner/plan/node/source/SeriesScanNode.java | 2 +- .../planner/plan/node/source/SeriesScanSourceNode.java | 2 +- .../planner/plan/node/source/ShowDiskUsageNode.java | 2 +- .../plan/planner/plan/node/source/ShowQueriesNode.java | 2 +- .../plan/planner/plan/node/source/SourceNode.java | 2 +- .../plan/node/source/TimeseriesRegionScanNode.java | 2 +- .../planner/plan/node/source/VirtualSourceNode.java | 2 +- .../plan/node/write/AbstractDeleteDataNode.java | 2 +- .../write/ContinuousSameSearchIndexSeparatorNode.java | 2 +- .../plan/planner/plan/node/write/DeleteDataNode.java | 2 +- .../plan/node/write/InsertMultiTabletsNode.java | 2 +- .../plan/planner/plan/node/write/InsertNode.java | 2 +- .../plan/planner/plan/node/write/InsertRowNode.java | 2 +- .../plan/planner/plan/node/write/InsertRowsNode.java | 2 +- .../plan/node/write/InsertRowsOfOneDeviceNode.java | 2 +- .../plan/planner/plan/node/write/InsertTabletNode.java | 2 +- .../plan/planner/plan/node/write/ObjectNode.java | 2 +- .../plan/node/write/RelationalDeleteDataNode.java | 2 +- .../plan/relational/planner/ExpressionExtractor.java | 2 +- .../plan/relational/planner/NodeAndMappings.java | 2 +- .../plan/relational/planner/PlanBuilder.java | 2 +- .../plan/relational/planner/PlanNodeSearcher.java | 2 +- .../plan/relational/planner/QueryPlanner.java | 2 +- .../plan/relational/planner/RelationPlan.java | 2 +- .../plan/relational/planner/RelationPlanner.java | 2 +- .../plan/relational/planner/SimplePlanRewriter.java | 2 +- .../plan/relational/planner/SubqueryPlanner.java | 2 +- .../plan/relational/planner/SymbolsExtractor.java | 2 +- .../plan/relational/planner/TableLogicalPlanner.java | 2 +- .../planner/distribute/AddExchangeNodes.java | 2 +- .../planner/distribute/SubPlanGenerator.java | 2 +- .../distribute/TableDistributedPlanGenerator.java | 2 +- .../planner/distribute/TableDistributedPlanner.java | 2 +- .../distribute/TableModelQueryFragmentPlanner.java | 2 +- .../distribute/TableModelTypeProviderExtractor.java | 2 +- .../relational/planner/iterative/GroupReference.java | 2 +- .../planner/iterative/IterativeOptimizer.java | 2 +- .../plan/relational/planner/iterative/Lookup.java | 2 +- .../plan/relational/planner/iterative/Memo.java | 2 +- .../plan/relational/planner/iterative/Plans.java | 2 +- .../plan/relational/planner/iterative/Rule.java | 2 +- .../iterative/rule/AggregationDecorrelation.java | 2 +- .../planner/iterative/rule/GatherAndMergeWindows.java | 2 +- .../iterative/rule/ImplementPatternRecognition.java | 2 +- .../iterative/rule/ImplementTableFunctionSource.java | 2 +- .../planner/iterative/rule/InlineProjections.java | 2 +- .../rule/MergeLimitOverProjectWithMergeSort.java | 2 +- .../iterative/rule/MergeLimitWithMergeSort.java | 2 +- .../MultipleDistinctAggregationToMarkDistinct.java | 2 +- .../planner/iterative/rule/ProjectOffPushDownRule.java | 2 +- .../iterative/rule/PruneAggregationColumns.java | 2 +- .../planner/iterative/rule/PruneApplyColumns.java | 2 +- .../iterative/rule/PruneApplySourceColumns.java | 2 +- .../iterative/rule/PruneAssignUniqueIdColumns.java | 2 +- .../iterative/rule/PruneCorrelatedJoinColumns.java | 2 +- .../iterative/rule/PruneDistinctAggregation.java | 2 +- .../iterative/rule/PruneEnforceSingleRowColumns.java | 2 +- .../planner/iterative/rule/PruneFillColumns.java | 2 +- .../planner/iterative/rule/PruneFilterColumns.java | 2 +- .../planner/iterative/rule/PruneGapFillColumns.java | 2 +- .../planner/iterative/rule/PruneJoinColumns.java | 2 +- .../planner/iterative/rule/PruneLimitColumns.java | 2 +- .../iterative/rule/PruneMarkDistinctColumns.java | 2 +- .../planner/iterative/rule/PruneOffsetColumns.java | 2 +- .../planner/iterative/rule/PruneProjectColumns.java | 2 +- .../planner/iterative/rule/PruneSortColumns.java | 2 +- .../rule/PruneTableFunctionProcessorColumns.java | 2 +- .../planner/iterative/rule/PruneTableScanColumns.java | 2 +- .../planner/iterative/rule/PruneTopKColumns.java | 2 +- .../planner/iterative/rule/PruneUnionColumns.java | 2 +- .../planner/iterative/rule/PruneWindowColumns.java | 2 +- .../planner/iterative/rule/PushLimitThroughUnion.java | 2 +- .../iterative/rule/PushProjectionThroughUnion.java | 2 +- .../planner/iterative/rule/PushTopKThroughUnion.java | 2 +- .../iterative/rule/RemoveEmptyExceptBranches.java | 2 +- .../iterative/rule/RemoveEmptyUnionBranches.java | 2 +- .../rule/RemoveUnreferencedScalarSubqueries.java | 2 +- .../planner/iterative/rule/SetOperationMerge.java | 2 +- .../iterative/rule/SetOperationNodeTranslator.java | 2 +- ...ormCorrelatedDistinctAggregationWithProjection.java | 2 +- ...CorrelatedDistinctAggregationWithoutProjection.java | 2 +- ...sformCorrelatedGlobalAggregationWithProjection.java | 2 +- ...rmCorrelatedGlobalAggregationWithoutProjection.java | 2 +- ...formCorrelatedGroupedAggregationWithProjection.java | 2 +- ...mCorrelatedGroupedAggregationWithoutProjection.java | 2 +- .../iterative/rule/TransformCorrelatedJoinToJoin.java | 2 +- .../rule/TransformCorrelatedScalarSubquery.java | 2 +- .../rule/TransformExistsApplyToCorrelatedJoin.java | 2 +- .../rule/TransformFilteringSemiJoinToInnerJoin.java | 2 +- .../plan/relational/planner/iterative/rule/Util.java | 2 +- .../plan/relational/planner/node/ApplyNode.java | 2 +- .../plan/relational/planner/node/ChildReplacer.java | 2 +- .../plan/relational/planner/node/CopyToNode.java | 2 +- .../relational/planner/node/CorrelatedJoinNode.java | 2 +- .../plan/relational/planner/node/CteScanNode.java | 2 +- .../plan/relational/planner/node/ExceptNode.java | 2 +- .../plan/relational/planner/node/ExchangeNode.java | 2 +- .../relational/planner/node/ExplainAnalyzeNode.java | 2 +- .../planner/node/InformationSchemaTableScanNode.java | 2 +- .../plan/relational/planner/node/IntersectNode.java | 2 +- .../plan/relational/planner/node/IntoNode.java | 2 +- .../plan/relational/planner/node/Patterns.java | 2 +- .../plan/relational/planner/node/SetOperationNode.java | 2 +- .../TableDiskUsageInformationSchemaTableScanNode.java | 2 +- .../plan/relational/planner/node/TableScanNode.java | 2 +- .../node/schema/AbstractTableDeviceQueryNode.java | 2 +- .../node/schema/AbstractTableDevicesDeletionNode.java | 2 +- ...stractTableSchemaQueryAttributeSecurityVisitor.java | 2 +- .../schema/ConstructTableDevicesBlackListNode.java | 2 +- .../node/schema/CreateOrUpdateTableDeviceNode.java | 2 +- .../planner/node/schema/DeleteTableDeviceNode.java | 2 +- .../node/schema/DeleteTableDevicesInBlackListNode.java | 2 +- .../node/schema/RollbackTableDevicesBlackListNode.java | 2 +- .../node/schema/TableAttributeColumnDropNode.java | 2 +- .../schema/TableDeviceAttributeCommitUpdateNode.java | 2 +- .../node/schema/TableDeviceAttributeUpdateNode.java | 2 +- .../planner/node/schema/TableDeviceFetchNode.java | 2 +- .../planner/node/schema/TableDeviceQueryCountNode.java | 2 +- .../planner/node/schema/TableDeviceQueryScanNode.java | 2 +- .../planner/node/schema/TableNodeLocationAddNode.java | 2 +- .../planner/optimizations/AdaptivePlanOptimizer.java | 2 +- .../optimizations/CheckSubqueryNodesAreRewritten.java | 2 +- .../planner/optimizations/ParallelizeGrouping.java | 2 +- .../planner/optimizations/PlanNodeDecorrelator.java | 2 +- .../planner/optimizations/PlanOptimizer.java | 2 +- .../optimizations/PushAggregationIntoTableScan.java | 2 +- .../optimizations/PushLimitOffsetIntoTableScan.java | 2 +- .../optimizations/PushPredicateIntoTableScan.java | 2 +- .../planner/optimizations/QueryCardinalityUtil.java | 2 +- .../planner/optimizations/SortElimination.java | 2 +- .../relational/planner/optimizations/SymbolMapper.java | 2 +- .../TransformAggregationToStreamable.java | 2 +- ...sformQuantifiedComparisonApplyToCorrelatedJoin.java | 2 +- .../optimizations/TransformSortToStreamSort.java | 2 +- .../planner/optimizations/UnaliasSymbolReferences.java | 2 +- .../plan/scheduler/FragmentInstanceDispatcherImpl.java | 2 +- .../plan/scheduler/load/LoadTsFileDispatcherImpl.java | 2 +- .../statistics/FragmentInstanceStatisticsDrawer.java | 2 +- .../logfile/visitor/SchemaRegionPlanSerializer.java | 2 +- .../storageengine/dataregion/wal/buffer/WALEntry.java | 2 +- .../iotdb/db/trigger/executor/TriggerFireVisitor.java | 2 +- .../source/PipePlanTablePatternParseVisitorTest.java | 2 +- .../sink/SinkOperatorDownStreamNodeIdTest.java | 2 +- .../plan/optimization/AggregationPushDownTest.java | 2 +- .../plan/optimization/ColumnInjectionPushDownTest.java | 2 +- .../plan/optimization/LimitOffsetPushDownTest.java | 2 +- .../plan/optimization/OptimizationTestUtil.java | 2 +- .../plan/optimization/PredicatePushDownTest.java | 2 +- .../queryengine/plan/optimization/TestPlanBuilder.java | 2 +- .../plan/planner/FragmentInstanceSerdeTest.java | 2 +- .../queryengine/plan/planner/PipelineBuilderTest.java | 2 +- .../distribution/AggregationAlignByDeviceTest.java | 2 +- .../distribution/AggregationDistributionTest.java | 2 +- .../AlignByDeviceOrderByLimitOffsetTest.java | 2 +- .../AlignByTimeOrderByLimitOffsetTest.java | 2 +- .../plan/planner/distribution/AlignedByDeviceTest.java | 2 +- .../distribution/DistributionPlannerBasicTest.java | 2 +- .../distribution/DistributionPlannerCycleTest.java | 2 +- .../plan/planner/distribution/LastQueryTest.java | 2 +- .../planner/distribution/NoDataRegionPlanningTest.java | 2 +- .../planner/distribution/RegionScanPlanningTest.java | 2 +- .../db/queryengine/plan/planner/distribution/Util.java | 2 +- .../queryengine/plan/planner/distribution/Util2.java | 2 +- .../planner/logical/DataQueryLogicalPlannerTest.java | 2 +- .../plan/planner/logical/LogicalPlannerTestUtil.java | 2 +- .../planner/logical/RegionScanLogicalPlannerTest.java | 2 +- .../planner/logical/SchemaQueryLogicalPlannerTest.java | 2 +- .../plan/planner/node/PlanNodeDeserializeHelper.java | 2 +- .../metadata/write/MetadataWriteNodeSerDeTest.java | 2 +- .../node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java | 2 +- .../pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java | 2 +- .../node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java | 2 +- .../planner/node/process/TimeJoinNodeSerdeTest.java | 2 +- .../plan/planner/node/process/WindowNodeSerdeTest.java | 2 +- .../planner/node/write/DeleteDataNodeSerdeTest.java | 2 +- .../plan/node/write/RelationalDeleteDataNodeTest.java | 2 +- .../plan/relational/analyzer/AnalyzerTest.java | 2 +- .../plan/relational/analyzer/InsertIntoQueryTest.java | 2 +- .../queryengine/plan/relational/analyzer/JoinTest.java | 2 +- .../relational/analyzer/LimitOffsetPushDownTest.java | 2 +- .../analyzer/PushAggregationThroughUnionTest.java | 2 +- .../queryengine/plan/relational/analyzer/SortTest.java | 2 +- .../plan/relational/analyzer/SubQueryTest.java | 2 +- .../queryengine/plan/relational/analyzer/TSBSTest.java | 2 +- .../plan/relational/analyzer/TestPlanBuilder.java | 2 +- .../plan/relational/analyzer/TestUtils.java | 2 +- .../planner/PatternRecognitionNodeSerdeTest.java | 2 +- .../plan/relational/planner/PlanTester.java | 2 +- .../assertions/AggregationDeviceTableScanMatcher.java | 2 +- .../planner/assertions/AggregationFunctionMatcher.java | 2 +- .../planner/assertions/AggregationMatcher.java | 2 +- .../planner/assertions/AggregationStepMatcher.java | 2 +- .../relational/planner/assertions/AliasMatcher.java | 2 +- .../relational/planner/assertions/AliasPresent.java | 2 +- .../planner/assertions/AssignUniqueIdMatcher.java | 2 +- .../planner/assertions/BaseStrictSymbolsMatcher.java | 2 +- .../relational/planner/assertions/ColumnReference.java | 2 +- .../relational/planner/assertions/CteScanMatcher.java | 2 +- .../planner/assertions/DeviceTableScanMatcher.java | 2 +- .../planner/assertions/ExchangeNodeMatcher.java | 2 +- .../planner/assertions/ExpressionMatcher.java | 2 +- .../relational/planner/assertions/FilterMatcher.java | 2 +- .../relational/planner/assertions/GroupMatcher.java | 2 +- .../planner/assertions/IdentityProjectionMatcher.java | 2 +- .../assertions/InformationSchemaTableScanMatcher.java | 2 +- .../relational/planner/assertions/JoinMatcher.java | 2 +- .../relational/planner/assertions/LimitMatcher.java | 2 +- .../planner/assertions/MarkDistinctMatcher.java | 2 +- .../plan/relational/planner/assertions/Matcher.java | 2 +- .../planner/assertions/NotPlanNodeMatcher.java | 2 +- .../relational/planner/assertions/OffsetMatcher.java | 2 +- .../relational/planner/assertions/OutputMatcher.java | 2 +- .../plan/relational/planner/assertions/PlanAssert.java | 2 +- .../planner/assertions/PlanMatchPattern.java | 2 +- .../planner/assertions/PlanMatchingVisitor.java | 2 +- .../relational/planner/assertions/PlanNodeMatcher.java | 2 +- .../planner/assertions/PredicateMatcher.java | 2 +- .../relational/planner/assertions/RvalueMatcher.java | 2 +- .../relational/planner/assertions/SemiJoinMatcher.java | 2 +- .../relational/planner/assertions/SortMatcher.java | 2 +- .../assertions/StrictAssignedSymbolsMatcher.java | 2 +- .../planner/assertions/StrictSymbolsMatcher.java | 2 +- .../assertions/TableFunctionProcessorMatcher.java | 2 +- .../planner/assertions/TableScanMatcher.java | 2 +- .../relational/planner/assertions/TopKMatcher.java | 2 +- .../planner/assertions/WindowFunctionMatcher.java | 2 +- .../binary/hmac/HmacMd5ColumnTransformerTest.java | 2 +- .../binary/hmac/HmacSha1ColumnTransformerTest.java | 2 +- .../binary/hmac/HmacSha256ColumnTransformerTest.java | 2 +- .../binary/hmac/HmacSha512ColumnTransformerTest.java | 2 +- .../dataregion/wal/node/ConsensusReqReaderTest.java | 2 +- 420 files changed, 486 insertions(+), 480 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/planner/plan/node/PlanNode.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag/column/binary => node_commons/transformation/dag/column/binary/factory}/factory/HmacStrategiesFactory.java (97%) diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTreePatternParseVisitor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTreePatternParseVisitor.java index fe86bf5f2f5d5..d7e275ab3426e 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTreePatternParseVisitor.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTreePatternParseVisitor.java @@ -42,7 +42,7 @@ import org.apache.iotdb.confignode.consensus.request.write.template.CreateSchemaTemplatePlan; import org.apache.iotdb.confignode.consensus.request.write.template.ExtendSchemaTemplatePlan; import org.apache.iotdb.confignode.manager.pipe.event.PipeConfigRegionWritePlanEvent; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.schemaengine.template.alter.TemplateExtendInfo; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 26193edf5bfb6..4b49f66efea7e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -145,7 +146,6 @@ import org.apache.iotdb.db.queryengine.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionKind; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java index 3b9651a1f1dc4..369cb4c72bed8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java @@ -22,8 +22,8 @@ import org.apache.iotdb.consensus.IStateMachine; import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest; import org.apache.iotdb.consensus.common.request.IConsensusRequest; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.slf4j.Logger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java index 2290b8efd7ad9..fcb00252e7226 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java @@ -29,7 +29,7 @@ import org.apache.iotdb.db.exception.query.OutOfTTLException; import org.apache.iotdb.db.exception.runtime.TableLostRuntimeException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedInsertNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachine.java index 5fa375406b896..89b090a05fc7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachine.java @@ -29,10 +29,10 @@ import org.apache.iotdb.consensus.iot.log.GetConsensusReqReaderPlan; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.statemachine.BaseStateMachine; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.SearchNode; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.db.storageengine.buffer.BloomFilterCache; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java index 240c1b1caa0fe..7bff200b7d73c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java @@ -28,7 +28,7 @@ import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.common.request.IndexedConsensusRequest; import org.apache.iotdb.consensus.common.request.IoTConsensusRequest; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java index 05b5735ab7666..ad3f7b56e53cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java @@ -31,9 +31,9 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.exception.metadata.MeasurementAlreadyExistException; import org.apache.iotdb.db.exception.metadata.template.TemplateIsInUseException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningQueue; -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.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java index bc2baacb13682..06653ad4dd8ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java @@ -27,11 +27,11 @@ import org.apache.iotdb.consensus.ratis.utils.Utils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.statemachine.BaseStateMachine; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningQueue; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; import org.apache.iotdb.db.schemaengine.schemaregion.attribute.update.GeneralRegionAttributeSecurityService; import org.apache.iotdb.db.tools.schema.SchemaRegionSnapshotParser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java index 515598edc053b..ff9278fdafdaa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java @@ -14,8 +14,6 @@ package org.apache.iotdb.db.node_commons.plan.planner.plan.node; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; - public interface IPlanVisitor { default R process(PlanNode node, C context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java index 70e23228c7f2a..16cbb65fbdaa2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java @@ -17,14 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.planner.plan.node; +package org.apache.iotdb.db.node_commons.plan.planner.plan.node; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; import org.apache.iotdb.consensus.common.request.IConsensusRequest; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.PublicBAOS; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java index 7781971156f14..c101cce5771b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.node_commons.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/ProcessNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/ProcessNode.java index c02caa21f7889..7092f5cf82563 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/ProcessNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/ProcessNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.node_commons.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; public abstract class ProcessNode extends PlanNode { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java index dd48b789d1f46..f3608fc5bd6b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.node_commons.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java index 1e78e26bf2e1a..b1c36dc4c8cbf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -27,9 +29,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; @@ -220,7 +220,7 @@ public boolean hasOrderings() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitAggregation(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitAggregation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java index 94524a16b1940..daa9cfca66dda 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -49,7 +49,7 @@ public AssignUniqueId(PlanNodeId id, PlanNode child, Symbol idColumn) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitAssignUniqueId(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitAssignUniqueId(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java index 2c6d618c30e4a..67ec71d4d07d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -58,7 +58,7 @@ public CollectNode(PlanNodeId id, List children, List outputSy @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitCollect(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitCollect(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java index e972bd841244c..2988b159ec887 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.Iterables; @@ -51,7 +51,7 @@ public PlanNode getSource() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitEnforceSingleRow(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitEnforceSingleRow(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FillNode.java index fa1460989cd5a..a0b852b7e9a4b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FillNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.util.List; @@ -36,7 +36,7 @@ protected FillNode(PlanNodeId id, PlanNode child) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitFill(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java index 3c61c991d8704..83dc90458abf4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.base.Objects; import com.google.common.collect.Iterables; @@ -46,7 +46,7 @@ public FilterNode(PlanNodeId id, PlanNode child, Expression predicate) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitFilter(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitFilter(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java index c54bf62fbda8d..a36152c5d11c9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -102,7 +102,7 @@ public long getNonMonthDuration() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitGapFill(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitGapFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java index 878ded203bec8..11d8722ccb6e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.OrderingScheme; import com.google.common.collect.Iterables; @@ -69,7 +69,7 @@ public int getPartitionKeyCount() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitGroup(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitGroup(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java index a681ae15c0d40..3415b45ddbeb9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.process.TwoChildProcessNode; import com.google.common.collect.ImmutableList; @@ -176,7 +176,7 @@ public JoinNode flip() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitJoin(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java index 33f23cfb33e7d..205b11d7dbbd7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.OrderingScheme; import com.google.common.base.Objects; @@ -73,7 +73,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitLimit(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitLimit(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java index 1b086368454dc..952e67c7c607b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -66,7 +66,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitLinearFill(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitLinearFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java index e15a22b7c8774..0e5bfd7993bc9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -99,7 +99,7 @@ public Optional getHashSymbol() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitMarkDistinct(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitMarkDistinct(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java index 27d87b65fee7f..0dc6097e98894 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java @@ -18,13 +18,13 @@ */ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.OrderingScheme; import com.google.common.base.Objects; @@ -66,7 +66,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitMergeSort(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitMergeSort(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java index 535f98db7c790..9bbe0194b5b72 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.base.Objects; import com.google.common.collect.Iterables; @@ -56,7 +56,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitOffset(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitOffset(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java index 94316bae454b8..aeb7a867349ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; @@ -70,7 +70,7 @@ public OutputNode(PlanNodeId id, List columnNames, List outputSy @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitOutput(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitOutput(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java index 7f1dca12b6707..a3106c5bbbded 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; @@ -143,7 +143,7 @@ public Map getVariableDefinitions() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitPatternRecognition(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitPatternRecognition(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java index 5a5be97f9cffa..0c9765ffc0d86 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -79,7 +79,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitPreviousFill(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitPreviousFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java index 1adc31aee9e7f..7cef21f3bafce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.Assignments; import com.google.common.base.Objects; @@ -49,7 +49,7 @@ public ProjectNode(PlanNodeId id, PlanNode child, Assignments assignments) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitProject(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitProject(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java index 78affaa40c631..607cac039409e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; @@ -101,7 +101,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitRowNumber(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitRowNumber(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java index 5059b21d8f61d..885979bc92a58 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.process.TwoChildProcessNode; import com.google.common.collect.ImmutableList; @@ -99,7 +99,7 @@ public List getOutputSymbols() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitSemiJoin(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitSemiJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java index 2fe90f8bd9d5b..5a9d61628ca8a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.OrderingScheme; import com.google.common.base.Objects; @@ -67,7 +67,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitSort(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitSort(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java index 4f20385ebf968..db66a8c564696 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.OrderingScheme; import com.google.common.base.Objects; @@ -69,7 +69,7 @@ public PlanNode replaceChildren(List newChildren) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitStreamSort(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitStreamSort(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java index e4c70990cf0a8..821c2982414b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.TableMetadataImpl; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; @@ -244,7 +244,7 @@ public static TableFunctionNode deserialize(ByteBuffer byteBuffer) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitTableFunction(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitTableFunction(this, context); } public static class TableArgumentProperties { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java index a8541a921d9f0..170391d03328c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.TableMetadataImpl; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; @@ -184,7 +184,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitTableFunctionProcessor(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitTableFunctionProcessor(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java index a1cac72a39e62..3aefbc2ee4461 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.OrderingScheme; import com.google.common.base.Objects; @@ -83,7 +83,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitTopK(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitTopK(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java index 246df489e788a..6fb37b5ac92f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.DataOrganizationSpecification; import com.google.common.base.Objects; @@ -97,7 +97,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitTopKRanking(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitTopKRanking(this, context); } public DataOrganizationSpecification getSpecification() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java index 13741eebdb080..13a375318a173 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.planner.node.SetOperationNode; import com.google.common.collect.ImmutableListMultimap; @@ -63,7 +63,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitUnion(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitUnion(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java index ea8e86b9e1c29..547b2b590f424 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.Iterables; @@ -54,7 +54,7 @@ public PlanNode clone() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitValueFill(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitValueFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java index dd1ccf0be1f28..f80325c37b85b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.sql.ast.Row; @@ -117,7 +117,7 @@ public ValuesNode( @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitValuesNode(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitValuesNode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java index 8af9a5d71bcce..8e430157f03ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; @@ -155,7 +155,7 @@ public PlanNode replaceChildren(List newChildren) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitWindowFunction(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitWindowFunction(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/factory/HmacStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/binary/factory/factory/HmacStrategiesFactory.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/factory/HmacStrategiesFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/binary/factory/factory/HmacStrategiesFactory.java index 9228c728eb2e1..453456da877be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/factory/HmacStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/binary/factory/factory/HmacStrategiesFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory; +package org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java index bc04f11ff3edb..7ea1ad1938d8e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.PipeWritePlanEvent; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java index 3115ced539378..a0c311c7d6a41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java index 6c33541c59f7b..ce5af01a8de20 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion; import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java index a561540632939..47c00bcf26510 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion; import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.receiver.protocol.thrift.IoTDBDataNodeReceiver; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletBinaryReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletBinaryReq.java index b28ce042f416e..de6c03b958d2c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletBinaryReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletBinaryReq.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestVersion; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TCommitId; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TIoTConsensusV2TransferReq; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java index de848a7c80eee..a139811b602dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java @@ -36,6 +36,7 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; @@ -47,7 +48,6 @@ import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeOperateSchemaQueueNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java index 7d122b88d2fd4..ed60604a13b75 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.pipe.source.schemaregion; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java index 457c372390b4e..3a3b986097a9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.audit.IAuditEntity; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java index 03e06ae507042..9290779c86ba9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePatternOperations; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent; -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.planner.plan.node.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java index b6a0b9531c942..de52db604e927 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePattern; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java index 812c174a1f3f9..9767fdf79db7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.source.schemaregion; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateOrUpdateDevice; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java index 13901264868b9..112b4f447b5d4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.source.schemaregion; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.BatchActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalCreateMultiTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java index b0501d00ae63b..b8492f3d7f2b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.utils.PathUtils; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; import org.apache.iotdb.db.schemaengine.SchemaEngine; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningQueue.java index 4ff85cff119b1..19099abbd007c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningQueue.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningQueue.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.pipe.datastructure.queue.listening.AbstractPipeListeningQueue; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.SerializableEvent; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionSnapshotEvent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaSerializableEventType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedNonWritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedWritePlanNode; import org.apache.iotdb.pipe.api.event.Event; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java index 608b409a28a62..b0928529e4413 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -105,6 +105,7 @@ import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.partition.DataPartitionTableGenerator; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; @@ -150,7 +151,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePieceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java index 6b17d3bbf1616..b01cad4d377c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java @@ -41,8 +41,8 @@ import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; import org.apache.iotdb.db.exception.metadata.MeasurementAlreadyExistException; import org.apache.iotdb.db.exception.metadata.SchemaQuotaExceededException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.protocol.thrift.impl.DataNodeRegionManager; -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.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java index 31f6e7b266ed3..219b0e1630e85 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java @@ -86,7 +86,7 @@ import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareNonEqualColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.Like2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.ConstantColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; @@ -237,10 +237,10 @@ import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; 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 4dd481d847c05..065b459537bae 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 @@ -26,12 +26,12 @@ 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.node_commons.plan.planner.plan.node.PlanNode; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor; import org.apache.iotdb.db.queryengine.plan.statement.metadata.CountDevicesStatement; 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 e1a1c9a6d7bca..58e3603f8376e 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 @@ -21,13 +21,13 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.schema.column.ColumnHeader; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.TableLogicalPlanner; 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 1dfd80025ac37..fcb6013e9a8c8 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 @@ -25,6 +25,7 @@ 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.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -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.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java index f7c83903d9b10..bc7de51a91dce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.optimization; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; -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.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ColumnInjectNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java index 2ca6fc7cb8411..fbb9a2c41172b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.optimization; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.CollectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java index 25b0bfa69c7d0..02834f2f4639c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.optimization; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; -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.planner.plan.node.process.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PlanOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PlanOptimizer.java index 03d6e3c7e5b4c..803c40d1e06ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PlanOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PlanOptimizer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.optimization; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; public interface PlanOptimizer { PlanNode optimize(PlanNode plan, Analysis analysis, MPPQueryContext context); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java index 65fabf0e3a5ed..b0f2c66be70be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java @@ -23,6 +23,7 @@ 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.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -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.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index acf48f3b97a52..27d393744c34b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; @@ -85,7 +86,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.queryengine.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; -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.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java index 5e8d37a2e0e02..e06f90fa2548f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimatorFactory; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java index e1d6cb79adbe5..30cc8970c8c22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java @@ -26,6 +26,7 @@ import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; @@ -37,7 +38,6 @@ import org.apache.iotdb.db.queryengine.metric.QueryRelatedResourceMetricSet; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; -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.metadata.TableMetadataImpl; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; 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 8709ffb04a995..a840f447bb794 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 @@ -30,6 +30,7 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.template.Template; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -43,7 +44,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesCountNode; 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 f69fbd91196a1..47695ce2683b5 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 @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFileNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanner.java index c2a757ba10548..580040ff5297f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanner.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.queryengine.plan.optimization.PlanOptimizer; import org.apache.iotdb.db.queryengine.plan.optimization.PredicatePushDown; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.Arrays; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index f562d0000574f..f1fda1e18fa21 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -30,6 +30,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.common.DeviceContext; @@ -178,7 +179,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimatorFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; -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.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/SubPlanTypeExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/SubPlanTypeExtractor.java index 48e592631dd73..0c01957018bed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/SubPlanTypeExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/SubPlanTypeExtractor.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.commons.path.AlignedPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; 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 5634785a21487..dfb65abe44c5e 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 @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; 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 19dcc8ee66d3c..0a7d369565854 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 @@ -22,10 +22,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.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanner.java index 8720d1abc4099..06d811b04a031 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanner.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java index f7895e05a1bcd..008ec3909591f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.partition.DataPartition; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; -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.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.AbstractSchemaMergeNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NodeGroupContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NodeGroupContext.java index fb4cdd45dcfea..2612a83c7e056 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NodeGroupContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NodeGroupContext.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.partition.DataPartition; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java index f6ed3ced36add..d9005b42bec7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.TreeModelTimePredicate; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.MultiChildrenSinkNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.LastQueryScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java index eb186e8109fa2..2476939c13c64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java @@ -30,6 +30,7 @@ import org.apache.iotdb.commons.schema.table.Audit; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ConcatDeviceVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.BaseSourceRewriter; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaFetchMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaFetchScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java index edce982fea086..392868bcf0552 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java @@ -21,6 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.partition.StorageExecutor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.ClusterTopology; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java index f02a5d109f6c7..115eaa8fc6b03 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; public class PipelineMemoryEstimatorFactory { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/AbstractFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/AbstractFragmentParallelPlanner.java index a038bd3aa8005..029a09ab31d44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/AbstractFragmentParallelPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/AbstractFragmentParallelPlanner.java @@ -28,13 +28,13 @@ import org.apache.iotdb.commons.partition.StorageExecutor; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.plan.planner.IFragmentParallelPlaner; import org.apache.iotdb.db.queryengine.plan.planner.exceptions.ReplicaSetUnreachableException; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.tsfile.external.commons.collections4.CollectionUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/LogicalQueryPlan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/LogicalQueryPlan.java index 6e69c354f0f77..7a80e5bf53d5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/LogicalQueryPlan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/LogicalQueryPlan.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; /** * LogicalQueryPlan represents a logical query plan. It stores the root node of corresponding query 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 a0c64b9a66621..0d72e355dae11 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 @@ -22,13 +22,13 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.partition.DataPartition; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.SubPlanTypeExtractor; import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.IPartitionRelatedNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesAggregationScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java index 30b310868ecce..a8688639f5233 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; + import java.util.Collections; import java.util.List; 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 16c7cea4ed926..15c03f5e09c6b 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; 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 37b9af8f13932..045b96ab16c7c 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 @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; 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 bcef3ef602612..12aaf7dbb2c94 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeUtil.java index e90093c4398dd..28b34cf1dd97f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeUtil.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import java.util.List; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java index 40e91cf68ecbb..382013d7d0861 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; + public class SimplePlanVisitor implements PlanVisitor { @Override public Void visitPlan(PlanNode node, C context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java index 1b2e25e38e3da..e0907d76aebcf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java index a9f1a4a60dbaf..a5c222ecf3869 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java @@ -25,9 +25,9 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.WritePlanNode; import org.apache.iotdb.db.storageengine.dataregion.modification.ModificationFile; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java index 13f78b027f2fb..d89425a934b9b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.load; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; 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.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java index a67e77784b741..343b695cc91fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.storageengine.load.splitter.TsFileData; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java index b91181b27934e..6b7be9dfab062 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.ArrayList; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java index dda21cf8b888f..47a4ce6c5b70d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/metadata/read/DeviceSchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java index e6695e044dc45..71c36852200bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/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 eed9eb16c0a08..ecfba4a979637 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 @@ -24,8 +24,8 @@ 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.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 14082c0153a5a..833ff0ca51784 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 @@ -25,8 +25,8 @@ 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.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 ed4abe8e08c7f..185155bd3fa26 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 @@ -26,8 +26,8 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.template.Template; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 0dcd00358196f..3f209f4b91546 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 @@ -25,8 +25,8 @@ 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.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java index fdf5a8b1557f9..1a1e525b2e335 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java @@ -22,9 +22,9 @@ import org.apache.iotdb.common.rpc.thrift.TSchemaNode; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/metadata/read/NodePathsConvertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java index e17a027c622b7..97b6f8f0a0573 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/metadata/read/NodePathsCountNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java index 119ff719dff01..9ed4b892febba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/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 04e9d34b3e52f..7c4ec5f4848fd 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 @@ -24,8 +24,8 @@ 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.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import java.io.DataOutputStream; 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 4b86d69a2019c..a607d20036461 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 @@ -24,8 +24,8 @@ 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.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java index 8bd98766a6e52..c3ef17d7cf96f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/metadata/read/SchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java index 1c44b66b965f0..80e5de4d82e47 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java index eb9dfcab834ec..d2bf5328fd02b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/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 a7e724630aff4..fda19ac654d21 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 @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/metadata/read/SchemaQueryScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java index 56ff6e2df6eb4..2ca23961d8265 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; 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/SeriesSchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java index 8600a7ce75209..9ba441a38efe6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/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 1917821333368..d96652a3ba586 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 @@ -25,9 +25,9 @@ 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.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher; 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 11ea4ea2a518c..60b33156cfb7d 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 @@ -27,8 +27,8 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.template.Template; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 16599943a7063..22f237b73c8d3 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 @@ -26,8 +26,8 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.template.Template; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java index a4aecff9e2337..3c3348127a515 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java index 7cfdc9f9ba658..a74248bf4aa22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.utils.SerializeUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.ISchemaRegionPlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java index af811d4cb6fe8..6aa6163edbb14 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java index 841b2548e60a1..dc56f5db3bef0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java index bbddec0540e17..72e4d44c69624 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/metadata/write/CreateAlignedTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java index d894f5858ec06..6aee2d3d55ecf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java index 74c086cd1c5b6..33a844badc369 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java @@ -25,9 +25,9 @@ import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java index bc13684fb9f29..25fc0a202988c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java index 0576d58fbf4b8..da58716dd1f55 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.write.req.IDeactivateTemplatePlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java index c98327d399922..a9e83eed5af2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/metadata/write/InternalBatchActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java index 1ff255215b959..272001184dfcb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java index 492460dae00bd..921295abe45b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java index b061f9650b001..237caab414eb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java index 1618836a11379..eaa6f1ab0c0db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.write.req.IPreDeactivateTemplatePlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java index 626e0d2b0a8af..847ba6031e765 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.write.req.IRollbackPreDeactivateTemplatePlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java index 23a1b5603b734..3dd2b30dc5d82 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/metadata/write/view/AlterLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java index 6089dba1f19e9..36ad6ab300425 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java @@ -25,8 +25,8 @@ import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/metadata/write/view/ConstructLogicalViewBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java index 447e0f260862b..58a3adab366f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/metadata/write/view/CreateLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java index c2d5f20df3795..567d79c3423e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java @@ -26,9 +26,9 @@ import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java index 01d4127c7a116..86ed0ffab4467 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/metadata/write/view/RollbackLogicalViewBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java index 3104bb3a70388..73054797710c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/pipe/PipeEnrichedDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java index a3fb703e151dc..9d0d589bfd413 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.db.consensus.statemachine.dataregion.DataExecutionVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java index d76f2c0de8c03..c6598b66cb524 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java @@ -25,10 +25,10 @@ import org.apache.iotdb.db.consensus.statemachine.dataregion.DataExecutionVisitor; import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java index 26df8427d40de..c6ca3638c8fe2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.consensus.statemachine.schemaregion.SchemaExecutionVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.metadata.write.ConstructSchemaBlackListNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java index 6dba1b9a2baa4..7484472b34dab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.consensus.statemachine.schemaregion.SchemaExecutionVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java index c0fd02aa37184..6f76b3454f7ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningQueue; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.SchemaRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java index 6763096d6b066..5efeeefdf9253 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AI; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.model.ModelInferenceDescriptor; 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 854ef70b5b4c5..29d71c8d46549 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 @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/process/AggregationMergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java index e03eb5d62d47d..e6ac495afab90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; 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 3be0e4985f21e..9886ef5b0db28 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 @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationSourceNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java index 8522f824820cb..d80eaa8405e43 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/process/ColumnInjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java index d797739148c99..a6ae7527e57fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.utils.columngenerator.parameter.ColumnGeneratorParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java index 040f1b0c4e30d..9b0dc2f6da256 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.OrderByParameter; 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 6d57e7501e8c6..8d34269162615 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 @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.DeviceViewIntoPathDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java index 3da741a893ff2..b4d18238d088f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java index 7f3ef49a67f16..5b45ee711a637 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/process/FillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java index 26ab8318cf0cf..7296721c3d685 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.FillDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java index 97d8c0ca00d9f..84d0e52930b56 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java index 528f014e12d5c..d365a5c7072ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java index 2ec573b2b5b35..1df7f3f713364 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.CrossSeriesAggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java index 35b7272239833..35622b93398d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/process/IntoNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/IntoNode.java index dc4b371f73ae5..7c4887ecd1906 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 @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.IntoPathDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java index 37df9c8287786..7401a227a7d96 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/process/MergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java index 2a06510e3ebc4..fd705e247e7c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java index 6c600edc9dba6..3f85624773dd7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/process/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java index 16e48e7343821..77ba0fb82d79e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/process/RawDataAggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java index 54f4724284856..0e4f38655b5f2 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 @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java index 1326b86f72d1c..68140352be45f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/process/SlidingWindowAggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SlidingWindowAggregationNode.java index 97625a3b345b2..fac977482cdeb 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 @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java index 79248740e92fb..1240548bb94d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java index fc77c207c24d9..24f24cd057418 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java index a6f8f0771fea4..a9fdb43e042c9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java index 157053fc51df9..7b4ac63889df5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java index 8e2a8a3b7fabb..9c96501969f99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java index 1a6d49252d146..804a79dc197f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java index 33c41ae1a27f3..4bd5f7280eb98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.process.TwoChildProcessNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java index 0633c5e345f46..97826f7cfd0b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/process/last/LastQueryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java index 814e4a09a8e9f..d077baed20665 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java index c851f43d28179..96d6c8a92cd76 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.LastQueryScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java index 482ff2fb36caf..c6810ff1ce417 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/sink/IdentitySinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java index 8f4f0a1b6757f..dd261f3faaecf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/sink/MultiChildrenSinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/MultiChildrenSinkNode.java index 06e70a7a2023a..1267c420f8e2e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/MultiChildrenSinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/MultiChildrenSinkNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java index dc51f3df788c5..f710858543d8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/sink/SinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/SinkNode.java index fe6818ab8725f..f3bdb8096a232 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/SinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/SinkNode.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; public abstract class SinkNode extends PlanNode implements AutoCloseable { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java index 3eaa32e9de2ba..1714262fc13f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java @@ -24,11 +24,11 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/AlignedSeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java index df30b42f5b067..78725ad064acc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java @@ -24,11 +24,11 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/DeviceRegionScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/DeviceRegionScanNode.java index af1e033f32536..ccbf5e03c7e1d 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 @@ -25,9 +25,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DeviceContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/LastQueryScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastQueryScanNode.java index 0dbe0495c3b34..5d6aad7fff063 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 @@ -24,9 +24,9 @@ import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/SeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java index ea109f45baa0e..db92d11ec624d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/SeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java index c1b8556105a64..af9a2f99e9ce7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/SeriesScanSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java index f254d766550e6..62136d5764e5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java index b92e8326ec8a9..d24012e898d78 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java @@ -24,9 +24,9 @@ import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; 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 b4002061d24b0..df5c338fa200c 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 @@ -21,8 +21,8 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/SourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SourceNode.java index 3df3455ff925e..4aa11f68f2975 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SourceNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.IPartitionRelatedNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; public abstract class SourceNode extends PlanNode implements AutoCloseable, IPartitionRelatedNode { protected SourceNode() {} 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 4ec660a4e7845..9d1b9e36573b6 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 @@ -28,9 +28,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/VirtualSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/VirtualSourceNode.java index d361b3b2d52b8..01af871dc5e77 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/VirtualSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/VirtualSourceNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; public abstract class VirtualSourceNode extends PlanNode { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java index 4ca0acdb65cd5..65da23a50c2f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntryValue; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java index 9c1da34259d3f..e90d7741cf457 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.IWALByteBufferView; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java index 65822319b0cd1..e7a5a1d631ff8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java @@ -29,12 +29,12 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.schematree.DeviceSchemaInfo; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java index 5755540d9f020..ef535fa0666e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java @@ -24,9 +24,9 @@ import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java index 2c78012b2018d..62d0604d853b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java @@ -28,10 +28,10 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataTypeInconsistentException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.storageengine.dataregion.memtable.AbstractMemTable; import org.apache.iotdb.db.storageengine.dataregion.memtable.DeviceIDFactory; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.IWALByteBufferView; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java index 51b03c5461582..7b2bd40226c6c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java @@ -26,9 +26,9 @@ import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java index 449ad782fe9a9..90bcd719ba311 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java @@ -27,9 +27,9 @@ import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java index f7c6be0b11672..2e93affa8aa06 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java @@ -28,10 +28,10 @@ import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java index ca914359110e4..a1c379adacafd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java @@ -30,9 +30,9 @@ import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.exception.query.OutOfTTLException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java index 4807014efb809..bc9aea68d0df3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java @@ -24,9 +24,9 @@ import org.apache.iotdb.commons.exception.ObjectFileNotExist; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java index 639537b2f33cb..c802148848dbd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java @@ -24,9 +24,9 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndexType; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java index b963857823182..e246663c0652b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java index d1f065d880230..32116cb1c4952 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java index d4387de4c92f0..bfc1220dead47 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanNodeSearcher.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanNodeSearcher.java index 7a8b21b4730ab..a730270527622 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanNodeSearcher.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanNodeSearcher.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index 305704922dd42..c3053a2cf608d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Aggregation; @@ -44,7 +45,6 @@ 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.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.GroupingSetAnalysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.FieldId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java index cc8385db4ba0a..4103a7f4b2b4f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.RelationType; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; 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 08019d395d01e..ed45e60848890 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; @@ -49,7 +50,6 @@ 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.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFileNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedDeleteDataNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java index 8322c0a52c152..a5745452eca7a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java index 20c0f8e3ed8dd..a770524e6bd20 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; @@ -32,7 +33,6 @@ 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.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Field; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java index eae053776407a..b3916d45a8305 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultExpressionTraversalVisitor; 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 0885b156fb4e9..81bd5fefbf3ad 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 @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedWritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java index b9c1c6d4dbae8..8f2502c5398fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; import org.apache.iotdb.commons.partition.DataPartition; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; -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.planner.plan.node.WritePlanNode; 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/distribute/SubPlanGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/SubPlanGenerator.java index f2ba537c3ff7c..0b7a57276516c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/SubPlanGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/SubPlanGenerator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.MultiChildrenSinkNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; 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 281833570cf8b..e9995904fa233 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 @@ -33,6 +33,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TRegionInfo; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -74,7 +75,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.DataNodeTableOperatorGenerator; import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; import org.apache.iotdb.db.queryengine.plan.planner.exceptions.RootFIPlacementException; -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.planner.plan.node.WritePlanNode; 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/planner/distribute/TableDistributedPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanner.java index fbd59e8aba955..4185b97f0cc79 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; 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/planner/distribute/TableModelQueryFragmentPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelQueryFragmentPlanner.java index bbd06800d58e0..64726a0192137 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.MultiChildrenSinkNode; 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/planner/distribute/TableModelTypeProviderExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java index 86645dd7f1125..d5f7a43619616 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; @@ -37,7 +38,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java index 9cbd4886734b4..9304a65efd3b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java index de20151cfff04..a566236e072bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; 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.execution.querystats.PlanOptimizersStatsCollector; import org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.QueryPlanOptimizerStatistics; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java index 94238a584c0e8..b6152baf6b657 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import java.util.function.Function; import java.util.stream.Stream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java index 7633e91dd1af2..e7be1cf151a29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multiset; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java index 8bd606e6f878d..dd1dbee7cc1c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java index 27164eb3388c5..2a9a462f24a90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; 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.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java index 0e695aa16f231..2217799132d4a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java index 81d29814976b5..fea9848e01500 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java index 8e63ee81518d5..ab6f60c2a2879 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java index 227ca15f7eefa..02b64418008cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java index a5a545613d92e..5e9e49372cecc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java index 3f676fde68afd..a74d41ffec3aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java index 160c0e6fc9289..126ef39982e0a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java index 9a210f2c06a13..014f4b7d58d47 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java index 81760ef4fa026..bdeaf4c746bf4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java index e6137d8c88ff0..eabb284fb8c16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import com.google.common.collect.Maps; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java index 19acbb0744d96..d5a85b8ed4363 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java index 9b246f2a5196f..079fd11ae1da9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java index 503f6fc52c3e3..3baee00c24532 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java index a47537c0704e3..7ee37c186afee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java index 157888055ed64..ac5bb710dd480 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -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.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java index 665c8ea00fa97..fa1a7c81f4ee7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java index b7db4a87d98e5..6f5bde753f0b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java index 08ca842efb7d3..811011d2f2439 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java index 0ad7d6f98a948..4d09115b59c05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java index 28e2a930c05fa..c64de9342dbb1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java index b63f269e04195..42d4fcc440eed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java index 0c52819164967..1fcd11cbf4a02 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java index 3930e6590c639..36b227876c93b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java index b6b79b8492418..3c8a8cd1e666d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java index 178045f4c65e3..4511d27d428f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java index 4670118bba3f1..da63e3f945aba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.List; import java.util.Optional; 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 f37b04d6c7604..c9d34d3d9b049 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,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.SymbolsExtractor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java index ba8920284e6d1..f7127b9326d8e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java index 0593953905fa5..508c1e50173e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java index 81d5ac8b8f915..9402fc13f4e61 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java index dec567bd2dd02..31d8fb49d4745 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java index 7d2a8cf27ece6..03033298b0faf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java index c7a834135ffd4..193a58d1cdb70 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java index 9fa6c3defd393..1de219d348295 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java index a65f960ee7776..f2adfb9b3b77b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java index 0b86f487ee5d9..f5bbb71860849 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java index 307ff1bd3e2c9..d2cec89dda755 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java index fe4e24867a462..502e7c541cd1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionKind; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java index b32f063537096..03309984f2c5c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java index 0ff7599232873..308d049a4f8c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java index acb711e5dba08..b010a8a706541 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java index c48992acf6de4..982cb2a873f9b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java index 952ad393309f0..339c8c1cc79fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java index 617ae9c444fe0..68408395fe5c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java index 6669cd1230a51..909230d171b71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index d1c8a25a8045e..0f6a53ef55306 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -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.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java index c1822a2b62a19..de0b000801070 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java index bc644b5f1c1c5..b796a95de2c66 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java index 5b370ae8dfe5a..b36344a4abdca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java @@ -18,13 +18,13 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java index b8b88ebcfcbd3..cd47cbf8a71a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -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.planner.plan.node.process.TwoChildProcessNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ChildReplacer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ChildReplacer.java index 96dc4074b220b..1b8dede60d22b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ChildReplacer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ChildReplacer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java index bb1d07676b848..8f87ad84df283 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java index 8af3f2855075f..919adeac92ea4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -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.planner.plan.node.process.TwoChildProcessNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java index 2ce5d3243a6e9..096a4e19e14d4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; -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.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java index 4ef0d79d9292f..13509a0141190 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java index d149d2e3bcf16..5d22f378fcf3f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/relational/planner/node/ExplainAnalyzeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java index eb44f6c9f2a71..55e5eeeb8036e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; 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 index 6b6810e0d9e58..949486dad637a 100644 --- 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 @@ -20,10 +20,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java index 9e371fe6b1916..608b31c238aec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java index 1483f9c6d8b1f..cfa4397d078a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java index 4e0a315004b1f..3573ddff90a85 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; @@ -45,7 +46,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Property; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java index 6f48f5fca83ba..085c47bc35b3b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java index 2c7cdb659ad35..8a67d14ab0881 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; 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/planner/node/TableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java index 75be499fc459d..81fb9933e35fe 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 @@ -22,11 +22,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; 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 1b1140e467f58..51396b20593b4 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 @@ -22,9 +22,9 @@ 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.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TableDeviceSourceNode; import org.apache.iotdb.db.schemaengine.schemaregion.attribute.update.DeviceAttributeCacheUpdater; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java index 9384b16f2d770..24e841c6c40b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java index 9f0a06fbe1d87..72b7d8b0a254d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.commons.consensus.ConsensusGroupId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; -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.planner.plan.node.metadata.read.TableDeviceSourceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java index befc85ea3d717..4272c275f3749 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.SchemaRegionPlanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java index 7738f18976261..c40208ad2b983 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java index 1b29644b0cdef..e41be3bf7fb26 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.ISchemaRegionPlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java index 146fcd79beafc..30060e7953324 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.SchemaRegionPlanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java index 9452e1b4b2bc1..d02019bf228cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.SchemaRegionPlanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java index 964f865442b9d..6f53c32dd7e21 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.ISchemaRegionPlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java index 6fd73aba0d541..0446164273cb2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.ISchemaRegionPlan; 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 a11ba8b3115a3..b986b46be54b4 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 @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; 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.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; 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 4fb15f5e894a7..2741d75ed625d 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 @@ -22,8 +22,8 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.metadata.read.TableDeviceSourceNode; 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 e2bdc0a505e33..1b8bac0a8ecc2 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 @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/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 51353cdb758ac..1d4a5496175dd 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 @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/relational/planner/node/schema/TableNodeLocationAddNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java index d6a8c0d564f18..c79f21e783f41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.schemaengine.schemaregion.ISchemaRegionPlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/AdaptivePlanOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/AdaptivePlanOptimizer.java index efe9ec0018b4a..9bef4eb222fa4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/AdaptivePlanOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/AdaptivePlanOptimizer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java index 8ae53a204a30e..19bc7c5886aa0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java index bbe58496dfcd2..e72b54eef1f02 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -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.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java index 0156fd790ecc5..04efdd6d72725 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -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.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java index c8395c51eae8b..49ddb4b81d65f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; 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.execution.warnings.WarningCollector; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.PlanOptimizersStatsCollector; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; 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 aaea83b797b5e..474557fd0a178 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.QueryId; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; 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 986216ee6a988..f6f3ec0d86331 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -36,7 +37,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -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.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; 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 2a32cb91a5823..a40f669a18d3e 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 @@ -26,6 +26,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; @@ -46,7 +47,6 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; -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.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java index ab4023e3fed1a..9025d5ecc5336 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -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.planner.plan.node.process.ExchangeNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; 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 893a1a4fed93a..2f4f220b4bf7b 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; @@ -27,7 +28,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -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.node.DeviceTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java index bdb1f34b8fbf6..826f8ad63dd91 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; @@ -38,7 +39,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; 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 ded0a303b20f8..bf1f36b59afdc 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; -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.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java index 68b53fadb5bb6..abeb762e3a732 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.common.QueryId; -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.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; 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 ab55b77dccd8f..e322004707ba7 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; @@ -27,7 +28,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -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.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; 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 68ebb677accab..199f3837506a3 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; @@ -48,7 +49,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -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.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java index 18ab1cdc27544..2a8c6b320a0fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java @@ -35,6 +35,7 @@ import org.apache.iotdb.consensus.exception.RatisReadUnavailableException; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.mpp.FragmentInstanceDispatchException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.executor.RegionExecutionResult; import org.apache.iotdb.db.queryengine.execution.executor.RegionReadExecutor; @@ -44,7 +45,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableSchemaQuerySuccessfulCallbackVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableSchemaQueryWriteVisitor; import org.apache.iotdb.db.utils.SetThreadName; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java index 87fc8f2e5eff0..0cff14c93dbe9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java @@ -34,10 +34,10 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadFileException; import org.apache.iotdb.db.exception.mpp.FragmentInstanceDispatchException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadSingleTsFileNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePieceNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java index 5e45c080ae3c9..f5df1429c9620 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.statistics; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.mpp.rpc.thrift.TFetchFragmentInstanceStatisticsResp; import org.apache.iotdb.mpp.rpc.thrift.TOperatorStatistics; import org.apache.iotdb.mpp.rpc.thrift.TQueryStatistics; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanSerializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanSerializer.java index b7b7d9758ca4b..791099e2f91cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanSerializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanSerializer.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.ConstructTableDevicesBlackListNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java index 4c0ff8809d260..2d79472cd37df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.buffer; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.ContinuousSameSearchIndexSeparatorNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java index 8c60f9c4127e3..adb4bc5e5f715 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java @@ -30,11 +30,11 @@ import org.apache.iotdb.commons.trigger.exception.TriggerExecutionException; import org.apache.iotdb.confignode.rpc.thrift.TTriggerState; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; 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.db.queryengine.plan.Coordinator; -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.planner.plan.node.pipe.PipeEnrichedInsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertMultiTabletsNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java index cbbf95db5a8b0..20529a7a78300 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.source.schemaregion.IoTDBSchemaRegionSource; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; 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/operator/sink/SinkOperatorDownStreamNodeIdTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java index cd071872f0788..d02873fc31d2f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java index d8e92ab362527..d0ba14461f799 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.optimization; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java index 06140fddafcfd..b59a783988442 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.optimization; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java index b82d9ed6af28b..214289d4e7ff9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.FakeSchemaFetcherImpl; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java index b2e13e277741b..f1c5438ec2702 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java @@ -24,6 +24,7 @@ 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.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.LogicalPlanVisitor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java index 9d67070dc47c0..16ce7c9112864 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.junit.Test; 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 c981e8319849c..2301cc1b3c1ae 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 @@ -22,9 +22,9 @@ 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.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.process.ColumnInjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java index 27b14d88d90a3..f5e8d6be70f23 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java @@ -30,6 +30,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -38,7 +39,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.TreeModelTimePredicate; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java index 7d53390c9d715..63920f55f5f50 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java @@ -26,6 +26,7 @@ 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.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -44,7 +45,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.memory.ConsumeAllChildrenPipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.ConsumeChildrenOneByOnePipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java index ef96700c22bc1..885122ce07fb7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.HorizontallyConcatNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java index 86417f583df7d..eac3821e0ddf1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java @@ -24,6 +24,7 @@ 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.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByDeviceOrderByLimitOffsetTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByDeviceOrderByLimitOffsetTest.java index cff70fc457ce4..815ad831a63f4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByDeviceOrderByLimitOffsetTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByDeviceOrderByLimitOffsetTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByTimeOrderByLimitOffsetTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByTimeOrderByLimitOffsetTest.java index 1cc7e9bbf6bf2..b3d46d879e841 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByTimeOrderByLimitOffsetTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByTimeOrderByLimitOffsetTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java index 9788584e21790..aff18c752cc17 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java index f85284ce38c40..5de1894ab280d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaQueryMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TimeSeriesSchemaScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerCycleTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerCycleTest.java index df2f3d16339d7..b232f5ecf9746 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerCycleTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerCycleTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java index 6cbc927190cc9..b5392954f54f2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java @@ -23,13 +23,13 @@ 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.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryCollectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryMergeNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NoDataRegionPlanningTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NoDataRegionPlanningTest.java index 28fd1a922c644..155be1902fcbe 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NoDataRegionPlanningTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NoDataRegionPlanningTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/RegionScanPlanningTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/RegionScanPlanningTest.java index e7238a41713b8..bd4b49cc6e969 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/RegionScanPlanningTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/RegionScanPlanningTest.java @@ -23,12 +23,12 @@ 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.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ActiveRegionScanMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.DeviceRegionScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java index 8e37fa5b62161..387900bf69715 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java @@ -36,6 +36,7 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; @@ -52,7 +53,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.LogicalPlanner; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; import org.apache.iotdb.mpp.rpc.thrift.TRegionRouteReq; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util2.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util2.java index 040651d747b19..9654208a40f0c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util2.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util2.java @@ -35,6 +35,7 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; @@ -49,7 +50,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.LogicalPlanner; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; import org.apache.iotdb.mpp.rpc.thrift.TRegionRouteReq; 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 34cbe60bb0763..0db43153e14d9 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 @@ -23,13 +23,13 @@ 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.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.QueryId; 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; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java index f48b2ef6d4395..7ecf4ea7a37ce 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.logical; import org.apache.iotdb.db.auth.AuthorityChecker; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.FakeSchemaFetcherImpl; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.LogicalPlanVisitor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import java.time.ZoneId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java index 3b7f343aeb156..daffb8aed34ec 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java @@ -26,11 +26,11 @@ import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java index 31de153d2874f..30497d4863556 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java @@ -25,11 +25,11 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilterType; import org.apache.iotdb.commons.schema.filter.impl.PathContainsFilter; import org.apache.iotdb.commons.schema.filter.impl.TagFilter; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesSchemaScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodeManagementMemoryMergeNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java index cff5031f8481d..86ee4d7655220 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.node; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java index 199d35b7d49d3..70deff489d0c9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java @@ -25,8 +25,8 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java index 8de5400db616b..6cdce2e05185c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java index 975e7428ddca9..1a15995f30bda 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java @@ -22,8 +22,8 @@ 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.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.DeleteTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedNonWritePlanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java index 9f87417b35986..48867b4c94331 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.pipe; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalBatchActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedWritePlanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java index d4f9fa1d7b550..af7e8527fd00b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java @@ -20,9 +20,9 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.InnerTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.LeftOuterTimeJoinNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java index 61d4f28c9d38b..cb2a96555bbf9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java index 858a0290e323b..c07f1db9d037d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java index 69cef259c51d5..8b1b6cf146517 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.write; import org.apache.iotdb.commons.consensus.index.impl.IoTProgressIndex; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.storageengine.dataregion.modification.DeletionPredicate; import org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.And; 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 26a219c368b08..19ac522894fd4 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 @@ -32,6 +32,7 @@ import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -50,7 +51,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java index 4dab1896c4641..4b45e971f7a9b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.TableLogicalPlanner; 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 0a8223519a4a9..f92da6ab56525 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; @@ -45,7 +46,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; 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 2c0b41e65570c..2ea001eadc8ed 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java index 2e98fd6566522..843d96b409c40 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.TableLogicalPlanner; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; 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 aaae574ca516a..ec9ea35fb0e78 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; 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 fd37737d83615..7418b9e136596 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java index 7ae0c40a92627..1b6ae15dd754e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; 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 1b61ede335209..b549702f47414 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -27,7 +28,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; 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.QualifiedObjectName; 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 5fcccb5c0f7c5..c3ef0b43c4a3e 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; 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.node.DeviceTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java index 0edd828bbe924..c0100ce2898b3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; 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 d7d4169a3603f..91075acd18f19 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 @@ -22,6 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analyzer; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.StatementAnalyzerFactory; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java index 41afbcc64d6e3..1ee2f40255dd2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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.AggregationTableScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java index d0298aa6641c3..222ca4bb51664 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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 java.util.Map; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java index 31ed99dd0f047..01fcb1da6e70b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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 java.util.Collection; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java index abd5e53f3cd7d..bc7c7ced044b4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; 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 static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java index 3283109c522e7..1a1cfafd2727d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java index 6ec1a74728ad8..0c7d14476565f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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 java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java index 5238abfc41d94..c76a36c1bcfc8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; 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 java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java index 5c535a6895f1c..9c25f2f90bd88 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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 java.util.Set; 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 b487632ab44d1..ff96bd39b027d 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,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java index 7b91aa1af3ba1..8ba88ce57a1a5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java @@ -21,9 +21,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.CteScanNode; 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 index c795347c68f85..2b0741e9a03bc 100644 --- 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 @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java index 8f69473085840..c2d61d2443f21 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; 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.ExchangeNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java index ee11f44f7f2f2..3f2c22c27d4e1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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 com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java index 97528c06a8cd1..a2a7b580a445b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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 static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java index 586bdb7841674..413c0d79b894e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; 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 java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java index e9e2b1afb978f..169bbce23832b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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 static com.google.common.base.Preconditions.checkState; 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 index 0f23cd6195103..990bc1c693199 100644 --- 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 @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; 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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java index 6529b484185a2..c0b94266225dc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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 com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java index a563451dfd236..794614524dabe 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; 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.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java index a51251c659716..11127341b1b74 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; 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 com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java index fca33e9645670..063f5d4f6e3a7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; 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; public interface Matcher { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java index bc3dfc4061b9a..7cc577be679ce 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; 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 static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java index 31ad4b3fb9e41..2ee3fa312c283 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; 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 static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java index e900b6aea9320..caafe915d2335 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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 com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java index 729f1c9d400a6..f1cc223811791 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanNodeSearcher; 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 601aa3d5c8e98..06f998f172964 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; @@ -45,7 +46,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java index 4c2ff978ec9b6..b9b577e70eb0a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java index 40a8516b4292a..14e19907a66b9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; 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 static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java index c5d31103b10e1..062e7ac262290 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; 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 java.util.function.Predicate; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java index babf9c0b160ea..9513b296b3e5c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.metadata.TableSchema; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java index 534fe545dc7d5..dca8501ded490 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; 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 static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java index acf666e261501..cc28b475f08de 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; 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.assertions.PlanMatchPattern.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java index 997e000002c01..efaa1fe2b61a1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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 com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java index 14ed714a09284..e8e721873a502 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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 com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java index 287b734f5ffc5..e69c5f470db08 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; 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.udf.api.relational.table.TableFunctionHandle; 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 e3787706563cc..c0fc8a4d49744 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 @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.TableScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java index 4c9b332da67fe..2f74b73a0052a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; 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 java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java index 9059b85a7d2d2..2b9d5bb90463d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; 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.OrderingScheme; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java index ba6afb33c5a7e..fd854abbd205b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java index e80367f52b9e4..dadd12e8cd446 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java index 73792cabdb90c..74d9f9631c612 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java index f88604ecaeae9..23e11b95e8611 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java index 2b43b3e896112..e4b3fc382e1f9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java @@ -26,8 +26,8 @@ import org.apache.iotdb.consensus.iot.log.ConsensusReqReader; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; From 9525a628b82b53b9338c5b377665d4a8090df9c0 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 13 Apr 2026 17:48:19 +0800 Subject: [PATCH 10/45] move dag --- .../ArithmeticBinaryColumnTransformer.ftl | 6 +- .../ArithmeticColumnTransformerApi.ftl | 2 +- .../ArithmeticUnaryColumnTransformer.ftl | 2 +- .../plan/planner/TableOperatorGenerator.java | 4 +- .../factory/HmacStrategiesFactory.java | 2 +- ...AbstractCaseWhenThenColumnTransformer.java | 2 +- .../dag/column}/column/ColumnCache.java | 2 +- .../dag/column}/column/ColumnTransformer.java | 4 +- .../column/FailFunctionColumnTransformer.java | 2 +- .../TableCaseWhenThenColumnTransformer.java | 2 +- .../TreeCaseWhenThenColumnTransformer.java | 2 +- .../ArithmeticAdditionColumnTransformer.java | 4 +- .../ArithmeticBinaryColumnTransformer.java | 4 +- .../ArithmeticDivisionColumnTransformer.java | 4 +- .../ArithmeticModuloColumnTransformer.java | 4 +- ...hmeticMultiplicationColumnTransformer.java | 4 +- ...rithmeticSubtractionColumnTransformer.java | 4 +- .../binary/BinaryColumnTransformer.java | 4 +- .../CompareBinaryColumnTransformer.java | 4 +- .../CompareEqualToColumnTransformer.java | 4 +- .../CompareGreaterEqualColumnTransformer.java | 4 +- .../CompareGreaterThanColumnTransformer.java | 4 +- .../CompareLessEqualColumnTransformer.java | 4 +- .../CompareLessThanColumnTransformer.java | 4 +- .../CompareNonEqualColumnTransformer.java | 4 +- .../column/binary/HmacColumnTransformer.java | 8 +- .../column/binary/Like2ColumnTransformer.java | 4 +- .../binary/LogicAndColumnTransformer.java | 4 +- .../binary/LogicBinaryColumnTransformer.java | 4 +- .../binary/LogicOrColumnTransformer.java | 4 +- .../binary/strategies/HmacStrategy.java | 2 +- .../leaf/ConstantColumnTransformer.java | 2 +- .../leaf/IdentityColumnTransformer.java | 2 +- .../column/leaf/LeafColumnTransformer.java | 4 +- .../column/leaf/NullColumnTransformer.java | 2 +- .../column/leaf/TimeColumnTransformer.java | 2 +- ...bstractGreatestLeastColumnTransformer.java | 4 +- .../BinaryGreatestColumnTransformer.java | 4 +- .../multi/BinaryLeastColumnTransformer.java | 4 +- .../BooleanGreatestColumnTransformer.java | 4 +- .../multi/BooleanLeastColumnTransformer.java | 4 +- .../multi/CoalesceColumnTransformer.java | 4 +- .../DoubleGreatestColumnTransformer.java | 4 +- .../multi/DoubleLeastColumnTransformer.java | 4 +- .../multi/FloatGreatestColumnTransformer.java | 4 +- .../multi/FloatLeastColumnTransformer.java | 4 +- .../multi/InBinaryMultiColumnTransformer.java | 4 +- .../InBooleanMultiColumnTransformer.java | 4 +- .../multi/InDoubleMultiColumnTransformer.java | 4 +- .../multi/InFloatMultiColumnTransformer.java | 4 +- .../multi/InInt32MultiColumnTransformer.java | 4 +- .../multi/InInt64MultiColumnTransformer.java | 4 +- .../multi/InMultiColumnTransformer.java | 4 +- .../multi/Int32GreatestColumnTransformer.java | 4 +- .../multi/Int32LeastColumnTransformer.java | 4 +- .../multi/Int64GreatestColumnTransformer.java | 4 +- .../multi/Int64LeastColumnTransformer.java | 4 +- .../LogicalAndMultiColumnTransformer.java | 4 +- .../multi/LogicalMultiColumnTransformer.java | 4 +- .../LogicalOrMultiColumnTransformer.java | 4 +- .../multi/MappableUDFColumnTransformer.java | 4 +- .../column/multi/MultiColumnTransformer.java | 4 +- .../ternary/BetweenColumnTransformer.java | 4 +- .../CompareTernaryColumnTransformer.java | 4 +- .../ternary/Like3ColumnTransformer.java | 4 +- .../column/ternary/LpadColumnTransformer.java | 6 +- .../column/ternary/RpadColumnTransformer.java | 6 +- .../ternary/TernaryColumnTransformer.java | 4 +- .../ternary/utils/BytePaddingUtils.java | 2 +- .../UserDefineScalarFunctionTransformer.java | 6 +- .../ArithmeticNegationColumnTransformer.java | 4 +- .../column/unary/InColumnTransformer.java | 4 +- .../column/unary/IsNullColumnTransformer.java | 4 +- .../column/unary/LikeColumnTransformer.java | 4 +- .../unary/LogicNotColumnTransformer.java | 4 +- .../unary/RegularColumnTransformer.java | 4 +- .../column/unary/UnaryColumnTransformer.java | 4 +- .../unary/scalar/AbsColumnTransformer.java | 6 +- .../AbstractBitwise2ColumnTransformer.java | 6 +- .../AbstractBitwiseColumnTransformer.java | 6 +- ...AbstractCastFunctionColumnTransformer.java | 6 +- .../AbstractLengthColumnTransformer.java | 6 +- .../unary/scalar/AcosColumnTransformer.java | 6 +- .../unary/scalar/AsinColumnTransformer.java | 6 +- .../unary/scalar/AtanColumnTransformer.java | 6 +- .../scalar/BitCount2ColumnTransformer.java | 6 +- .../scalar/BitCountColumnTransformer.java | 6 +- .../scalar/BitwiseAnd2ColumnTransformer.java | 4 +- .../scalar/BitwiseAndColumnTransformer.java | 4 +- .../BitwiseLeftShift2ColumnTransformer.java | 4 +- .../BitwiseLeftShiftColumnTransformer.java | 4 +- .../scalar/BitwiseNotColumnTransformer.java | 6 +- .../scalar/BitwiseOr2ColumnTransformer.java | 4 +- .../scalar/BitwiseOrColumnTransformer.java | 4 +- .../BitwiseRightShift2ColumnTransformer.java | 4 +- ...ightShiftArithmetic2ColumnTransformer.java | 4 +- ...RightShiftArithmeticColumnTransformer.java | 4 +- .../BitwiseRightShiftColumnTransformer.java | 4 +- .../scalar/BitwiseXor2ColumnTransformer.java | 4 +- .../scalar/BitwiseXorColumnTransformer.java | 4 +- .../scalar/BlobLengthColumnTransformer.java | 4 +- .../BytesToDoubleColumnTransformer.java | 10 +- .../scalar/BytesToFloatColumnTransformer.java | 10 +- .../scalar/BytesToIntColumnTransformer.java | 10 +- .../scalar/BytesToLongColumnTransformer.java | 10 +- .../column/unary/scalar/CRC32Transformer.java | 6 +- .../scalar/CastFunctionColumnTransformer.java | 4 +- .../unary/scalar/CeilColumnTransformer.java | 6 +- .../scalar/Concat2ColumnTransformer.java | 8 +- .../unary/scalar/ConcatColumnTransformer.java | 6 +- .../scalar/ConcatMultiColumnTransformer.java | 6 +- .../unary/scalar/CosColumnTransformer.java | 6 +- .../unary/scalar/CoshColumnTransformer.java | 6 +- .../DateBinFunctionColumnTransformer.java | 6 +- .../scalar/DegreesColumnTransformer.java | 6 +- .../unary/scalar/DiffColumnTransformer.java | 6 +- .../scalar/DiffFunctionColumnTransformer.java | 6 +- .../DoubleToBytesColumnTransformer.java | 8 +- .../scalar/EndsWith2ColumnTransformer.java | 8 +- .../scalar/EndsWithColumnTransformer.java | 8 +- .../unary/scalar/ExpColumnTransformer.java | 6 +- .../unary/scalar/ExtractTransformer.java | 6 +- .../scalar/FloatToBytesColumnTransformer.java | 8 +- .../unary/scalar/FloorColumnTransformer.java | 6 +- .../unary/scalar/FormatColumnTransformer.java | 6 +- .../scalar/GenericCodecColumnTransformer.java | 10 +- .../HmacConstantKeyColumnTransformer.java | 8 +- .../scalar/IntToBytesColumnTransformer.java | 8 +- .../unary/scalar/LTrim2ColumnTransformer.java | 8 +- .../unary/scalar/LTrimColumnTransformer.java | 8 +- .../unary/scalar/LengthColumnTransformer.java | 4 +- .../unary/scalar/LnColumnTransformer.java | 6 +- .../unary/scalar/Log10ColumnTransformer.java | 6 +- .../scalar/LongToBytesColumnTransformer.java | 8 +- .../unary/scalar/LowerColumnTransformer.java | 6 +- .../scalar/ObjectLengthColumnTransformer.java | 4 +- .../unary/scalar/RTrim2ColumnTransformer.java | 8 +- .../unary/scalar/RTrimColumnTransformer.java | 8 +- .../scalar/RadiansColumnTransformer.java | 6 +- .../scalar/RegexpLike2ColumnTransformer.java | 6 +- .../scalar/RegexpLikeColumnTransformer.java | 6 +- .../scalar/Replace2ColumnTransformer.java | 6 +- .../scalar/Replace3ColumnTransformer.java | 6 +- .../ReplaceFunctionColumnTransformer.java | 6 +- .../unary/scalar/RoundColumnTransformer.java | 6 +- .../RoundFunctionColumnTransformer.java | 6 +- .../unary/scalar/SignColumnTransformer.java | 6 +- .../unary/scalar/SinColumnTransformer.java | 6 +- .../unary/scalar/SinhColumnTransformer.java | 6 +- .../unary/scalar/SqrtColumnTransformer.java | 6 +- .../scalar/StartsWith2ColumnTransformer.java | 8 +- .../scalar/StartsWithColumnTransformer.java | 6 +- .../scalar/Strcmp2ColumnTransformer.java | 6 +- .../unary/scalar/StrcmpColumnTransformer.java | 6 +- .../scalar/Strpos2ColumnTransformer.java | 6 +- .../unary/scalar/StrposColumnTransformer.java | 6 +- .../scalar/SubString2ColumnTransformer.java | 6 +- .../scalar/SubString3ColumnTransformer.java | 8 +- .../scalar/SubStringColumnTransformer.java | 6 +- .../unary/scalar/TanColumnTransformer.java | 6 +- .../unary/scalar/TanhColumnTransformer.java | 6 +- .../unary/scalar/Trim2ColumnTransformer.java | 8 +- .../unary/scalar/TrimColumnTransformer.java | 6 +- .../TryCastFunctionColumnTransformer.java | 4 +- .../unary/scalar/UpperColumnTransformer.java | 6 +- .../factory/CodecStrategiesFactory.java | 8 +- .../NumericCodecStrategiesFactory.java | 2 +- .../unary/scalar/inteface/CodecStrategy.java | 2 +- .../column/unary/scalar/util/HexUtils.java | 2 +- .../unary/scalar/util/SpookyHashV2Utils.java | 2 +- .../scalar/util/TransformerDebugUtils.java | 2 +- .../TableDateBinTimeRangeIterator.java | 2 +- .../process/FilterAndProjectOperator.java | 20 +- .../gapfill/GapFillWGroupWMoOperator.java | 2 +- .../gapfill/GapFillWGroupWoMoOperator.java | 2 +- .../gapfill/GapFillWoGroupWMoOperator.java | 2 +- .../gapfill/GapFillWoGroupWoMoOperator.java | 2 +- .../schema/source/DeviceAttributeUpdater.java | 4 +- .../source/DeviceBlackListConstructor.java | 4 +- .../schema/source/DevicePredicateFilter.java | 4 +- .../schema/source/DevicePredicateHandler.java | 4 +- .../operator/schema/source/DeviceUpdater.java | 4 +- .../relational/ColumnTransformerBuilder.java | 244 +++++++++--------- .../builtin/BuiltInScalarFunctionHelper.java | 2 +- .../builtin/helper/CastFunctionHelper.java | 4 +- .../builtin/helper/DiffFunctionHelper.java | 4 +- .../builtin/helper/ReplaceFunctionHelper.java | 4 +- .../builtin/helper/RoundFunctionHelper.java | 4 +- .../helper/SubStringFunctionHelper.java | 2 +- .../visitor/ColumnTransformerVisitor.java | 56 ++-- .../DataNodeTableOperatorGenerator.java | 4 +- .../plan/planner/OperatorTreeGenerator.java | 4 +- .../metadata/TableMetadataImpl.java | 2 +- .../planner/IrExpressionInterpreter.java | 2 +- .../GapFillStartAndEndTimeExtractVisitor.java | 2 +- .../TransformCorrelatedScalarSubquery.java | 2 +- .../plan/relational/sql/ast/DeleteDevice.java | 4 +- .../SubStringFunctionColumnTransformer.java | 4 +- .../scalar/SubStringFunctionTransformer.java | 2 +- .../impl/SchemaRegionMemoryImpl.java | 4 +- .../operator/OperatorMemoryTest.java | 10 +- ...AndCompareBinaryColumnTransformerTest.java | 13 +- .../LogicBinaryColumnTransformerTest.java | 5 +- .../hmac/HmacMd5ColumnTransformerTest.java | 8 +- .../hmac/HmacSha1ColumnTransformerTest.java | 8 +- .../hmac/HmacSha256ColumnTransformerTest.java | 8 +- .../hmac/HmacSha512ColumnTransformerTest.java | 8 +- .../ternary/LpadColumnTransformerTest.java | 3 +- .../ternary/RpadColumnTransformerTest.java | 3 +- .../unary/UnaryColumnTransformerTest.java | 11 +- .../BlobLengthColumnTransformerTest.java | 3 +- .../unary/scalar/DateBinFunctionTest.java | 2 +- .../FromBigEndian32ColumnTransformerTest.java | 6 +- .../FromBigEndian64ColumnTransformerTest.java | 6 +- ...E754_32BigEndianColumnTransformerTest.java | 6 +- ...E754_64BigEndianColumnTransformerTest.java | 6 +- ...omLittleEndian32ColumnTransformerTest.java | 6 +- ...omLittleEndian64ColumnTransformerTest.java | 6 +- .../ToBigEndian32ColumnTransformerTest.java | 6 +- .../ToBigEndian64ColumnTransformerTest.java | 6 +- ...E754_32BigEndianColumnTransformerTest.java | 6 +- ...E754_64BigEndianColumnTransformerTest.java | 6 +- ...ToLittleEndian32ColumnTransformerTest.java | 6 +- ...ToLittleEndian64ColumnTransformerTest.java | 6 +- .../scalar/ReverseColumnTransformerTest.java | 5 +- .../FromBase32ColumnTransformerTest.java | 6 +- .../FromBase64ColumnTransformerTest.java | 6 +- .../FromBase64UrlColumnTransformerTest.java | 6 +- .../ToBase32ColumnTransformerTest.java | 6 +- .../ToBase64ColumnTransformerTest.java | 6 +- .../ToBase64UrlColumnTransformerTest.java | 6 +- .../hashing/Crc32ColumnTransformerTest.java | 4 +- .../hashing/Md5ColumnTransformerTest.java | 6 +- .../hashing/Murmur3ColumnTransformerTest.java | 6 +- .../hashing/Sha1ColumnTransformerTest.java | 6 +- .../hashing/Sha256ColumnTransformerTest.java | 6 +- .../hashing/Sha512ColumnTransformerTest.java | 6 +- .../SpookyHashV2_32ColumnTransformerTest.java | 6 +- .../SpookyHashV2_64ColumnTransformerTest.java | 6 +- .../XxHash64ColumnTransformerTest.java | 6 +- .../FromHexColumnTransformerTest.java | 6 +- .../ToHexColumnTransformerTest.java | 6 +- 242 files changed, 769 insertions(+), 744 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/AbstractCaseWhenThenColumnTransformer.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/ColumnCache.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/ColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/FailFunctionColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/TableCaseWhenThenColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/TreeCaseWhenThenColumnTransformer.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/ArithmeticAdditionColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/ArithmeticBinaryColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/ArithmeticDivisionColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/ArithmeticModuloColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/ArithmeticMultiplicationColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/ArithmeticSubtractionColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/BinaryColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/CompareBinaryColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/CompareEqualToColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/CompareGreaterEqualColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/CompareGreaterThanColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/CompareLessEqualColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/CompareLessThanColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/CompareNonEqualColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/HmacColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/Like2ColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/LogicAndColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/LogicBinaryColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/LogicOrColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/binary/strategies/HmacStrategy.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/leaf/ConstantColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/leaf/IdentityColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/leaf/LeafColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/leaf/NullColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/leaf/TimeColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/AbstractGreatestLeastColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/BinaryGreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/BinaryLeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/BooleanGreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/BooleanLeastColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/CoalesceColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/DoubleGreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/DoubleLeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/FloatGreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/FloatLeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/InBinaryMultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/InBooleanMultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/InDoubleMultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/InFloatMultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/InInt32MultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/InInt64MultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/InMultiColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/Int32GreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/Int32LeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/Int64GreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/Int64LeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/LogicalAndMultiColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/LogicalMultiColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/LogicalOrMultiColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/MappableUDFColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/multi/MultiColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/ternary/BetweenColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/ternary/CompareTernaryColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/ternary/Like3ColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/ternary/LpadColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/ternary/RpadColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/ternary/TernaryColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/ternary/utils/BytePaddingUtils.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/udf/UserDefineScalarFunctionTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/ArithmeticNegationColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/InColumnTransformer.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/IsNullColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/LikeColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/LogicNotColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/RegularColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/UnaryColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/AbsColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/AbstractBitwise2ColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/AbstractBitwiseColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/AbstractCastFunctionColumnTransformer.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/AbstractLengthColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/AcosColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/AsinColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/AtanColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitCount2ColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitCountColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitwiseAnd2ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitwiseAndColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitwiseNotColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitwiseOr2ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitwiseOrColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitwiseRightShiftColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitwiseXor2ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BitwiseXorColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BlobLengthColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BytesToDoubleColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BytesToFloatColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BytesToIntColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/BytesToLongColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/CRC32Transformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/CastFunctionColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/CeilColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/Concat2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/ConcatColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/ConcatMultiColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/CosColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/CoshColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/DateBinFunctionColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/DegreesColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/DiffColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/DiffFunctionColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/DoubleToBytesColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/EndsWith2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/EndsWithColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/ExpColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/ExtractTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/FloatToBytesColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/FloorColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/FormatColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/GenericCodecColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/HmacConstantKeyColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/IntToBytesColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/LTrim2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/LTrimColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/LengthColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/LnColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/Log10ColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/LongToBytesColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/LowerColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/ObjectLengthColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/RTrim2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/RTrimColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/RadiansColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/RegexpLike2ColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/RegexpLikeColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/Replace2ColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/Replace3ColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/ReplaceFunctionColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/RoundColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/RoundFunctionColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/SignColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/SinColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/SinhColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/SqrtColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/StartsWith2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/StartsWithColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/Strcmp2ColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/StrcmpColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/Strpos2ColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/StrposColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/SubString2ColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/SubString3ColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/SubStringColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/TanColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/TanhColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/Trim2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/TrimColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/TryCastFunctionColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/UpperColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/factory/CodecStrategiesFactory.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/factory/NumericCodecStrategiesFactory.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/inteface/CodecStrategy.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/util/HexUtils.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/util/SpookyHashV2Utils.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/transformation/dag => node_commons/transformation/dag/column}/column/unary/scalar/util/TransformerDebugUtils.java (96%) diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl index 2e2c3f50f1ceb..44846547b6b36 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl @@ -31,7 +31,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; @@ -175,7 +175,7 @@ public class ${className} extends BinaryColumnTransformer { package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; @@ -293,7 +293,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl index c6e93b133fa2b..587c3097de687 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl @@ -28,7 +28,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.Divis import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.ModulusResolver; import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.MultiplicationResolver; import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.SubtractionResolver; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.DoubleNegationColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.FloatNegationColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.IntNegationColumnTransformer; diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl index 0afb3f57085dc..33ea08b242053 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl @@ -26,7 +26,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 4b49f66efea7e..330b29d929e05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -164,8 +164,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; -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.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/binary/factory/factory/HmacStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/binary/factory/factory/HmacStrategiesFactory.java index 453456da877be..27db408707181 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/binary/factory/factory/HmacStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/binary/factory/factory/HmacStrategiesFactory.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/AbstractCaseWhenThenColumnTransformer.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/AbstractCaseWhenThenColumnTransformer.java index 7ac2f348d27a2..387ebf55f8478 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/AbstractCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ColumnCache.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnCache.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ColumnCache.java index 6adfbe072e1f0..ed4ef91325712 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ColumnCache.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ColumnTransformer.java index 50ba07fe49653..564bbda585b2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.NullColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.NullColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/FailFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/FailFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/FailFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/FailFunctionColumnTransformer.java index 41632d7be1a4a..907595bebeeee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/FailFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/FailFunctionColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TableCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/TableCaseWhenThenColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TableCaseWhenThenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/TableCaseWhenThenColumnTransformer.java index 637c41417465a..2381cd3db4471 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TableCaseWhenThenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/TableCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/TreeCaseWhenThenColumnTransformer.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/TreeCaseWhenThenColumnTransformer.java index c3704ced734e3..d82503be22625 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/TreeCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java index f8036106e5cf3..d4a0388d94cf8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java index 08e2171147380..a84efd6034194 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java index c4f92be150a4a..fd940d1ef6124 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticModuloColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticModuloColumnTransformer.java index 854379cd87661..9014604689199 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticModuloColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java index f223350930230..467f12c0f09e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java index 18f935ca0fdcd..5beb8f666de8a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/BinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/BinaryColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/BinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/BinaryColumnTransformer.java index 75dcb6dc17ed8..10933ee7f25ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/BinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/BinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareBinaryColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareBinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareBinaryColumnTransformer.java index fb09941245b3e..9f00dfccdd9f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareBinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareEqualToColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareEqualToColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareEqualToColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareEqualToColumnTransformer.java index f777180e9f089..23dbea307ab99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareEqualToColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareEqualToColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java index 1aba400614c17..b9e957f1e198a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareGreaterThanColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareGreaterThanColumnTransformer.java index 4f46f76bf3dce..9a1e385edbd9a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareGreaterThanColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareLessEqualColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareLessEqualColumnTransformer.java index 0eede197be3ef..46b26242a07b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareLessEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessThanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareLessThanColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessThanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareLessThanColumnTransformer.java index 09bd953be181f..61cb14254a9b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessThanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareLessThanColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareNonEqualColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareNonEqualColumnTransformer.java index 9f0cd152ebe77..7864eb4aacb30 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareNonEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/HmacColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/HmacColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/HmacColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/HmacColumnTransformer.java index a3872608a3260..2982407ab3d3b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/HmacColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/HmacColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class HmacColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/Like2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/Like2ColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/Like2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/Like2ColumnTransformer.java index 6f8bd9764db35..b5457714bb083 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/Like2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/Like2ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicAndColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicAndColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicAndColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicAndColumnTransformer.java index 7a68e5fa030d1..2592b5348ff72 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicAndColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicAndColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicBinaryColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicBinaryColumnTransformer.java index 595fa291c32ba..6f7ef4538a362 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicOrColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicOrColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicOrColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicOrColumnTransformer.java index 064ad6974daba..c4a2e6b313a1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicOrColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicOrColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/strategies/HmacStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/strategies/HmacStrategy.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/strategies/HmacStrategy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/strategies/HmacStrategy.java index 01f83cce52b7c..35f6d575f3c25 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/strategies/HmacStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/strategies/HmacStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies; @FunctionalInterface public interface HmacStrategy { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/ConstantColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/ConstantColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/ConstantColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/ConstantColumnTransformer.java index 0750e5dc9d1fd..8c1f3bc2ce1e0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/ConstantColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/ConstantColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/IdentityColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/IdentityColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/IdentityColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/IdentityColumnTransformer.java index f4cc0667777fb..51cddb5a62a3c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/IdentityColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/IdentityColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/LeafColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/LeafColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/LeafColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/LeafColumnTransformer.java index 4e6d423b4b50f..6b00fe6fe5874 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/LeafColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/LeafColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/NullColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/NullColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/NullColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/NullColumnTransformer.java index d6cc68ab3ca5e..19073532bbe36 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/NullColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/NullColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf; import org.apache.tsfile.read.common.block.column.NullColumn; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/TimeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/TimeColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/TimeColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/TimeColumnTransformer.java index d8fe028bf092f..3d1fa1a5ae2ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/TimeColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/TimeColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java index f92c5fa2811e2..288c2bb5c7827 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BinaryGreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BinaryGreatestColumnTransformer.java index e81487bbac3e6..259099081fe07 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BinaryGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BinaryLeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BinaryLeastColumnTransformer.java index 6cde29f4c8453..c21df790bdc1e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BinaryLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BooleanGreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BooleanGreatestColumnTransformer.java index 6c283225c7403..e4dd34cfc1579 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BooleanGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BooleanLeastColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BooleanLeastColumnTransformer.java index 1cfbde1575857..e7f770f9b992b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BooleanLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/CoalesceColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/CoalesceColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/CoalesceColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/CoalesceColumnTransformer.java index 82efc732e451c..4c7c3e8cd4533 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/CoalesceColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/CoalesceColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/DoubleGreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/DoubleGreatestColumnTransformer.java index e09f0b6df4b21..dbcdadc4f4d21 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/DoubleGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/DoubleLeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/DoubleLeastColumnTransformer.java index 2dc19ec75e7a7..039c76d895bcc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/DoubleLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/FloatGreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/FloatGreatestColumnTransformer.java index bc5bfc982f8c6..6940611c3995f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/FloatGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/FloatLeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/FloatLeastColumnTransformer.java index 223f63673390d..bb5515e30fd5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/FloatLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InBinaryMultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InBinaryMultiColumnTransformer.java index 9491a201ed1d0..5a2083d96da91 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InBinaryMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InBooleanMultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InBooleanMultiColumnTransformer.java index f99bc791b39e5..0e09bafe23aec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InBooleanMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InDoubleMultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InDoubleMultiColumnTransformer.java index 482214498b950..5a559458e8c16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InDoubleMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InFloatMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InFloatMultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InFloatMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InFloatMultiColumnTransformer.java index 310669c73cf01..cd6ecd318dd44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InFloatMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InFloatMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt32MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InInt32MultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt32MultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InInt32MultiColumnTransformer.java index ad291426a1cb7..087df32674a75 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt32MultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InInt32MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt64MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InInt64MultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt64MultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InInt64MultiColumnTransformer.java index aa3ec1397fbf4..ae3cc145508b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt64MultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InInt64MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InMultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InMultiColumnTransformer.java index 319b4225d8502..7a18fb1f0bf05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32GreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int32GreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32GreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int32GreatestColumnTransformer.java index 551970f470a67..358a3c2200a53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32GreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int32GreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32LeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int32LeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32LeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int32LeastColumnTransformer.java index 26b64349fb4f9..c49db761e2da9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32LeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int32LeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64GreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int64GreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64GreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int64GreatestColumnTransformer.java index 7818d217d0aad..0e83e65e9c801 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64GreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int64GreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64LeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int64LeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64LeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int64LeastColumnTransformer.java index 0efaccb378690..9f9a9b9e0e79a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64LeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int64LeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalAndMultiColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalAndMultiColumnTransformer.java index 321f03b186bdb..52513c97ffe24 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalAndMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalMultiColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalMultiColumnTransformer.java index c90133e7cf523..cc45b6351366c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalOrMultiColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalOrMultiColumnTransformer.java index 9164ec578eec2..2b839ab5fba4a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalOrMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MappableUDFColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/MappableUDFColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MappableUDFColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/MappableUDFColumnTransformer.java index 440585eed781b..f1a58bb5fa689 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MappableUDFColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/MappableUDFColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/MultiColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/MultiColumnTransformer.java index 8045edc4a53bc..61605791b5172 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/BetweenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/BetweenColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/BetweenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/BetweenColumnTransformer.java index c0344b001fafd..8c380ff0433af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/BetweenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/BetweenColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/CompareTernaryColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/CompareTernaryColumnTransformer.java index 26dabe9a7c54e..e6d57aa23d5e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/CompareTernaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/Like3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/Like3ColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/Like3ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/Like3ColumnTransformer.java index 34000e227c66e..23990849c4a6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/Like3ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/Like3ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/LpadColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/LpadColumnTransformer.java index db4d17d75f196..a101677093126 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/LpadColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.utils.BytePaddingUtils; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.utils.BytePaddingUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/RpadColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/RpadColumnTransformer.java index ea05be1319a60..5f351611ae0b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/RpadColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.utils.BytePaddingUtils; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.utils.BytePaddingUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/TernaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/TernaryColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/TernaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/TernaryColumnTransformer.java index 3a9dccd8e8fda..48f9e903e245a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/TernaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/TernaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/utils/BytePaddingUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/utils/BytePaddingUtils.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/utils/BytePaddingUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/utils/BytePaddingUtils.java index 1e5f3ed20a87b..1a87de4f949ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/utils/BytePaddingUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/utils/BytePaddingUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.utils; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.utils; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/udf/UserDefineScalarFunctionTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/udf/UserDefineScalarFunctionTransformer.java index 47fd40ed73f92..9ed50a2c9a73d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/udf/UserDefineScalarFunctionTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.udf; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.udf; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.RecordIterator; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.MultiColumnTransformer; import org.apache.iotdb.udf.api.relational.ScalarFunction; import org.apache.iotdb.udf.api.relational.access.Record; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/ArithmeticNegationColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/ArithmeticNegationColumnTransformer.java index 81819dddf8141..721b5130b864e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/ArithmeticNegationColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/InColumnTransformer.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/InColumnTransformer.java index 17fc57a1b5277..6fadb56a0536b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/InColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/IsNullColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/IsNullColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/IsNullColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/IsNullColumnTransformer.java index fa781f270575c..81b5aa91f27a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/IsNullColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/IsNullColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LikeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/LikeColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LikeColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/LikeColumnTransformer.java index 5930cc999e972..fb861e213adc4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LikeColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/LikeColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LogicNotColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/LogicNotColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LogicNotColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/LogicNotColumnTransformer.java index 8c0f983121169..2a0cdc2fcec47 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LogicNotColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/LogicNotColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/RegularColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/RegularColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/RegularColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/RegularColumnTransformer.java index b22c1c64856c8..dccaab9bc6e44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/RegularColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/RegularColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/UnaryColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/UnaryColumnTransformer.java index 7b3294f3c1dae..32da3585c57ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/UnaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbsColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbsColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbsColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbsColumnTransformer.java index 294c02b3d2d96..dde8d6b594812 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbsColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbsColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java index dfc7a2333513f..148f1adf4d36f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java index c4d1cd8f3176d..1c4a4eac7a65d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java index 9ed1bb33075da..dfe3ef74ae173 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java index 08eb47691668f..477f36201dcb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AcosColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AcosColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AcosColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AcosColumnTransformer.java index 1808e147fbd1a..cf7211f0539da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AcosColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AcosColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AsinColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AsinColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AsinColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AsinColumnTransformer.java index 8a73986f897d5..9980154122ea7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AsinColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AsinColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AtanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AtanColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AtanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AtanColumnTransformer.java index 8f86f838474c1..20b317fe94b63 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AtanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AtanColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java index 04ffea29c63c9..f486d6e233223 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitCountColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitCountColumnTransformer.java index 87a928ef16b8b..42356a19969f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitCountColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java index 3be14f412b3cd..fc6cedb13e31e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java index 57676824bb976..38a2036f54543 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java index 8c42d788878a1..73dd8d98cc68c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java index 40651076dfc08..37a5da983f4f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java index 8649cdbdb6b49..0a00923dfec03 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java index d54ff7b1607a0..c81dbda70aa41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java index e6be0927f4643..57b4388c40f46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java index 8d717c6c883d5..8ebef63879c08 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java index 402d38d40c858..791da7d953855 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java index 5042d83d4c0f8..67bd43067d7cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java index 5f77af2e87c89..19af0cc339613 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java index 8ab1c754f286b..8e1b693eb3f0b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java index 0d648b3e26ee9..a3257c394b1c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java index bce18fb059718..bd5ea1916447f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java index e62fdfcbe2375..5a716b0a6d14c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToDoubleColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java index 15af6deed2dfd..949ddf3ef9ec7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToFloatColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java index 0e42a3a713afd..9b6a62a8aeb63 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToIntColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java index dcf0e4a086531..5fcb2592ea6ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; /** A transformer that converts byte array representations to long values */ public class BytesToLongColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CRC32Transformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CRC32Transformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CRC32Transformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CRC32Transformer.java index d7e9dccb62a92..f132116d9fbd4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CRC32Transformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CRC32Transformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java index 624eabadc62d6..fd71f14898b77 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CeilColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CeilColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CeilColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CeilColumnTransformer.java index 31cb8df744813..b6be8d360b653 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CeilColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CeilColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Concat2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Concat2ColumnTransformer.java index 18c59344be8a0..fe45df5853768 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Concat2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ConcatColumnTransformer.concat; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ConcatColumnTransformer.concat; public class Concat2ColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ConcatColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ConcatColumnTransformer.java index 47dd6866a33b7..0439de8c6bc41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ConcatColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java index ec053fe2ad9e9..896f40cb4d9da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.MultiColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CosColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CosColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CosColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CosColumnTransformer.java index 4d731965b6846..01e69a022aa5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CosColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CosColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CoshColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CoshColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CoshColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CoshColumnTransformer.java index 2079f1659c5dd..b44a051d98f17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CoshColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CoshColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java index 93ef9dff3a2d4..9cbe00db84bd4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DegreesColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DegreesColumnTransformer.java index b1921aa1be473..850911d43fc69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DegreesColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DiffColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DiffColumnTransformer.java index 0d316a6c40093..cc4fcca4d82f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DiffColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java index ce6f7ebf8bfdd..3557d8d8c1764 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java index 7b9c06147a53b..aab1e288c42f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java index c81d83fbda779..82876428d4545 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class EndsWith2ColumnTransformer extends BinaryColumnTransformer { public EndsWith2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/EndsWithColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/EndsWithColumnTransformer.java index afa1e4dff8630..698499aa6fbe1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/EndsWithColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class EndsWithColumnTransformer extends UnaryColumnTransformer { private final byte[] suffix; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExpColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ExpColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExpColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ExpColumnTransformer.java index b804869867afc..6b3ef95a7d9fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExpColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ExpColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ExtractTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ExtractTransformer.java index 201b4bc099bf0..43bb2ffc45e01 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ExtractTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java index 7d4d4795c721a..569cecd77b575 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloorColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FloorColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloorColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FloorColumnTransformer.java index 9912df4dacd99..76be2157f9fd9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloorColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FloorColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FormatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FormatColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FormatColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FormatColumnTransformer.java index b47b46a636d80..911626847357e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FormatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FormatColumnTransformer.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.MultiColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java index f387b8850e4fe..c010396585e00 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.inteface.CodecStrategy; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.inteface.CodecStrategy; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; /** * A generic, reusable column converter for handling all codec-based encoding/decoding functions. It diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java index daa5868b938de..0c49f6d9bd250 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java index 5c25a949c8f62..fec35d5466c84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java index 4643c3a6ec45d..0e16a2b19b084 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LTrimColumnTransformer.ltrim; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LTrimColumnTransformer.ltrim; public class LTrim2ColumnTransformer extends BinaryColumnTransformer { public LTrim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LTrimColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LTrimColumnTransformer.java index aa67b782c0754..d2a6a2d1e485e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LTrimColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.TrimColumnTransformer.isContain; public class LTrimColumnTransformer extends UnaryColumnTransformer { private final byte[] character; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LengthColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LengthColumnTransformer.java index c94530c83d403..17ec5582b451c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LnColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LnColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LnColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LnColumnTransformer.java index 3bccb13eb6a27..69d95fd84b0c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LnColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LnColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Log10ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Log10ColumnTransformer.java index fa6c021ea550a..36253314a131c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Log10ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java index 72c3a5b2404ab..baeeff00b71b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LowerColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LowerColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LowerColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LowerColumnTransformer.java index d4c8fbad01117..036815bdf886e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LowerColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LowerColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java index 5d39c6f6af3ca..b30a641c0d99c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.utils.ObjectTypeUtils; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java index 2d04dce84e491..ea05fbcef43d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RTrimColumnTransformer.rtrim; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RTrimColumnTransformer.rtrim; public class RTrim2ColumnTransformer extends BinaryColumnTransformer { public RTrim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RTrimColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RTrimColumnTransformer.java index 18c4311d5246d..255af6ef242f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RTrimColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.TrimColumnTransformer.isContain; public class RTrimColumnTransformer extends UnaryColumnTransformer { private final byte[] character; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RadiansColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RadiansColumnTransformer.java index b8d7cbab88f3c..7443d9b1d3372 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RadiansColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java index 67c2c2624c53a..7d989ca050ca1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java index e85e1b9724254..a4b938c430c93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Replace2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Replace2ColumnTransformer.java index 5a44243206de2..3f3552e7e7c34 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Replace2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Replace3ColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Replace3ColumnTransformer.java index c5133c5e39034..e37d841a2f30f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Replace3ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.TernaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java index d2efd3483db84..564a4bee86445 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RoundColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RoundColumnTransformer.java index 4e66aeb7b96aa..e5936b95e112f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RoundColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java index 7817fcd1c7d22..1c6998584bff0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SignColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SignColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SignColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SignColumnTransformer.java index b2796eaad1fc0..4f22546aa12ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SignColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SignColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SinColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SinColumnTransformer.java index f1f2a4da27744..50f509e79f10a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SinColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinhColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SinhColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinhColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SinhColumnTransformer.java index c6faf22c838ea..4423a530d8d4f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinhColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SinhColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SqrtColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SqrtColumnTransformer.java index bcd6b97eb3485..bce279d096f62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SqrtColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java index b181603ca44e9..c319409cf8db8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class StartsWith2ColumnTransformer extends BinaryColumnTransformer { public StartsWith2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StartsWithColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StartsWithColumnTransformer.java index cf44d3ec0fc67..fcb6620308537 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StartsWithColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java index c432738952d74..172e44677aa3f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StrcmpColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StrcmpColumnTransformer.java index c9541fe170181..2017bf1157924 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StrcmpColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java index 692f088a59969..b4ed3442f58d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrposColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StrposColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrposColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StrposColumnTransformer.java index cd4459bd33362..0e2e15a45fd76 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrposColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StrposColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubString2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubString2ColumnTransformer.java index b085976c2ed53..7b0305880fd87 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubString2ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubString3ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubString3ColumnTransformer.java index 7a1dba3e08aa1..5becf2673085b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubString3ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.TernaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -29,7 +29,7 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.BytesUtils; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; public class SubString3ColumnTransformer extends TernaryColumnTransformer { public SubString3ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubStringColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubStringColumnTransformer.java index 59cc8cb43694b..8c486fa328c19 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubStringColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TanColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TanColumnTransformer.java index a4c07da38d3f9..634c3f458a688 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TanColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanhColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TanhColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanhColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TanhColumnTransformer.java index b0d2271698544..cbe5544d40dda 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanhColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TanhColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Trim2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Trim2ColumnTransformer.java index c6788c95b632b..0919e0c16db0c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Trim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer.trim; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.TrimColumnTransformer.trim; public class Trim2ColumnTransformer extends BinaryColumnTransformer { public Trim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TrimColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TrimColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TrimColumnTransformer.java index 8e75c5e700741..65ae78eb2b9c5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TrimColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TrimColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java index 419d1bbabf3be..846a4e5b0b927 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/UpperColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/UpperColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/UpperColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/UpperColumnTransformer.java index dee529093dda2..b5a07a1ed1180 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/UpperColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/UpperColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java index 546a8286d0414..9f9787327610b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.inteface.CodecStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.HexUtils; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.SpookyHashV2Utils; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.inteface.CodecStrategy; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.HexUtils; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.SpookyHashV2Utils; import com.google.common.hash.Hashing; import com.google.common.io.BaseEncoding; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java index 60d1e77f78b2a..c700080622b4c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/inteface/CodecStrategy.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/inteface/CodecStrategy.java index 7c2fd4833a139..f8c71c1f89567 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/inteface/CodecStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.inteface; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.inteface; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/HexUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/HexUtils.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/HexUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/HexUtils.java index 15ed2b9d342d8..e1480984da50a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/HexUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/HexUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java index e6ef386827e46..bb235dba9b979 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/TransformerDebugUtils.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/TransformerDebugUtils.java index 2ad8e6a29a887..af96644abc622 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/TransformerDebugUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util; +package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java index d79fc2848043c..e0d2f1d6aa13b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.tsfile.read.common.TimeRange; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java index 83e493f622054..28e4e72372b59 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java @@ -22,16 +22,16 @@ 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; -import org.apache.iotdb.db.queryengine.transformation.dag.column.AbstractCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MappableUDFColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.TernaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.AbstractCaseWhenThenColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.MappableUDFColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.MultiColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java index c3eb335521153..c439921aa978e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; // with month interval public class GapFillWGroupWMoOperator extends AbstractGapFillWGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java index 40cb5fef8cbb4..a05a0e0be8490 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWGroupWoMoOperator extends AbstractGapFillWGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java index 738e35cd5cf52..ad87c3fa2d049 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java @@ -27,7 +27,7 @@ import java.time.ZoneId; import java.util.List; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWoGroupWMoOperator extends AbstractGapFillWoGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java index d4f8b86abef5d..d12048d17cffb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java @@ -26,7 +26,7 @@ import java.util.List; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWoGroupWoMoOperator extends AbstractGapFillWoGroupOperator { 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 cc883bc7ad6f7..65946d7c96e2f 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -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.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo; 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 ef71258c7c9d9..6ea710f0750ba 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -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.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.rescon.MemSchemaRegionStatistics; 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/DevicePredicateFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateFilter.java index 42c87b944998d..3a2fef4825999 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 @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -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.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import java.util.Iterator; 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 9cd6102c1be76..255e7a00c7c60 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.utils.PathUtils; -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.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; 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 06716c91e3624..f02189bf4c6c9 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -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.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.impl.ShowDevicesResult; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java index 219b0e1630e85..dccbad37c63b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java @@ -74,129 +74,129 @@ import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.TableCaseWhenThenColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.TableCaseWhenThenColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticColumnTransformerApi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessThanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.Like2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareLessThanColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.Like2ColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.NullColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.TimeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.AbstractGreatestLeastColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.CoalesceColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InBinaryMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InBooleanMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InDoubleMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InFloatMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InInt32MultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InInt64MultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.LogicalAndMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.LogicalOrMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.BetweenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.Like3ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.LpadColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.RpadColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.udf.UserDefineScalarFunctionTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LikeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AbsColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AcosColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AsinColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AtanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitCount2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitCountColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseAnd2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseAndColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseLeftShift2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseLeftShiftColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseNotColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseOr2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseOrColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShift2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmetic2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmeticColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShiftColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseXor2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseXorColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BlobLengthColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CRC32Transformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CeilColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Concat2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ConcatColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ConcatMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CosColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CoshColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DegreesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DiffColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.EndsWith2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.EndsWithColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ExpColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ExtractTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FloorColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FormatColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LTrim2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LTrimColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LengthColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LnColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Log10ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LowerColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ObjectLengthColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RTrim2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RTrimColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RadiansColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RegexpLike2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RegexpLikeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Replace2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Replace3ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RoundColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SignColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SinColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SinhColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SqrtColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWith2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Strcmp2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StrcmpColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Strpos2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StrposColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubString2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubString3ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubStringColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TanhColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Trim2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TryCastFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.UpperColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.NullColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.AbstractGreatestLeastColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.CoalesceColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.InBinaryMultiColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.InBooleanMultiColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.InDoubleMultiColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.InFloatMultiColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.InInt32MultiColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.InInt64MultiColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.InMultiColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.LogicalAndMultiColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.LogicalOrMultiColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.BetweenColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.Like3ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.LpadColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.RpadColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.udf.UserDefineScalarFunctionTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LikeColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.AbsColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.AcosColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.AsinColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.AtanColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitCount2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitCountColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseAnd2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseAndColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseLeftShift2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseLeftShiftColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseNotColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseOr2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseOrColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseRightShift2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseRightShiftArithmetic2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseRightShiftArithmeticColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseRightShiftColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseXor2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseXorColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BlobLengthColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToDoubleColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToFloatColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CRC32Transformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CastFunctionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CeilColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.Concat2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ConcatColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ConcatMultiColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CosColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CoshColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DegreesColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DiffColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DiffFunctionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DoubleToBytesColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.EndsWith2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.EndsWithColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ExpColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ExtractTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.FloatToBytesColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.FloorColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.FormatColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LTrim2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LTrimColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LengthColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LnColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.Log10ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LowerColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ObjectLengthColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RTrim2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RTrimColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RadiansColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RegexpLike2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RegexpLikeColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.Replace2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.Replace3ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ReplaceFunctionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RoundColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RoundFunctionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SignColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SinColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SinhColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SqrtColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.StartsWith2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.StartsWithColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.Strcmp2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.StrcmpColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.Strpos2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.StrposColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SubString2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SubString3ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SubStringColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.TanColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.TanhColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.Trim2ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.TrimColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.TryCastFunctionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.UpperColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.ScalarFunction; @@ -236,7 +236,7 @@ import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy; import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy; import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java index 621b06660a886..51134877fb670 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java index 9a610ba05fc77..40f46cde82e84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java @@ -24,8 +24,8 @@ import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CastFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.CastFunctionTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java index 858d21ecad8bb..8814d753f77a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java @@ -23,8 +23,8 @@ import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DiffFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.DiffFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java index af28d6cc857f8..9f7def6317971 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java @@ -23,8 +23,8 @@ import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ReplaceFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.ReplaceFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java index 0a4a8bf4a738d..51abf6b268bf2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java @@ -23,8 +23,8 @@ import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RoundFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.RoundFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java index 7d9490ac75983..4863485290d24 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.SubStringFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.SubStringFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java index 9bdee1e4788b3..ca38e32f3c735 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java @@ -39,36 +39,36 @@ import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.TreeCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticDivisionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticModuloColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessThanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LogicAndColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LogicOrColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.TreeCaseWhenThenColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticDivisionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticModuloColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticMultiplicationColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticSubtractionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareLessThanColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.LogicAndColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.LogicOrColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LongDivisionLongColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LongModulusLongColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.NullColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.TimeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MappableUDFColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.BetweenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.ArithmeticNegationColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.InColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LikeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.RegularColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.NullColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.MappableUDFColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.BetweenColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.ArithmeticNegationColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.InColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LikeColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.RegularColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 27d393744c34b..09c1e3fbc86c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -118,8 +118,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceQueryScanNode; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index f1fda1e18fa21..5279899177233 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -265,8 +265,8 @@ import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; import org.apache.iotdb.db.queryengine.plan.statement.literal.Literal; -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.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSourceType; import org.apache.iotdb.db.utils.columngenerator.ColumnGenerator; 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 e504edd124eaf..2c33ed3f1d1f6 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 @@ -77,7 +77,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.tsfile.read.common.type.BinaryType.TEXT; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java index 839fa174de741..80f8bce5b8af5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java @@ -82,7 +82,7 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; public class IrExpressionInterpreter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java index e95e54bc01363..64a61c4d2675f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java @@ -40,7 +40,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; public class GapFillStartAndEndTimeExtractVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index 0f6a53ef55306..24ffe8fe98a11 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -56,7 +56,7 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.LongType.INT64; 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 aff7b5098fea6..725ef7e07cc3e 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 @@ -39,8 +39,8 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; 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.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.rescon.MemSchemaRegionStatistics; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.storageengine.dataregion.modification.ModEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java index 3ea2cbbce2a2a..7bff92efbc257 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java index 71312657ce4c2..2882d40710cf7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java @@ -30,7 +30,7 @@ import org.apache.tsfile.utils.BytesUtils; import org.apache.tsfile.write.UnSupportedDataTypeException; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; public class SubStringFunctionTransformer extends UnaryTransformer { private int beginPosition; 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 b31d9e8b21942..b16041fdfc2e7 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 @@ -70,8 +70,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableNodeLocationAddNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice; -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.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.metric.ISchemaRegionMetric; import org.apache.iotdb.db.schemaengine.metric.SchemaRegionMemMetric; import org.apache.iotdb.db.schemaengine.rescon.DataNodeSchemaQuotaManager; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index 39eaf7d6be3e0..581a2952696b4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -82,11 +82,11 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.TimeColumnTransformer; import com.google.common.collect.Sets; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java index a6d3003e5b00b..41462ad3d3841 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java @@ -19,7 +19,18 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticDivisionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticModuloColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticMultiplicationColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticSubtractionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java index 7e66638f09f6f..5491f956ddc32 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java @@ -19,7 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.LogicAndColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.LogicOrColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java index fd854abbd205b..fc3723ea82016 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java index dadd12e8cd446..991455cbc0b69 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java index 74d9f9631c612..739bc55d7cb91 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java index 23e11b95e8611..e121db1dcce58 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java index 6640ef79ed18e..ba0a763173122 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.LpadColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java index 955aa4905b9c3..593dc97c11a9b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.RpadColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java index 3d9904d764e7b..e6895f84e7051 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java @@ -19,8 +19,15 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; - +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; + +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.ArithmeticNegationColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.InColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LikeColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.RegularColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.common.regexp.LikePattern; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java index 7fbbd6da2fa23..ce55e7b072472 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BlobLengthColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java index db271fdb9a335..613a36a415567 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java @@ -27,7 +27,7 @@ import java.time.ZoneId; import java.util.TimeZone; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; import static org.junit.Assert.assertEquals; public class DateBinFunctionTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java index c4c625e6a5f8b..75a8c6ff65839 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java index bb3b0165ff037..a5f7683ce1ddf 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java index e493bc2deda63..c13a4228e4a09 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToFloatColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java index b764d1d696aaa..1c699188861b0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToDoubleColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java index f6240e3e1d487..cfefcd157b049 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java index 6e3cefa5483fd..bc8bcd53e0066 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java index e84fd6d2ff86c..5d0aed4646dae 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java index 27c4839aaf070..408b9cf4fddd8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.LongColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java index 835013fde4f24..dc5718bf4abc5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.FloatToBytesColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.FloatColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java index aa70494031a67..db6eb2a3808f9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DoubleToBytesColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.DoubleColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java index 2465a3d81d0b7..56c200488cc16 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java index 941df13280833..24c2212ae34e8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.LongColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java index 3c3695f32d281..d0850a41feebe 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java index 78197d3d03c3c..4c86b9f5482e1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java @@ -22,9 +22,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java index 16e795273ffcd..e4304465c45f7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java index 535d222cd4b88..bcb21af06e117 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java index f89cf121f6c6f..09deb09fbdf62 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base32Encoding; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java index 04eae176abf81..58c172955849a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java index db79311f311c8..dacc619095869 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java index 78cf7dace0b49..f9332ab958c28 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java @@ -21,8 +21,8 @@ // Note: The actual package may vary, adjust if CRC32Transformer is in a different location. package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CRC32Transformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CRC32Transformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java index ac357616e3648..9c5bc9dc0eae8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java index d4d7d675a26fe..b9efba7760cef 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java index c74f13e89165b..f115041a32b2e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java index c0e177d774369..484c766ba195c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java index 9b65799b908cc..b021ecdc871ce 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java index eabf81d1ddba9..024ab9750e4a3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java @@ -19,9 +19,9 @@ * under the License. */ -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java index aa374a9031de0..1e3367e6552ec 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java @@ -19,9 +19,9 @@ * under the License. */ -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java index ab00d0105aa33..df042524e9a0a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import net.jpountz.xxhash.XXHash64; import net.jpountz.xxhash.XXHashFactory; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java index ac885515ecab5..6072f6ed94ae8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.string; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hexEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java index b95ffe32b0868..1fa7665972108 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hexEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; From bbef7b82c3a5ea39bbe61111fe263e731917de09 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 13 Apr 2026 18:17:37 +0800 Subject: [PATCH 11/45] move some plannodes --- .../ArithmeticColumnTransformerApi.ftl | 10 +-- .../plan/planner/TableOperatorGenerator.java | 16 ++-- .../expression}/expression/Expression.java | 60 +++++++-------- .../expression/ExpressionFactory.java | 44 +++++------ .../expression/ExpressionType.java | 2 +- .../UnknownExpressionTypeException.java | 2 +- .../expression/binary/AdditionExpression.java | 8 +- .../binary/ArithmeticBinaryExpression.java | 6 +- .../expression/binary/BinaryExpression.java | 6 +- .../binary/CompareBinaryExpression.java | 16 ++-- .../expression/binary/DivisionExpression.java | 8 +- .../expression/binary/EqualToExpression.java | 8 +- .../binary/GreaterEqualExpression.java | 8 +- .../binary/GreaterThanExpression.java | 8 +- .../binary/LessEqualExpression.java | 8 +- .../expression/binary/LessThanExpression.java | 8 +- .../expression/binary/LogicAndExpression.java | 8 +- .../binary/LogicBinaryExpression.java | 6 +- .../expression/binary/LogicOrExpression.java | 8 +- .../expression/binary/ModuloExpression.java | 8 +- .../binary/MultiplicationExpression.java | 8 +- .../expression/binary/NonEqualExpression.java | 8 +- .../binary/SubtractionExpression.java | 8 +- .../expression/binary/WhenThenExpression.java | 8 +- .../expression/leaf/ConstantOperand.java | 6 +- .../expression/leaf/LeafOperand.java | 4 +- .../expression/leaf/NullOperand.java | 6 +- .../expression/leaf/TimeSeriesOperand.java | 6 +- .../expression/leaf/TimestampOperand.java | 6 +- .../expression/multi/FunctionExpression.java | 12 +-- .../expression/multi/FunctionType.java | 2 +- .../multi/builtin/BuiltInFunctionHelper.java | 2 +- .../builtin/BuiltInScalarFunctionHelper.java | 8 +- .../BuiltInScalarFunctionHelperFactory.java | 12 +-- .../builtin/helper/CastFunctionHelper.java | 10 +-- .../builtin/helper/DiffFunctionHelper.java | 8 +- .../builtin/helper/ReplaceFunctionHelper.java | 8 +- .../builtin/helper/RoundFunctionHelper.java | 8 +- .../helper/SubStringFunctionHelper.java | 8 +- .../other/CaseWhenThenExpression.java | 12 +-- .../other/GroupByTimeExpression.java | 8 +- .../expression/ternary/BetweenExpression.java | 8 +- .../expression/ternary/TernaryExpression.java | 6 +- .../expression/unary/InExpression.java | 18 ++--- .../expression/unary/IsNullExpression.java | 8 +- .../expression/unary/LikeExpression.java | 8 +- .../expression/unary/LogicNotExpression.java | 16 ++-- .../expression/unary/NegationExpression.java | 16 ++-- .../expression/unary/RegularExpression.java | 8 +- .../expression/unary/UnaryExpression.java | 6 +- .../BindTypeForTimeSeriesOperandVisitor.java | 8 +- .../CollectAggregationExpressionsVisitor.java | 8 +- .../CollectSourceExpressionsVisitor.java | 10 +-- .../expression/visitor/CollectVisitor.java | 12 +-- .../visitor/ColumnTransformerVisitor.java | 50 ++++++------ .../CompleteMeasurementSchemaVisitor.java | 14 ++-- .../visitor/ConcatDeviceVisitor.java | 6 +- .../CountTimeAggregationAmountVisitor.java | 8 +- .../visitor/ExistUnknownTypeInExpression.java | 10 +-- .../visitor/ExpressionAnalyzeVisitor.java | 4 +- .../visitor/ExpressionNormalizeVisitor.java | 8 +- .../expression/visitor/ExpressionVisitor.java | 76 +++++++++---------- .../GetMeasurementExpressionVisitor.java | 6 +- .../visitor/IntermediateLayerVisitor.java | 34 ++++----- .../visitor/LowercaseNormalizeVisitor.java | 6 +- .../visitor/ReconstructVisitor.java | 16 ++-- .../visitor/RemoveRootPrefixVisitor.java | 6 +- .../visitor/ReplaceLogicalViewVisitor.java | 14 ++-- .../ReplaceRawPathWithGroupedPathVisitor.java | 10 +-- .../ReplaceSubTreeWithViewVisitor.java | 6 +- ...catRemoveUnExistentMeasurementVisitor.java | 8 +- .../TransformToViewExpressionVisitor.java | 56 +++++++------- .../BindSchemaForExpressionVisitor.java | 14 ++-- .../BindSchemaForPredicateVisitor.java | 20 ++--- .../cartesian/CartesianProductVisitor.java | 16 ++-- ...viceAndBindSchemaForExpressionVisitor.java | 14 ++-- ...atDeviceAndBindSchemaForHavingVisitor.java | 8 +- ...eviceAndBindSchemaForPredicateVisitor.java | 16 ++-- ...oncatExpressionWithSuffixPathsVisitor.java | 12 +-- .../cartesian/QueryContextProvider.java | 2 +- .../visitor/logical/LogicalAndVisitor.java | 16 ++-- .../visitor/logical/LogicalOrVisitor.java | 16 ++-- .../PredicateCanPushDownToSourceChecker.java | 6 +- .../logical/TimeFilterExistChecker.java | 6 +- .../ConvertPredicateToFilterVisitor.java | 44 +++++------ .../ConvertPredicateToTimeFilterVisitor.java | 44 +++++------ .../PredicatePushIntoScanChecker.java | 40 +++++----- .../predicate/PredicateSimplifier.java | 48 ++++++------ .../visitor/predicate/PredicateVisitor.java | 38 +++++----- .../predicate/ReversePredicateVisitor.java | 38 +++++----- .../plan/node/ICoreQueryPlanVisitor.java | 14 ++-- .../plan/node/IPartitionRelatedNode.java | 2 +- .../node/process/TwoChildProcessNode.java | 3 +- .../planner/plan/node/source/SourceNode.java | 4 +- .../function}/function/BoundSignature.java | 2 +- .../function}/function/FunctionId.java | 2 +- .../function}/function/FunctionKind.java | 2 +- .../function/InterpretedFunctionInvoker.java | 2 +- .../function/LongVariableConstraint.java | 2 +- .../function}/function/OperatorType.java | 2 +- .../function/ResolvedFunctionCallBuilder.java | 4 +- .../function}/function/Signature.java | 2 +- .../function/TableBuiltinTableFunction.java | 8 +- .../function/TypeVariableConstraint.java | 2 +- .../function/arithmetic/AdditionResolver.java | 2 +- .../function/arithmetic/DivisionResolver.java | 2 +- .../function/arithmetic/ModulusResolver.java | 2 +- .../arithmetic/MultiplicationResolver.java | 2 +- .../arithmetic/SubtractionResolver.java | 2 +- .../function/tvf/ClassifyTableFunction.java | 2 +- .../function/tvf/ForecastTableFunction.java | 6 +- .../tvf/PatternMatchTableFunction.java | 12 +-- .../function/tvf/TableFunctionUtils.java | 2 +- .../function/tvf/match/MatchConfig.java | 2 +- .../function/tvf/match/QetchAlgorithm.java | 18 ++--- .../function/tvf/match/model/MatchState.java | 4 +- .../tvf/match/model/PatternSegment.java | 4 +- .../function/tvf/match/model/Point.java | 2 +- .../tvf/match/model/RegexMatchState.java | 6 +- .../function/tvf/match/model/Section.java | 2 +- .../relational/metadata/ResolvedFunction.java | 9 ++- .../plan/relational/planner/Assignments.java | 3 +- .../DataOrganizationSpecification.java | 4 +- .../relational/planner/OrderingScheme.java | 4 +- .../planner/iterative/GroupReference.java | 2 +- .../planner/node/AggregationNode.java | 6 +- .../relational/planner/node/ApplyNode.java | 4 +- .../relational/planner/node/ExceptNode.java | 6 +- .../relational/planner/node/GroupNode.java | 2 +- .../planner/node/IntersectNode.java | 6 +- .../relational/planner/node/JoinNode.java | 2 +- .../relational/planner/node/LimitNode.java | 2 +- .../planner/node/MergeSortNode.java | 2 +- .../planner/node/PatternRecognitionNode.java | 2 +- .../relational/planner/node/ProjectNode.java | 2 +- .../relational/planner/node/SemiJoinNode.java | 2 +- .../planner/node/SetOperationNode.java | 2 +- .../relational/planner/node/SortNode.java | 2 +- .../planner/node/StreamSortNode.java | 2 +- .../planner/node/TableFunctionNode.java | 2 +- .../node/TableFunctionProcessorNode.java | 2 +- .../relational/planner/node/TopKNode.java | 2 +- .../planner/node/TopKRankingNode.java | 2 +- .../relational/planner/node/UnionNode.java | 1 - .../relational/planner/node/ValuesNode.java | 4 +- .../relational/planner/node/WindowNode.java | 16 ++-- .../rowpattern/AggregationValuePointer.java | 2 +- .../plan/relational/sql/ast/Cast.java | 1 - .../sql/ast/CommonQueryAstVisitor.java | 32 ++++++++ .../plan/relational/sql/ast/DataType.java | 5 +- .../plan/relational/sql/ast/Expression.java | 2 - .../plan/relational/sql/ast/FrameBound.java | 9 +-- .../relational/sql/ast/GenericDataType.java | 11 ++- .../plan/relational/sql/ast/IfExpression.java | 9 +-- .../relational/sql/ast/NullIfExpression.java | 9 +-- .../plan/relational/sql/ast/Row.java | 10 +-- .../plan/relational/sql/ast/Trim.java | 9 +-- .../plan/relational/sql/ast/WindowFrame.java | 8 +- .../relational/type/InternalTypeManager.java | 7 +- .../type/TypeSignatureTranslator.java | 8 +- .../ternary/Like3ColumnTransformer.java | 2 +- .../UserDefineScalarFunctionTransformer.java | 2 +- ...AbstractCastFunctionColumnTransformer.java | 4 +- .../impl/DataNodeInternalRPCServiceImpl.java | 12 +-- .../aggregation/AccumulatorFactory.java | 6 +- .../aggregation/UDAFAccumulator.java | 2 +- .../SlidingWindowAggregatorFactory.java | 2 +- .../process/FilterAndProjectOperator.java | 6 +- .../operator/process/TransformOperator.java | 2 +- .../process/rowpattern/PatternAggregator.java | 2 +- .../expression/CastComputation.java | 4 +- .../rowpattern/expression/Computation.java | 2 +- .../process/window/RowNumberOperator.java | 2 +- .../process/window/TopKRankingOperator.java | 2 +- .../window/partition/frame/FrameInfo.java | 4 +- .../relational/AbstractTableScanOperator.java | 2 +- ...formationSchemaContentSupplierFactory.java | 2 +- .../LastQueryAggTableScanOperator.java | 2 +- .../aggregation/AccumulatorFactory.java | 2 +- .../grouped/StreamingAggregationOperator.java | 2 +- .../InMemoryHashAggregationBuilder.java | 2 +- .../window/ConditionWindowParameter.java | 2 +- .../relational/ColumnTransformerBuilder.java | 58 +++++++------- .../db/queryengine/plan/Coordinator.java | 2 +- .../db/queryengine/plan/analyze/Analysis.java | 6 +- .../plan/analyze/AnalyzeVisitor.java | 16 ++-- .../plan/analyze/ConcatPathRewriter.java | 2 +- .../plan/analyze/ExpressionAnalyzer.java | 52 ++++++------- .../plan/analyze/ExpressionTypeAnalyzer.java | 40 +++++----- .../plan/analyze/ExpressionUtils.java | 60 +++++++-------- .../plan/analyze/GroupByLevelHelper.java | 2 +- .../plan/analyze/PredicateUtils.java | 38 +++++----- .../plan/analyze/SelectIntoUtils.java | 4 +- .../analyze/TemplatedAggregationAnalyze.java | 10 +-- .../plan/analyze/TemplatedAnalyze.java | 8 +- .../plan/analyze/TemplatedInfo.java | 6 +- .../plan/analyze/TypeProvider.java | 2 +- .../config/TableConfigTaskVisitor.java | 6 +- .../executor/ClusterConfigTaskExecutor.java | 4 +- .../config/metadata/ShowFunctionsTask.java | 2 +- .../optimization/AggregationPushDown.java | 6 +- .../optimization/ColumnInjectionPushDown.java | 2 +- .../optimization/LimitOffsetPushDown.java | 4 +- .../plan/optimization/PredicatePushDown.java | 4 +- .../queryengine/plan/parser/ASTVisitor.java | 68 ++++++++--------- .../plan/parser/StatementGenerator.java | 14 ++-- .../DataNodeTableOperatorGenerator.java | 8 +- .../plan/planner/LogicalPlanBuilder.java | 6 +- .../plan/planner/LogicalPlanVisitor.java | 4 +- .../plan/planner/OperatorTreeGenerator.java | 20 ++--- .../plan/planner/TemplatedLogicalPlan.java | 6 +- .../planner/TemplatedLogicalPlanBuilder.java | 2 +- .../distribution/DistributionPlanContext.java | 2 +- .../distribution/ExchangeNodeAdder.java | 2 +- .../distribution/NodeGroupContext.java | 2 +- .../SimpleFragmentParallelPlanner.java | 2 +- .../planner/distribution/SourceRewriter.java | 10 +-- .../plan/planner/plan/PlanFragment.java | 2 +- .../plan/planner/plan/TimePredicate.java | 2 +- .../planner/plan/TreeModelTimePredicate.java | 2 +- .../planner/plan/node/PlanGraphPrinter.java | 8 +- .../plan/planner/plan/node/PlanNodeType.java | 4 +- .../plan/planner/plan/node/WritePlanNode.java | 1 + .../metadata/read/SchemaFetchScanNode.java | 2 +- .../metadata/read/SchemaQueryScanNode.java | 2 +- .../metadata/read/TableDeviceSourceNode.java | 2 +- .../process/AggregationMergeSortNode.java | 2 +- .../plan/node/process/AggregationNode.java | 2 +- .../planner/plan/node/process/FilterNode.java | 2 +- .../node/process/RawDataAggregationNode.java | 2 +- .../plan/node/process/TransformNode.java | 2 +- .../process/join/LeftOuterTimeJoinNode.java | 2 +- .../plan/node/process/last/LastQueryNode.java | 2 +- .../AlignedSeriesAggregationScanNode.java | 2 +- .../node/source/AlignedSeriesScanNode.java | 2 +- .../node/source/LastSeriesSourceNode.java | 2 +- .../plan/node/source/RegionScanNode.java | 1 + .../source/SeriesAggregationScanNode.java | 2 +- .../source/SeriesAggregationSourceNode.java | 2 +- .../plan/node/source/SeriesScanNode.java | 2 +- .../node/source/SeriesScanSourceNode.java | 2 +- .../plan/node/source/SeriesSourceNode.java | 3 +- .../plan/node/source/ShowDiskUsageNode.java | 2 +- .../plan/parameter/AggregationDescriptor.java | 2 +- .../CrossSeriesAggregationDescriptor.java | 2 +- .../parameter/GroupByConditionParameter.java | 2 +- .../analyzer/AggregationAnalyzer.java | 8 +- .../plan/relational/analyzer/Analysis.java | 6 +- .../analyzer/ExpressionAnalyzer.java | 40 +++++----- .../analyzer/PatternRecognitionAnalysis.java | 2 +- .../analyzer/StatementAnalyzer.java | 16 ++-- .../ConvertPredicateToFilterVisitor.java | 8 +- .../ConvertPredicateToTimeFilterVisitor.java | 4 +- .../PredicateCombineIntoTableScanChecker.java | 4 +- .../PredicatePushIntoMetadataChecker.java | 6 +- .../PredicatePushIntoScanChecker.java | 4 +- .../analyzer/predicate/PredicateVisitor.java | 4 +- ...ConvertSchemaPredicateToFilterVisitor.java | 6 +- .../ExtractPredicateColumnNameVisitor.java | 4 +- .../plan/relational/metadata/Metadata.java | 2 +- .../metadata/OperatorNotFoundException.java | 2 +- .../metadata/TableMetadataImpl.java | 16 ++-- .../plan/relational/metadata/TableSchema.java | 2 +- .../fetcher/TableHeaderSchemaValidator.java | 4 +- .../planner/ExpressionExtractor.java | 2 +- .../planner/IrExpressionInterpreter.java | 12 +-- .../relational/planner/IrTypeAnalyzer.java | 10 +-- .../relational/planner/LiteralEncoder.java | 2 +- .../plan/relational/planner/PlanBuilder.java | 3 +- .../relational/planner/PredicateUtils.java | 2 +- .../plan/relational/planner/QueryPlanner.java | 17 +++-- .../relational/planner/RelationPlanner.java | 9 ++- .../relational/planner/SubqueryPlanner.java | 5 +- .../planner/TableLogicalPlanner.java | 5 +- .../relational/planner/TranslationMap.java | 4 +- .../TableDistributedPlanGenerator.java | 12 +-- .../distribute/TableDistributedPlanner.java | 2 +- .../planner/ir/DefaultTraversalVisitor.java | 4 +- .../planner/ir/ExpressionRewriter.java | 10 +-- .../planner/ir/ExpressionTreeRewriter.java | 12 +-- .../ir/GlobalTimePredicateExtractVisitor.java | 6 +- .../planner/iterative/IterativeOptimizer.java | 1 + .../relational/planner/iterative/Lookup.java | 1 + .../relational/planner/iterative/Memo.java | 1 + .../relational/planner/iterative/Plans.java | 1 + .../rule/CanonicalizeExpressionRewriter.java | 2 +- .../rule/EvaluateEmptyIntersect.java | 4 +- .../rule/ExpressionRewriteRuleSet.java | 2 +- .../iterative/rule/GatherAndMergeWindows.java | 4 +- .../iterative/rule/ImplementExceptAll.java | 4 +- .../rule/ImplementExceptDistinctAsUnion.java | 4 +- .../iterative/rule/ImplementIntersectAll.java | 4 +- .../ImplementIntersectDistinctAsUnion.java | 4 +- .../rule/ImplementPatternRecognition.java | 2 +- .../rule/ImplementTableFunctionSource.java | 2 +- .../iterative/rule/InlineProjections.java | 2 +- .../planner/iterative/rule/MergeExcept.java | 4 +- .../iterative/rule/MergeIntersect.java | 4 +- .../planner/iterative/rule/MergeUnion.java | 2 +- .../iterative/rule/PruneApplyColumns.java | 2 +- .../iterative/rule/PruneApplyCorrelation.java | 2 +- .../rule/PruneApplySourceColumns.java | 2 +- .../rule/PruneDistinctAggregation.java | 4 +- .../rule/PruneExceptSourceColumns.java | 2 +- .../rule/PruneIntersectSourceColumns.java | 2 +- .../rule/PushProjectionThroughUnion.java | 2 +- .../rule/RemoveEmptyExceptBranches.java | 4 +- .../rule/RemoveEmptyUnionBranches.java | 2 +- .../iterative/rule/RemoveRedundantExists.java | 4 +- .../RemoveUnreferencedScalarApplyNodes.java | 2 +- .../rule/ReplaceWindowWithRowNumber.java | 2 +- .../iterative/rule/SetOperationMerge.java | 6 +- .../rule/SetOperationNodeTranslator.java | 22 +++--- .../rule/SimplifyCountOverConstant.java | 10 +-- ...atedDistinctAggregationWithProjection.java | 2 +- ...elatedGlobalAggregationWithProjection.java | 2 +- ...tedGlobalAggregationWithoutProjection.java | 2 +- ...latedGroupedAggregationWithProjection.java | 2 +- .../TransformCorrelatedScalarSubquery.java | 6 +- .../TransformExistsApplyToCorrelatedJoin.java | 8 +- ...TransformFilteringSemiJoinToInnerJoin.java | 2 +- ...rrelatedInPredicateSubqueryToSemiJoin.java | 2 +- .../TransformUncorrelatedSubqueryToJoin.java | 6 +- .../planner/iterative/rule/Util.java | 4 +- .../node/AggregationTableScanNode.java | 6 +- .../AggregationTreeDeviceViewScanNode.java | 2 +- ...gnedAggregationTreeDeviceViewScanNode.java | 2 +- .../planner/node/CorrelatedJoinNode.java | 2 +- .../relational/planner/node/CteScanNode.java | 2 +- ...gnedAggregationTreeDeviceViewScanNode.java | 2 +- .../relational/planner/node/Patterns.java | 3 + .../planner/node/TableScanNode.java | 2 +- .../CheckSubqueryNodesAreRewritten.java | 2 +- .../optimizations/ParallelizeGrouping.java | 4 +- .../optimizations/PlanNodeDecorrelator.java | 4 +- .../PushLimitOffsetIntoTableScan.java | 2 +- .../PushPredicateIntoTableScan.java | 4 +- .../optimizations/QueryCardinalityUtil.java | 2 +- .../optimizations/SortElimination.java | 2 +- .../planner/optimizations/SymbolMapper.java | 6 +- .../TransformAggregationToStreamable.java | 4 +- ...tifiedComparisonApplyToCorrelatedJoin.java | 10 +-- .../TransformSortToStreamSort.java | 2 +- .../UnaliasSymbolReferences.java | 12 +-- .../planner/optimizations/Util.java | 8 +- .../sql/ast/AlterColumnDataType.java | 1 + .../plan/relational/sql/ast/AstVisitor.java | 32 -------- .../relational/sql/ast/ColumnDefinition.java | 2 + .../sql/ast/DefaultTraversalVisitor.java | 4 + .../plan/relational/sql/ast/DeleteDevice.java | 4 +- .../relational/sql/ast/TypeParameter.java | 1 + .../sql/ast/ViewFieldDefinition.java | 2 + .../sql/ast/WindowSpecification.java | 1 + .../relational/sql/parser/AstBuilder.java | 16 ++-- .../plan/relational/sql/parser/SqlParser.java | 2 +- .../sql/util/ExpressionFormatter.java | 14 ++-- .../relational/sql/util/SqlFormatter.java | 2 +- .../statement/component/GroupByComponent.java | 2 +- .../component/GroupByConditionComponent.java | 2 +- .../statement/component/HavingCondition.java | 2 +- .../statement/component/IntoComponent.java | 2 +- .../statement/component/OrderByComponent.java | 2 +- .../statement/component/ResultColumn.java | 2 +- .../statement/component/SelectComponent.java | 2 +- .../plan/statement/component/SortItem.java | 2 +- .../statement/component/WhereCondition.java | 2 +- .../statement/crud/InsertBaseStatement.java | 2 +- .../statement/crud/InsertTabletStatement.java | 2 +- .../plan/statement/crud/QueryStatement.java | 8 +- .../view/AlterLogicalViewStatement.java | 2 +- .../view/CreateLogicalViewStatement.java | 4 +- .../plan/udf/UDFManagementService.java | 2 +- .../dag/builder/EvaluationDAGBuilder.java | 4 +- .../dag/input/ConstantInputReader.java | 2 +- .../ConstantIntermediateLayer.java | 2 +- .../dag/intermediate/IntermediateLayer.java | 2 +- .../dag/intermediate/MultiInputLayer.java | 2 +- .../SingleInputMultiReferenceLayer.java | 2 +- .../SingleInputSingleReferenceLayer.java | 2 +- .../dag/memory/LayerMemoryAssigner.java | 6 +- .../unary/scalar/CastFunctionTransformer.java | 2 +- .../transformation/dag/udf/UDTFContext.java | 4 +- .../dag/util/TransformUtils.java | 2 +- .../impl/SchemaRegionMemoryImpl.java | 4 +- .../impl/TimeseriesReaderWithViewFetch.java | 4 +- .../schemaregion/view/ViewPaths.java | 6 +- .../visitor/TransformToExpressionVisitor.java | 63 ++++++++------- .../iotdb/db/utils/TypeInferenceUtils.java | 14 ++-- .../common/schematree/NodeRefTest.java | 4 +- .../operator/OperatorMemoryTest.java | 12 +-- .../operator/TransformOperatorTest.java | 4 +- .../ConvertPredicateToTimeFilterTest.java | 34 ++++----- .../predicate/PredicatePushIntoScanTest.java | 36 ++++----- .../predicate/PredicateRemoveNotTest.java | 30 ++++---- .../predicate/PredicateUtilsTest.java | 10 +-- .../TreePredicateConversionTest.java | 18 ++--- .../serde/CaseWhenThenExpressionTest.java | 18 ++--- .../analyze/AggregationDescriptorTest.java | 2 +- .../plan/analyze/AnalyzeFailTest.java | 2 +- .../queryengine/plan/analyze/AnalyzeTest.java | 44 +++++------ .../plan/analyze/ExpressionAnalyzerTest.java | 14 ++-- .../optimization/AggregationPushDownTest.java | 8 +- .../ColumnInjectionPushDownTest.java | 2 +- .../optimization/LimitOffsetPushDownTest.java | 12 +-- .../optimization/OptimizationTestUtil.java | 2 +- .../optimization/PredicatePushDownTest.java | 14 ++-- .../plan/optimization/TestPlanBuilder.java | 2 +- .../plan/parser/StatementGeneratorTest.java | 16 ++-- .../plan/planner/ExpressionTest.java | 6 +- .../planner/FragmentInstanceSerdeTest.java | 2 +- .../plan/planner/PipelineBuilderTest.java | 2 +- .../AggregationDistributionTest.java | 4 +- .../plan/planner/distribution/Util.java | 4 +- .../logical/DataQueryLogicalPlannerTest.java | 10 +-- .../SchemaQueryLogicalPlannerTest.java | 4 +- .../process/AggregationNodeSerdeTest.java | 6 +- .../node/process/FilterNodeSerdeTest.java | 8 +- .../process/GroupByLevelNodeSerdeTest.java | 8 +- .../node/process/GroupByTagNodeSerdeTest.java | 10 +-- .../node/process/WindowNodeSerdeTest.java | 12 +-- .../SeriesAggregationScanNodeSerdeTest.java | 8 +- .../relational/analyzer/AnalyzerTest.java | 4 +- .../plan/relational/analyzer/AuthTest.java | 2 +- .../analyzer/RowPatternRecognitionTest.java | 2 +- .../relational/analyzer/TSBSMetadata.java | 4 +- .../analyzer/TableFunctionTest.java | 6 +- .../relational/analyzer/TestMetadata.java | 8 +- .../relational/analyzer/TestPlanBuilder.java | 2 +- .../PatternRecognitionNodeSerdeTest.java | 1 + .../plan/relational/planner/PlanTester.java | 2 +- .../assertions/AggregationFunction.java | 2 +- .../AggregationFunctionProvider.java | 2 +- .../assertions/ExpressionVerifier.java | 4 +- .../planner/assertions/LimitMatcher.java | 2 +- .../planner/assertions/PlanAssert.java | 2 +- .../planner/assertions/PlanMatchPattern.java | 6 +- .../assertions/PlanMatchingVisitor.java | 4 +- .../assertions/SpecificationProvider.java | 4 +- .../planner/assertions/SymbolAliases.java | 2 +- .../relational/planner/assertions/Util.java | 2 +- .../assertions/WindowFunctionMatcher.java | 2 +- .../plan/statement/InsertStatementTest.java | 2 +- .../hmac/HmacMd5ColumnTransformerTest.java | 2 +- .../hmac/HmacSha1ColumnTransformerTest.java | 2 +- .../hmac/HmacSha256ColumnTransformerTest.java | 2 +- .../hmac/HmacSha512ColumnTransformerTest.java | 2 +- .../ternary/LpadColumnTransformerTest.java | 2 +- .../ternary/RpadColumnTransformerTest.java | 2 +- .../unary/UnaryColumnTransformerTest.java | 2 +- .../BlobLengthColumnTransformerTest.java | 2 +- 450 files changed, 1708 insertions(+), 1694 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/Expression.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/ExpressionFactory.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/ExpressionType.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/UnknownExpressionTypeException.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/AdditionExpression.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/ArithmeticBinaryExpression.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/BinaryExpression.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/CompareBinaryExpression.java (71%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/DivisionExpression.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/EqualToExpression.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/GreaterEqualExpression.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/GreaterThanExpression.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/LessEqualExpression.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/LessThanExpression.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/LogicAndExpression.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/LogicBinaryExpression.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/LogicOrExpression.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/ModuloExpression.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/MultiplicationExpression.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/NonEqualExpression.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/SubtractionExpression.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/binary/WhenThenExpression.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/leaf/ConstantOperand.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/leaf/LeafOperand.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/leaf/NullOperand.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/leaf/TimeSeriesOperand.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/leaf/TimestampOperand.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/multi/FunctionExpression.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/multi/FunctionType.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/multi/builtin/BuiltInFunctionHelper.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/multi/builtin/BuiltInScalarFunctionHelper.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java (71%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/multi/builtin/helper/CastFunctionHelper.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/multi/builtin/helper/DiffFunctionHelper.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/multi/builtin/helper/ReplaceFunctionHelper.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/multi/builtin/helper/RoundFunctionHelper.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/multi/builtin/helper/SubStringFunctionHelper.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/other/CaseWhenThenExpression.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/other/GroupByTimeExpression.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/ternary/BetweenExpression.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/ternary/TernaryExpression.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/unary/InExpression.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/unary/IsNullExpression.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/unary/LikeExpression.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/unary/LogicNotExpression.java (76%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/unary/NegationExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/unary/RegularExpression.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/unary/UnaryExpression.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/CollectAggregationExpressionsVisitor.java (80%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/CollectSourceExpressionsVisitor.java (77%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/CollectVisitor.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/ColumnTransformerVisitor.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/CompleteMeasurementSchemaVisitor.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/ConcatDeviceVisitor.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/CountTimeAggregationAmountVisitor.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/ExistUnknownTypeInExpression.java (80%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/ExpressionAnalyzeVisitor.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/ExpressionNormalizeVisitor.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/ExpressionVisitor.java (66%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/GetMeasurementExpressionVisitor.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/IntermediateLayerVisitor.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/LowercaseNormalizeVisitor.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/ReconstructVisitor.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/RemoveRootPrefixVisitor.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/ReplaceLogicalViewVisitor.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/ReplaceSubTreeWithViewVisitor.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/TransformToViewExpressionVisitor.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/cartesian/CartesianProductVisitor.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/cartesian/QueryContextProvider.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/logical/LogicalAndVisitor.java (75%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/logical/LogicalOrVisitor.java (75%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/logical/TimeFilterExistChecker.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/predicate/PredicatePushIntoScanChecker.java (78%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/predicate/PredicateSimplifier.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/predicate/PredicateVisitor.java (64%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan => node_commons/plan/expression}/expression/visitor/predicate/ReversePredicateVisitor.java (74%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/planner/plan/node/IPartitionRelatedNode.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/planner/plan/node/process/TwoChildProcessNode.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/planner/plan/node/source/SourceNode.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/BoundSignature.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/FunctionId.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/FunctionKind.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/InterpretedFunctionInvoker.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/LongVariableConstraint.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/OperatorType.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/ResolvedFunctionCallBuilder.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/Signature.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/TableBuiltinTableFunction.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/TypeVariableConstraint.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/arithmetic/AdditionResolver.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/arithmetic/DivisionResolver.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/arithmetic/ModulusResolver.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/arithmetic/MultiplicationResolver.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/arithmetic/SubtractionResolver.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/tvf/ClassifyTableFunction.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/tvf/ForecastTableFunction.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/tvf/PatternMatchTableFunction.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/tvf/TableFunctionUtils.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/tvf/match/MatchConfig.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/tvf/match/QetchAlgorithm.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/tvf/match/model/MatchState.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/tvf/match/model/PatternSegment.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/tvf/match/model/Point.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/tvf/match/model/RegexMatchState.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/plan/relational => node_commons/plan/relational/function}/function/tvf/match/model/Section.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/metadata/ResolvedFunction.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/Assignments.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/DataOrganizationSpecification.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/OrderingScheme.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/iterative/GroupReference.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/ApplyNode.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/ExceptNode.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/IntersectNode.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/SetOperationNode.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/DataType.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/FrameBound.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/GenericDataType.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/IfExpression.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/NullIfExpression.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Row.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Trim.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/WindowFrame.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/type/InternalTypeManager.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/type/TypeSignatureTranslator.java (92%) diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl index 587c3097de687..75881b32b2130 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl @@ -23,11 +23,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; import org.apache.tsfile.read.common.type.Type; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.AdditionResolver; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.DivisionResolver; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.ModulusResolver; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.MultiplicationResolver; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.AdditionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.DivisionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.ModulusResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.MultiplicationResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.SubtractionResolver; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.DoubleNegationColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.FloatNegationColumnTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 330b29d929e05..d054095cf97c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -25,6 +25,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; @@ -69,6 +73,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; @@ -147,10 +154,7 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionKind; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToBlobLiteralVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToBooleanLiteralVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToDateLiteralVisitor; @@ -160,12 +164,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToInt64LiteralVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToStringLiteralVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToTimestampLiteralVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; @@ -211,6 +211,7 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; import static org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; @@ -228,7 +229,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.DESC_NULLS_LAST; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch.ONE; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition.LAST; -import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_AGGREGATION; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/Expression.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/Expression.java index 9b89a122b06d4..c46d2378df975 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/Expression.java @@ -17,39 +17,39 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression; +package org.apache.iotdb.db.node_commons.plan.expression.expression; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.DivisionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ModuloExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ExpressionFactory.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ExpressionFactory.java index b45a90c5b8026..6428bc6658c40 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ExpressionFactory.java @@ -17,33 +17,33 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression; +package org.apache.iotdb.db.node_commons.plan.expression.expression; import org.apache.iotdb.common.rpc.thrift.TAggregationType; 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.db.queryengine.plan.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ExpressionType.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ExpressionType.java index 81a98956c47b0..bf4ec8790a254 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ExpressionType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression; +package org.apache.iotdb.db.node_commons.plan.expression.expression; public enum ExpressionType { CONSTANT((short) -4, (short) 1400), diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/UnknownExpressionTypeException.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/UnknownExpressionTypeException.java index 459f19680d66f..51915a1b9e565 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/UnknownExpressionTypeException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression; +package org.apache.iotdb.db.node_commons.plan.expression.expression; public class UnknownExpressionTypeException extends IllegalArgumentException { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/AdditionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/AdditionExpression.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/AdditionExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/AdditionExpression.java index 88383201cf7d8..853194a0325f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/AdditionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/AdditionExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ArithmeticBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/ArithmeticBinaryExpression.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ArithmeticBinaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/ArithmeticBinaryExpression.java index a43e348ffe9a2..8b39751ea188f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ArithmeticBinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/ArithmeticBinaryExpression.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/BinaryExpression.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/BinaryExpression.java index 39189759a60f1..b25a1d66d9c23 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/BinaryExpression.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.common.NodeRef; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/CompareBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/CompareBinaryExpression.java similarity index 71% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/CompareBinaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/CompareBinaryExpression.java index 7b2f744f1d038..7d565da51a165 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/CompareBinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/CompareBinaryExpression.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.GREATER_EQUAL; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.GREATER_THAN; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.LESS_EQUAL; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.LESS_THAN; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType.GREATER_EQUAL; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType.GREATER_THAN; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType.LESS_EQUAL; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType.LESS_THAN; public abstract class CompareBinaryExpression extends BinaryExpression { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/DivisionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/DivisionExpression.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/DivisionExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/DivisionExpression.java index ca8bd5a2d2807..ce47ee1b3bda0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/DivisionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/DivisionExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/EqualToExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/EqualToExpression.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/EqualToExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/EqualToExpression.java index ae61914c6a4d0..a9f17259e830c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/EqualToExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/EqualToExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterEqualExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/GreaterEqualExpression.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterEqualExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/GreaterEqualExpression.java index 3f8c32cb77e63..82e65daddcb83 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterEqualExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/GreaterEqualExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterThanExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/GreaterThanExpression.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterThanExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/GreaterThanExpression.java index 484a0ce51cced..d3b36dbf3195d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterThanExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/GreaterThanExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessEqualExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LessEqualExpression.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessEqualExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LessEqualExpression.java index 74d80793f7ec8..73099bd28e166 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessEqualExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LessEqualExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessThanExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LessThanExpression.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessThanExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LessThanExpression.java index 413476f2c4959..f993a83e2b12a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessThanExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LessThanExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicAndExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicAndExpression.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicAndExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicAndExpression.java index e73977fd14852..fc3c637aa1b9a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicAndExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicAndExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicBinaryExpression.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicBinaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicBinaryExpression.java index a8adeb070b1d9..943c259f91813 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicBinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicBinaryExpression.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicOrExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicOrExpression.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicOrExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicOrExpression.java index 134208d04239b..20919c90b42a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicOrExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicOrExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ModuloExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/ModuloExpression.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ModuloExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/ModuloExpression.java index 6e98a30bd3249..f646c4674bb5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ModuloExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/ModuloExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/MultiplicationExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/MultiplicationExpression.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/MultiplicationExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/MultiplicationExpression.java index 8ed7d625d5b94..8659cf911361c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/MultiplicationExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/MultiplicationExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/NonEqualExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/NonEqualExpression.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/NonEqualExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/NonEqualExpression.java index e1a19a64d2fb1..6f2e2894ef5c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/NonEqualExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/NonEqualExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/SubtractionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/SubtractionExpression.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/SubtractionExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/SubtractionExpression.java index c6ee62cbeaa4f..95f46de46398b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/SubtractionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/SubtractionExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/WhenThenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/WhenThenExpression.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/WhenThenExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/WhenThenExpression.java index c12c09852af24..d69e0fd750693 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/WhenThenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/WhenThenExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.binary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/ConstantOperand.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/ConstantOperand.java index f4527cdc755a3..391c234d080f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/ConstantOperand.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.leaf; +package org.apache.iotdb.db.node_commons.plan.expression.expression.leaf; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/LeafOperand.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/LeafOperand.java index 31d8aa4ff07a0..3173d89590544 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/LeafOperand.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.leaf; +package org.apache.iotdb.db.node_commons.plan.expression.expression.leaf; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/NullOperand.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/NullOperand.java index 4e2781a133c5e..1988a70f672ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/NullOperand.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.leaf; +package org.apache.iotdb.db.node_commons.plan.expression.expression.leaf; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/TimeSeriesOperand.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/TimeSeriesOperand.java index 4ce4c00fe4c6c..c7db6b304f457 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/TimeSeriesOperand.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.leaf; +package org.apache.iotdb.db.node_commons.plan.expression.expression.leaf; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/TimestampOperand.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/TimestampOperand.java index 6c817a203363b..ff3c8ba01bff0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/TimestampOperand.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.leaf; +package org.apache.iotdb.db.node_commons.plan.expression.expression.leaf; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/FunctionExpression.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/FunctionExpression.java index aef4a199c390e..d3cd620d3a5b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/FunctionExpression.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.multi; +package org.apache.iotdb.db.node_commons.plan.expression.expression.multi; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.common.NodeRef; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinScalarFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/FunctionType.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/FunctionType.java index ec37e974ee39f..95d4e37215282 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/FunctionType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.multi; +package org.apache.iotdb.db.node_commons.plan.expression.expression.multi; /** */ public enum FunctionType { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInFunctionHelper.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInFunctionHelper.java index 9a7cdfca87fd6..062f047ed83bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInFunctionHelper.java @@ -17,6 +17,6 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin; +package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin; public interface BuiltInFunctionHelper {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java index 51134877fb670..aef002a576879 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin; +package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.tsfile.enums.TSDataType; @@ -71,7 +71,7 @@ ColumnTransformer getBuiltInScalarFunctionColumnTransformer( /** * Construct a {@link Transformer} for this built-in function in {@link - * org.apache.iotdb.db.queryengine.plan.expression.visitor.IntermediateLayerVisitor} + * org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.IntermediateLayerVisitor} * * @param expression The FunctionExpression representing the scalar function * @param layerReader input reader diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java similarity index 71% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java index 80cf9d282769c..6a9066dfa16cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin; +package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.DiffFunctionHelper; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.ReplaceFunctionHelper; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.RoundFunctionHelper; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.SubStringFunctionHelper; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.CastFunctionHelper; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.DiffFunctionHelper; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.ReplaceFunctionHelper; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.RoundFunctionHelper; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.SubStringFunctionHelper; public class BuiltInScalarFunctionHelperFactory { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/CastFunctionHelper.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/CastFunctionHelper.java index 40f46cde82e84..f3a541ab0b714 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/CastFunctionHelper.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.common.SessionInfo; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; -import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CastFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.common.SessionInfo; +import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.CastFunctionTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/DiffFunctionHelper.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/DiffFunctionHelper.java index 8814d753f77a7..b39c515900405 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/DiffFunctionHelper.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; -import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DiffFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.DiffFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java index 9f7def6317971..882eb58505be1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; -import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ReplaceFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.ReplaceFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/RoundFunctionHelper.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/RoundFunctionHelper.java index 51abf6b268bf2..46eef5cf61250 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/RoundFunctionHelper.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; -import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RoundFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.RoundFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java index 4863485290d24..a4b60cca2f03d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; -import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.SubStringFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.SubStringFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/other/CaseWhenThenExpression.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/other/CaseWhenThenExpression.java index c0a30bb685430..6674e082f1eea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/other/CaseWhenThenExpression.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.other; +package org.apache.iotdb.db.node_commons.plan.expression.expression.other; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.common.NodeRef; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/other/GroupByTimeExpression.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/other/GroupByTimeExpression.java index 4ee3c174bc4b5..9d686300158ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/other/GroupByTimeExpression.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.other; +package org.apache.iotdb.db.node_commons.plan.expression.expression.other; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ternary/BetweenExpression.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ternary/BetweenExpression.java index 00b307df3409c..3d18d9a9645cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ternary/BetweenExpression.java @@ -19,12 +19,12 @@ * */ -package org.apache.iotdb.db.queryengine.plan.expression.ternary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.ternary; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ternary/TernaryExpression.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ternary/TernaryExpression.java index 3fb533a9f00f0..dc29782ba349a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ternary/TernaryExpression.java @@ -19,11 +19,11 @@ * */ -package org.apache.iotdb.db.queryengine.plan.expression.ternary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.ternary; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/InExpression.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/InExpression.java index 0ace411cd94ef..3bf47238b782a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/InExpression.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.unary; - +package org.apache.iotdb.db.node_commons.plan.expression.expression.unary; + +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/IsNullExpression.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/IsNullExpression.java index 9542b29e2da8f..d34ac84e4b5f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/IsNullExpression.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.unary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.unary; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/LikeExpression.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/LikeExpression.java index f9cdf0427bf0e..42f089140d377 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/LikeExpression.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.unary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.unary; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/LogicNotExpression.java similarity index 76% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/LogicNotExpression.java index 9797376e54588..e910eebb4d85e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/LogicNotExpression.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.unary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.unary; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/NegationExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/NegationExpression.java index d496a05c2617a..d13a1a9da9c51 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/NegationExpression.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.unary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.unary; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/RegularExpression.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/RegularExpression.java index 06194ef5bc776..4d974f654048b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/RegularExpression.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.unary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.unary; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.tsfile.external.commons.lang3.Validate; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/UnaryExpression.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/UnaryExpression.java index 8b0689299ffcb..20fc66cc08d65 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/UnaryExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.unary; +package org.apache.iotdb.db.node_commons.plan.expression.expression.unary; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; 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/node_commons/plan/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java index 13df1ff2c2bd8..5bccacbb7fee9 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/node_commons/plan/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.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.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectAggregationExpressionsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectAggregationExpressionsVisitor.java similarity index 80% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectAggregationExpressionsVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectAggregationExpressionsVisitor.java index 5595a92585cee..bdb5094c2e3f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectAggregationExpressionsVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectAggregationExpressionsVisitor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; -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.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import java.util.Collections; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectSourceExpressionsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectSourceExpressionsVisitor.java similarity index 77% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectSourceExpressionsVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectSourceExpressionsVisitor.java index 156dbe72d1708..de09d3e78a232 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectSourceExpressionsVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectSourceExpressionsVisitor.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; -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; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import java.util.Collections; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectVisitor.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectVisitor.java index 16e545d768dd5..05969a4402829 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectVisitor.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ColumnTransformerVisitor.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ColumnTransformerVisitor.java index ca38e32f3c735..4722897fcce39 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ColumnTransformerVisitor.java @@ -17,28 +17,25 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; - -import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; + +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.TreeCaseWhenThenColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticAdditionColumnTransformer; @@ -54,8 +51,6 @@ import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareNonEqualColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.LogicAndColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.LogicOrColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LongDivisionLongColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LongModulusLongColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.ConstantColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; @@ -69,6 +64,11 @@ import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LikeColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LogicNotColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.RegularColumnTransformer; +import org.apache.iotdb.db.queryengine.common.NodeRef; +import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LongDivisionLongColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LongModulusLongColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; @@ -84,7 +84,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.BETWEEN; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType.BETWEEN; import static org.apache.tsfile.enums.TSDataType.UNKNOWN; import static org.apache.tsfile.read.common.type.LongType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java index f8bb7b8dbe7bd..8ef1018dfcb8c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.metadata.view.BrokenViewException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; 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.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ConcatDeviceVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ConcatDeviceVisitor.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ConcatDeviceVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ConcatDeviceVisitor.java index b62e1a230457e..351fb697a76ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ConcatDeviceVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ConcatDeviceVisitor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; public class ConcatDeviceVisitor extends ReconstructVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CountTimeAggregationAmountVisitor.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CountTimeAggregationAmountVisitor.java index 1a573f856c26e..c3f5182fc56bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CountTimeAggregationAmountVisitor.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; import org.apache.iotdb.db.exception.sql.SemanticException; -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.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import java.util.Collections; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExistUnknownTypeInExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExistUnknownTypeInExpression.java similarity index 80% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExistUnknownTypeInExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExistUnknownTypeInExpression.java index d786e48dd0083..90630ae886dc6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExistUnknownTypeInExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExistUnknownTypeInExpression.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; -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; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionAnalyzeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionAnalyzeVisitor.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionAnalyzeVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionAnalyzeVisitor.java index e31921d7c643d..fe2e76db8452b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionAnalyzeVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionAnalyzeVisitor.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import java.util.List; import java.util.stream.Collectors; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionNormalizeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionNormalizeVisitor.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionNormalizeVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionNormalizeVisitor.java index 59868395c3969..54bea4dc9c35d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionNormalizeVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionNormalizeVisitor.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionVisitor.java similarity index 66% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionVisitor.java index 74537fb60b84a..2e7ce20c82d37 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionVisitor.java @@ -17,44 +17,44 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; - -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; + +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.DivisionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ModuloExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; /** * This class provides a visitor of {@link Expression}, which can be extended to create a visitor diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/GetMeasurementExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/GetMeasurementExpressionVisitor.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/GetMeasurementExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/GetMeasurementExpressionVisitor.java index 4eefc378cfada..b1f58d6545e36 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/GetMeasurementExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/GetMeasurementExpressionVisitor.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionTypeAnalyzer; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; public class GetMeasurementExpressionVisitor extends ReconstructVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/IntermediateLayerVisitor.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/IntermediateLayerVisitor.java index b2ab7c6e10f95..440007d1df6b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/IntermediateLayerVisitor.java @@ -17,26 +17,26 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.input.QueryDataSetInputLayer; import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.ConstantIntermediateLayer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/LowercaseNormalizeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/LowercaseNormalizeVisitor.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/LowercaseNormalizeVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/LowercaseNormalizeVisitor.java index 973388dba1e33..fe54650651389 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/LowercaseNormalizeVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/LowercaseNormalizeVisitor.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReconstructVisitor.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReconstructVisitor.java index 94e2022637558..4b4e05ef431c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReconstructVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; import org.apache.iotdb.db.utils.constant.SqlConstant; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/RemoveRootPrefixVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/RemoveRootPrefixVisitor.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/RemoveRootPrefixVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/RemoveRootPrefixVisitor.java index 57b2b65a52902..8668f310f2bd3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/RemoveRootPrefixVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/RemoveRootPrefixVisitor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import static org.apache.iotdb.commons.schema.SchemaConstant.ROOT; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceLogicalViewVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceLogicalViewVisitor.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceLogicalViewVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceLogicalViewVisitor.java index 39fe3c637c938..95a1a72cafb6e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceLogicalViewVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceLogicalViewVisitor.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.GetSourcePathsVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.TransformToExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java index dd71fbca165b7..d63de93bdde0c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; import org.apache.iotdb.db.queryengine.plan.analyze.GroupByLevelHelper; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; import java.util.function.UnaryOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceSubTreeWithViewVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceSubTreeWithViewVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java index 49702ff5528e9..6c03a5a06a69c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceSubTreeWithViewVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; 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.leaf.TimeSeriesOperand; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java index 682ed41093481..c4e9257d952f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.tsfile.write.schema.IMeasurementSchema; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TransformToViewExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/TransformToViewExpressionVisitor.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TransformToViewExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/TransformToViewExpressionVisitor.java index 27befb28c9066..09658f1154373 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TransformToViewExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/TransformToViewExpressionVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.binary.arithmetic.AdditionViewExpression; @@ -45,33 +45,33 @@ import org.apache.iotdb.commons.schema.view.viewExpression.unary.LogicNotViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.unary.NegationViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.unary.RegularViewExpression; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.DivisionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ModuloExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java index a26863e5a4e33..f4d37f85aee31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.CompleteMeasurementSchemaVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.CompleteMeasurementSchemaVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.TransformToExpressionVisitor; import org.apache.iotdb.db.utils.constant.SqlConstant; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java index 71691cd79e651..62c4217dee00a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.external.commons.lang3.Validate; @@ -41,11 +41,11 @@ import java.util.List; import java.util.stream.Collectors; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructBinaryExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructTimeSeriesOperandsWithMemoryCheck; -import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; import static org.apache.iotdb.db.utils.TypeInferenceUtils.bindTypeForBuiltinAggregationNonSeriesInputExpressions; import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/CartesianProductVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/CartesianProductVisitor.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/CartesianProductVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/CartesianProductVisitor.java index 78a9b2ab974ae..ce2e508989e82 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/CartesianProductVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/CartesianProductVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionAnalyzeVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionAnalyzeVisitor; import java.util.ArrayList; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java index 00e71b6f08caa..a1e46e593d22c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.external.commons.lang3.Validate; @@ -41,9 +41,9 @@ import java.util.List; import java.util.stream.Collectors; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; -import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; import static org.apache.iotdb.db.utils.TypeInferenceUtils.bindTypeForBuiltinAggregationNonSeriesInputExpressions; import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java index 79fdd754f273a..2595e52fe9a3c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.tsfile.enums.TSDataType; @@ -32,7 +32,7 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; public class ConcatDeviceAndBindSchemaForHavingVisitor extends ConcatDeviceAndBindSchemaForExpressionVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java index e263970ed8006..9f2b87b608ed5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.tsfile.external.commons.lang3.Validate; @@ -37,10 +37,10 @@ import java.util.Collections; import java.util.List; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructTimeSeriesOperandsWithMemoryCheck; -import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; public class ConcatDeviceAndBindSchemaForPredicateVisitor extends CartesianProductVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java index 391c66ad3c228..3d998089f3dc3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.common.constant.TsFileConstant; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/QueryContextProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/QueryContextProvider.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/QueryContextProvider.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/QueryContextProvider.java index 2eb0ec0b4e72f..22b2b58145ad6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/QueryContextProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/QueryContextProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalAndVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/LogicalAndVisitor.java similarity index 75% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalAndVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/LogicalAndVisitor.java index d3369e2c9d08d..915642ad53690 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalAndVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/LogicalAndVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.logical; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.logical; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionAnalyzeVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionAnalyzeVisitor; public abstract class LogicalAndVisitor extends ExpressionAnalyzeVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalOrVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/LogicalOrVisitor.java similarity index 75% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalOrVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/LogicalOrVisitor.java index 96c0077460e28..e9e9fa7871000 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalOrVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/LogicalOrVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.logical; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.logical; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionAnalyzeVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionAnalyzeVisitor; public abstract class LogicalOrVisitor extends ExpressionAnalyzeVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java index 3a7c1ddbb37fe..675a3c39538f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.logical; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.logical; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; public class PredicateCanPushDownToSourceChecker extends LogicalAndVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/TimeFilterExistChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/TimeFilterExistChecker.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/TimeFilterExistChecker.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/TimeFilterExistChecker.java index a1d0992facc48..1b5c8160381b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/TimeFilterExistChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/TimeFilterExistChecker.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.logical; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.logical; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; public class TimeFilterExistChecker extends LogicalOrVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java index 1b14f05833724..441337bd4aa1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java @@ -17,30 +17,30 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; import org.apache.iotdb.db.utils.DateTimeUtils; import com.google.common.io.BaseEncoding; @@ -65,7 +65,7 @@ import java.util.Set; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression.flipType; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression.flipType; import static org.apache.tsfile.enums.TSDataType.DOUBLE; import static org.apache.tsfile.enums.TSDataType.INT32; import static org.apache.tsfile.enums.TSDataType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java index 7982de7d01542..77ccb6695ea82 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -17,27 +17,27 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; - -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate; + +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.tsfile.enums.TSDataType; @@ -51,7 +51,7 @@ import java.util.TimeZone; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression.flipType; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression.flipType; import static org.apache.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG; public class ConvertPredicateToTimeFilterVisitor extends PredicateVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicatePushIntoScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicatePushIntoScanChecker.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java index f692e27a85861..8ee8be0ef4802 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicatePushIntoScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java @@ -17,26 +17,26 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; - -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate; + +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; import static org.apache.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateSimplifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicateSimplifier.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateSimplifier.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicateSimplifier.java index be81a33587c40..90596769414e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateSimplifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicateSimplifier.java @@ -17,35 +17,35 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.binary.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionAnalyzeVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionAnalyzeVisitor; import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.ConvertPredicateToFilterVisitor.getValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate.ConvertPredicateToFilterVisitor.getValue; public class PredicateSimplifier extends ExpressionAnalyzeVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicateVisitor.java similarity index 64% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicateVisitor.java index fe36b95fd04aa..6e3336bcd5b81 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicateVisitor.java @@ -17,25 +17,25 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; - -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate; + +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; /** * This class provides a visitor of {@link Expression}, which can be extended to create a visitor diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ReversePredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java similarity index 74% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ReversePredicateVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java index e9b5c715fb4fd..2da98ce9dbf73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ReversePredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java @@ -17,25 +17,25 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; - -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; -import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; +package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate; + +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; public class ReversePredicateVisitor extends PredicateVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java index 550b358b462a5..cfffdd82d02ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java @@ -16,14 +16,20 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; @@ -46,12 +52,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; public interface ICoreQueryPlanVisitor extends IPlanVisitor { @@ -92,8 +93,7 @@ default R visitFilter(FilterNode node, C context) { return visitSingleChildProcess(node, context); } - default R visitApply( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode node, C context) { + default R visitApply(ApplyNode node, C context) { return visitTwoChildProcess(node, context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/IPartitionRelatedNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPartitionRelatedNode.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/IPartitionRelatedNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPartitionRelatedNode.java index 61b078d611708..ef2a803454b9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/IPartitionRelatedNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPartitionRelatedNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.planner.plan.node; +package org.apache.iotdb.db.node_commons.plan.planner.plan.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/TwoChildProcessNode.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/TwoChildProcessNode.java index 7b4ac63889df5..ab2d4544e6afb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/TwoChildProcessNode.java @@ -17,11 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +package org.apache.iotdb.db.node_commons.plan.planner.plan.node.process; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/source/SourceNode.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SourceNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/source/SourceNode.java index 4aa11f68f2975..ebb20e3e2c229 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/source/SourceNode.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; +package org.apache.iotdb.db.node_commons.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPartitionRelatedNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.IPartitionRelatedNode; public abstract class SourceNode extends PlanNode implements AutoCloseable, IPartitionRelatedNode { protected SourceNode() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/BoundSignature.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/BoundSignature.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/BoundSignature.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/BoundSignature.java index e16ce6e549dc9..7ccae2a01708d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/BoundSignature.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/BoundSignature.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function; +package org.apache.iotdb.db.node_commons.plan.relational.function.function; import org.apache.iotdb.db.queryengine.plan.relational.utils.TypeUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/FunctionId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionId.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/FunctionId.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionId.java index d814d8b4db635..4bec7ab1a76cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/FunctionId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionId.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function; +package org.apache.iotdb.db.node_commons.plan.relational.function.function; import java.util.Locale; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/FunctionKind.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionKind.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/FunctionKind.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionKind.java index 1e336502af9a9..b07b0968acbe9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/FunctionKind.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionKind.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function; +package org.apache.iotdb.db.node_commons.plan.relational.function.function; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/InterpretedFunctionInvoker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/InterpretedFunctionInvoker.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/InterpretedFunctionInvoker.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/InterpretedFunctionInvoker.java index c85605233cbd9..1d148d01bba98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/InterpretedFunctionInvoker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/InterpretedFunctionInvoker.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function; +package org.apache.iotdb.db.node_commons.plan.relational.function.function; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.queryengine.common.SessionInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/LongVariableConstraint.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/LongVariableConstraint.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/LongVariableConstraint.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/LongVariableConstraint.java index 6aa67bb2eeecb..52de559764138 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/LongVariableConstraint.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/LongVariableConstraint.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function; +package org.apache.iotdb.db.node_commons.plan.relational.function.function; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/OperatorType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/OperatorType.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/OperatorType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/OperatorType.java index 0a727e8524a5b..40d0647902570 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/OperatorType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/OperatorType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function; +package org.apache.iotdb.db.node_commons.plan.relational.function.function; public enum OperatorType { ADD("+", 2), diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/ResolvedFunctionCallBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/ResolvedFunctionCallBuilder.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/ResolvedFunctionCallBuilder.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/ResolvedFunctionCallBuilder.java index 83bef5960613a..4e406fd8cff38 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/ResolvedFunctionCallBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/ResolvedFunctionCallBuilder.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function; +package org.apache.iotdb.db.node_commons.plan.relational.function.function; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/Signature.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/Signature.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/Signature.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/Signature.java index 1daeadbbce628..94f3e190e7015 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/Signature.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/Signature.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function; +package org.apache.iotdb.db.node_commons.plan.relational.function.function; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/TableBuiltinTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TableBuiltinTableFunction.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/TableBuiltinTableFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TableBuiltinTableFunction.java index 61b96809f847e..514d33b679709 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/TableBuiltinTableFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TableBuiltinTableFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function; +package org.apache.iotdb.db.node_commons.plan.relational.function.function; import org.apache.iotdb.commons.udf.builtin.relational.tvf.CapacityTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.CumulateTableFunction; @@ -25,9 +25,9 @@ import org.apache.iotdb.commons.udf.builtin.relational.tvf.SessionTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.TumbleTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.VariationTableFunction; -import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.ClassifyTableFunction; -import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.ForecastTableFunction; -import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.PatternMatchTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ClassifyTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.PatternMatchTableFunction; import org.apache.iotdb.udf.api.relational.TableFunction; import java.util.Arrays; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/TypeVariableConstraint.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TypeVariableConstraint.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/TypeVariableConstraint.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TypeVariableConstraint.java index dc77ecdd285fa..22b8caaa388e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/TypeVariableConstraint.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TypeVariableConstraint.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function; +package org.apache.iotdb.db.node_commons.plan.relational.function.function; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/AdditionResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/AdditionResolver.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/AdditionResolver.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/AdditionResolver.java index c0b70691fb897..4690bc2a416b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/AdditionResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/AdditionResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/DivisionResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/DivisionResolver.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/DivisionResolver.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/DivisionResolver.java index b73ab852457f5..11854c0b47c94 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/DivisionResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/DivisionResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/ModulusResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/ModulusResolver.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/ModulusResolver.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/ModulusResolver.java index 1953381ac5a6a..78b2ce538795e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/ModulusResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/ModulusResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/MultiplicationResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/MultiplicationResolver.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/MultiplicationResolver.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/MultiplicationResolver.java index f9ca05a2d8e84..cb61801c3b0b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/MultiplicationResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/MultiplicationResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/SubtractionResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/SubtractionResolver.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/SubtractionResolver.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/SubtractionResolver.java index a6b040168172d..bc79daedc3cb8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/arithmetic/SubtractionResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/SubtractionResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/ClassifyTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ClassifyTableFunction.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/ClassifyTableFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ClassifyTableFunction.java index 61036302af874..a735d7add9a78 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/ClassifyTableFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ClassifyTableFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.tvf; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf; import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/ForecastTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ForecastTableFunction.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/ForecastTableFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ForecastTableFunction.java index f406c16c08545..44c552f35f7ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/ForecastTableFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ForecastTableFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.tvf; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf; import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; @@ -72,8 +72,8 @@ import java.util.stream.Collectors; import static org.apache.iotdb.commons.udf.builtin.relational.tvf.WindowTVFUtils.findColumnIndex; -import static org.apache.iotdb.db.queryengine.plan.relational.function.tvf.TableFunctionUtils.checkType; -import static org.apache.iotdb.db.queryengine.plan.relational.function.tvf.TableFunctionUtils.parseOptions; +import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.TableFunctionUtils.checkType; +import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.TableFunctionUtils.parseOptions; import static org.apache.iotdb.db.queryengine.plan.relational.utils.ResultColumnAppender.createResultColumnAppender; public class ForecastTableFunction implements TableFunction { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/PatternMatchTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/PatternMatchTableFunction.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/PatternMatchTableFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/PatternMatchTableFunction.java index fd352f9c0b9d6..b300edb10936d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/PatternMatchTableFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/PatternMatchTableFunction.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.tvf; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf; -import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.QetchAlgorithm; -import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model.MatchState; -import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model.Point; -import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model.RegexMatchState; -import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model.Section; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.QetchAlgorithm; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.MatchState; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.Point; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.RegexMatchState; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.Section; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.access.Record; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/TableFunctionUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/TableFunctionUtils.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/TableFunctionUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/TableFunctionUtils.java index 499f133c437e3..7f798a215f93f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/TableFunctionUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/TableFunctionUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.tvf; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/MatchConfig.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/MatchConfig.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/MatchConfig.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/MatchConfig.java index 64f32fa2e5e79..0c0da76cfb790 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/MatchConfig.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/MatchConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match; public class MatchConfig { // if the gap between new two points is larger than this times gap before, the new point diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/QetchAlgorithm.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/QetchAlgorithm.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/QetchAlgorithm.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/QetchAlgorithm.java index c693ce968e724..d47cce178ed3c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/QetchAlgorithm.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/QetchAlgorithm.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match; -import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model.MatchState; -import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model.PatternSegment; -import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model.Point; -import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model.RegexMatchState; -import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model.Section; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.MatchState; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.PatternSegment; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.Point; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.RegexMatchState; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.Section; import java.util.ArrayDeque; import java.util.ArrayList; @@ -32,9 +32,9 @@ import java.util.List; import java.util.Queue; -import static org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.MatchConfig.GAP_TOLERANCE; -import static org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; -import static org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model.PatternSegment.tangent; +import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.GAP_TOLERANCE; +import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; +import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.PatternSegment.tangent; public class QetchAlgorithm { private int pointNum = -1; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/MatchState.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/MatchState.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/MatchState.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/MatchState.java index 7650b25b0e8ab..4fe89134c2698 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/MatchState.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/MatchState.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model; import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; +import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; public class MatchState { private double matchValue = 0.0; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/PatternSegment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/PatternSegment.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/PatternSegment.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/PatternSegment.java index 5013dc58b9493..fcb1cf895e502 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/PatternSegment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/PatternSegment.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model; import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; +import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; public class PatternSegment { // variable area diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/Point.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Point.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/Point.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Point.java index 7445635c7e0cd..7b7ecc26da289 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/Point.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Point.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model; public class Point { public double x; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/RegexMatchState.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/RegexMatchState.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/RegexMatchState.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/RegexMatchState.java index e82f15d091a0f..8d039b1a76d5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/RegexMatchState.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/RegexMatchState.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model; import java.util.ArrayDeque; import java.util.ArrayList; @@ -25,8 +25,8 @@ import java.util.Iterator; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.MatchConfig.CALC_SE_USING_MORE_MEMORY; -import static org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; +import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.CALC_SE_USING_MORE_MEMORY; +import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; public class RegexMatchState { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/Section.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Section.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/Section.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Section.java index cb39f79da6b8c..fee4d4f9f3458 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/match/model/Section.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Section.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.function.tvf.match.model; +package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model; import java.util.ArrayList; import java.util.HashMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/ResolvedFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/ResolvedFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java index e783a05fd0861..3e2804b928ac0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/ResolvedFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java @@ -17,11 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.metadata; +package org.apache.iotdb.db.node_commons.plan.relational.metadata; -import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; -import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Assignments.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Assignments.java index 9d287e49eb221..91d2d78bea474 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/Assignments.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Assignments.java @@ -17,9 +17,8 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner; +package org.apache.iotdb.db.node_commons.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/DataOrganizationSpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/DataOrganizationSpecification.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/DataOrganizationSpecification.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/DataOrganizationSpecification.java index b9dfe6413d4d1..8e2d98e779a39 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/DataOrganizationSpecification.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/DataOrganizationSpecification.java @@ -17,9 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner; - -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.db.node_commons.plan.relational.planner; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingScheme.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/OrderingScheme.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingScheme.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/OrderingScheme.java index d64961d36af8a..721c58c99ce36 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingScheme.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/OrderingScheme.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner; +package org.apache.iotdb.db.node_commons.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/iterative/GroupReference.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/iterative/GroupReference.java index 9304a65efd3b5..a53ef3131a72e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/GroupReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/iterative/GroupReference.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; +package org.apache.iotdb.db.node_commons.plan.relational.planner.iterative; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java index b1c36dc4c8cbf..564eb31451ddf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java @@ -19,20 +19,20 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ApplyNode.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ApplyNode.java index cd47cbf8a71a6..4c7a0feabdc74 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ApplyNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ApplyNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ExceptNode.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ExceptNode.java index 13509a0141190..498f65b3918bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExceptNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ExceptNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ListMultimap; @@ -58,7 +58,7 @@ private ExceptNode( @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitExcept(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitExcept(this, context); } public boolean isDistinct() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java index 11d8722ccb6e7..e0eec1a78a375 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java @@ -23,8 +23,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/IntersectNode.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/IntersectNode.java index 608b31c238aec..6ae3a22628c35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntersectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/IntersectNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ListMultimap; @@ -57,7 +57,7 @@ private IntersectNode( @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitIntersect(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitIntersect(this, context); } public boolean isDistinct() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java index 3415b45ddbeb9..2f50412b54732 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java @@ -23,12 +23,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java index 205b11d7dbbd7..a702b9fdd4bb4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java @@ -24,9 +24,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java index 0dc6097e98894..bd38710f2f986 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java index a3106c5bbbded..ff838336727fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java @@ -24,12 +24,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java index 7cef21f3bafce..e1e0bf1af4f77 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java @@ -24,10 +24,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java index 885979bc92a58..957b5e293f756 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SetOperationNode.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SetOperationNode.java index 085c47bc35b3b..be21bcb90b226 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SetOperationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SetOperationNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java index 5a9d61628ca8a..b50fc2dce342b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java @@ -24,9 +24,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java index db66a8c564696..b580a05b87ae5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java @@ -23,8 +23,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java index 821c2982414b6..7cbe614c69fae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java @@ -24,10 +24,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; -import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java index 170391d03328c..c84da9d560521 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java @@ -24,10 +24,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; -import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java index 3aefbc2ee4461..5b78f4226fcd9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java @@ -24,9 +24,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java index 6fb37b5ac92f0..0eef249565f10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java @@ -24,9 +24,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java index 13a375318a173..fb04d6a9c64a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java @@ -25,7 +25,6 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SetOperationNode; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java index f80325c37b85b..4b7099b778ae3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java @@ -24,11 +24,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java index 8e430157f03ab..39e527caa5f32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java @@ -24,14 +24,14 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -55,9 +55,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Iterables.concat; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_PRECEDING; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame.Type.RANGE; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_PRECEDING; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; public class WindowNode extends SingleChildProcessNode { private final Set prePartitionedInputs; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java index 77aef5b1f0e0b..adfc8a3955e28 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java index 839e21e9e8313..0596116e8c224 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java @@ -20,7 +20,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java index ba48d5e002151..93a125086af2b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java @@ -153,4 +153,36 @@ protected R visitSearchedCaseExpression(SearchedCaseExpression node, C context) protected R visitFunctionCall(FunctionCall node, C context) { return visitExpression(node, context); } + + protected R visitTrim(Trim node, C context) { + return visitExpression(node, context); + } + + protected R visitIfExpression(IfExpression node, C context) { + return visitExpression(node, context); + } + + protected R visitNullIfExpression(NullIfExpression node, C context) { + return visitExpression(node, context); + } + + protected R visitDataType(DataType node, C context) { + return visitExpression(node, context); + } + + protected R visitGenericDataType(GenericDataType node, C context) { + return visitDataType(node, context); + } + + protected R visitFrameBound(FrameBound node, C context) { + return visitNode(node, context); + } + + protected R visitWindowFrame(WindowFrame node, C context) { + return visitNode(node, context); + } + + protected R visitRow(Row node, C context) { + return visitExpression(node, context); + } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DataType.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DataType.java index 9499b1a32ea9c..2f417c7fdf888 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DataType.java @@ -17,10 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java index d155ae3eaae5b..708526d95940b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java @@ -19,10 +19,8 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.util.ExpressionFormatter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FrameBound.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FrameBound.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FrameBound.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FrameBound.java index 648695dd0dfe1..2f970dbb4c66a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FrameBound.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FrameBound.java @@ -17,12 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -73,7 +70,7 @@ public Optional getValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitFrameBound(this, context); + return ((CommonQueryAstVisitor) visitor).visitFrameBound(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericDataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericDataType.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericDataType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericDataType.java index 0d3a98b197ef8..e809053437b6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GenericDataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericDataType.java @@ -17,12 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -74,7 +73,7 @@ public List getChildren() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitGenericDataType(this, context); + return ((CommonQueryAstVisitor) visitor).visitGenericDataType(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IfExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IfExpression.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IfExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IfExpression.java index ec7af811dffe1..f906d95746b1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/IfExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IfExpression.java @@ -17,12 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -76,7 +73,7 @@ public Optional getFalseValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitIfExpression(this, context); + return ((CommonQueryAstVisitor) visitor).visitIfExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullIfExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullIfExpression.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullIfExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullIfExpression.java index b3a24df28a779..1a28354660dc3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NullIfExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullIfExpression.java @@ -17,12 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -62,7 +59,7 @@ public Expression getSecond() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitNullIfExpression(this, context); + return ((CommonQueryAstVisitor) visitor).visitNullIfExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Row.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Row.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Row.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Row.java index db1bbc847d470..136005ad88065 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Row.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Row.java @@ -17,13 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -88,7 +84,7 @@ public List getItems() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitRow(this, context); + return ((CommonQueryAstVisitor) visitor).visitRow(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Trim.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Trim.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Trim.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Trim.java index b316244e609b2..4b5d5d65aba14 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Trim.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Trim.java @@ -17,12 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -88,7 +85,7 @@ public Optional getTrimCharacter() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitTrim(this, context); + return ((CommonQueryAstVisitor) visitor).visitTrim(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowFrame.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowFrame.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowFrame.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowFrame.java index d324dbd8bb7bc..38b7846075926 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowFrame.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowFrame.java @@ -17,11 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -72,7 +70,7 @@ public Optional getEnd() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitWindowFrame(this, context); + return ((CommonQueryAstVisitor) visitor).visitWindowFrame(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/InternalTypeManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/InternalTypeManager.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/InternalTypeManager.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/InternalTypeManager.java index 5719a4555ff12..296fcd7dc9a81 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/InternalTypeManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/InternalTypeManager.java @@ -17,7 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.type; +package org.apache.iotdb.db.node_commons.plan.relational.type; + +import org.apache.iotdb.db.queryengine.plan.relational.type.TypeId; +import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; +import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureTranslator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureTranslator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureTranslator.java index 9390cd4826a24..431fab4084559 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureTranslator.java @@ -17,15 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.type; +package org.apache.iotdb.db.node_commons.plan.relational.type; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; +import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureParameter; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/Like3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/Like3ColumnTransformer.java index 23990849c4a6d..7946319df4e90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/Like3ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/Like3ColumnTransformer.java @@ -27,7 +27,7 @@ import org.apache.tsfile.common.regexp.LikePattern; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; public class Like3ColumnTransformer extends TernaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/udf/UserDefineScalarFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/udf/UserDefineScalarFunctionTransformer.java index 9ed50a2c9a73d..b019cd9130228 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/udf/UserDefineScalarFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/udf/UserDefineScalarFunctionTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.node_commons.transformation.dag.column.column.udf; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.RecordIterator; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.MultiColumnTransformer; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.RecordIterator; import org.apache.iotdb.udf.api.relational.ScalarFunction; import org.apache.iotdb.udf.api.relational.access.Record; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java index dfe3ef74ae173..7fbc86f3aa1fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.CastFunctionHelper; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; @@ -38,7 +38,7 @@ import java.time.ZoneId; import java.time.format.DateTimeParseException; -import static org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper.ERROR_MSG; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.CastFunctionHelper.ERROR_MSG; import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE; public abstract class AbstractCastFunctionColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java index b0928529e4413..df14524c01f6e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -105,6 +105,12 @@ import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.partition.DataPartitionTableGenerator; @@ -143,12 +149,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher; import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; 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/execution/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java index fb7938309af09..f1f6e349bc8f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java index 73ec966b84b64..286eec6abb127 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.udf.api.State; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java index 572d41d518486..6eb4182587af9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java index 28e4e72372b59..5d9163e9e6879 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java @@ -19,9 +19,6 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -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; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.AbstractCaseWhenThenColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer; @@ -32,6 +29,9 @@ import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.MultiColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.TernaryColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +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; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java index ad5192f980730..bfa1e582900d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.common.NodeRef; 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; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java index 55fc4425041db..2fcd151deb297 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.ArrayView; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAccumulator; -import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/CastComputation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/CastComputation.java index 9f4ad2f13af8b..8c7b3f808877e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/CastComputation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/CastComputation.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java index f652f7ce885a1..a9df4dbacde6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java @@ -27,6 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import java.util.ArrayList; import java.util.HashMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java index 7861a8dbbee20..56c26c31f0d72 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java @@ -18,13 +18,13 @@ */ package org.apache.iotdb.db.queryengine.execution.operator.process.window; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; 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; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java index 95bb2fcd568c3..eab0d71d9dcae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.GroupedTopNBuilder; import org.apache.iotdb.db.queryengine.execution.operator.GroupedTopNRowNumberBuilder; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.NoChannelGroupByHash; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameInfo.java index 78cb7d2b9e4db..bd811522929c5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameInfo.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java index a2aed523dc26d..894fec27ab5df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java @@ -48,9 +48,9 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanOperator.appendDataIntoBuilder; import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter.DEVICE_NUMBER; -import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; public abstract class AbstractTableScanOperator extends AbstractSeriesScanOperator { private static final long INSTANCE_SIZE = 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 index 9631ad7a4ef20..3460ea200a0f6 100644 --- 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 @@ -64,6 +64,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TTableInfo; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; @@ -81,7 +82,6 @@ import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; import org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.ShowCreateViewTask; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; -import org.apache.iotdb.db.queryengine.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableDiskUsageInformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java index 8b4719bc1f13f..ef2b10952dcdb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java @@ -51,10 +51,10 @@ import java.util.concurrent.TimeUnit; import static com.google.common.base.Preconditions.checkState; +import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_PRIMITIVE_TYPE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_TIME_VALUE_PAIR; -import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; /** * This class is used to execute aggregation table scan when apply {@code canUseLastCacheOptimize()} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java index eed3a0160a71a..0be8d74cf4568 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java @@ -22,6 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.execution.aggregation.VarianceAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.BinaryGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.BlobGroupedApproxMostFrequentAccumulator; @@ -53,7 +54,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.AggregateFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java index 6f151ceef22b2..ec8d02b41769c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.primitives.Ints; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java index fbe0cee409875..6b2e556f7b410 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.builder; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java index a9cc81171fb1a..53b389f38372c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.window; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; public class ConditionWindowParameter extends WindowParameter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java index dccbad37c63b6..93c100cecf0da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java @@ -23,6 +23,11 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.AdditionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.DivisionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.ModulusResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.MultiplicationResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.SubtractionResolver; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; @@ -31,6 +36,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; @@ -42,6 +48,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -50,34 +57,18 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.common.SessionInfo; -import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; -import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.AdditionResolver; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.DivisionResolver; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.ModulusResolver; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.MultiplicationResolver; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.SubtractionResolver; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.TableCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticColumnTransformerApi; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareEqualToColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareGreaterEqualColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareGreaterThanColumnTransformer; @@ -86,7 +77,6 @@ import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareNonEqualColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.Like2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.ConstantColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; @@ -197,6 +187,16 @@ import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.UpperColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.common.SessionInfo; +import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; +import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticColumnTransformerApi; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.ScalarFunction; @@ -230,17 +230,17 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; -import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoMetadataChecker.isStringLiteral; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBlobType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; -import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy; import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy; import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoMetadataChecker.isStringLiteral; +import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBlobType; +import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; @@ -250,7 +250,7 @@ import static org.apache.tsfile.read.common.type.StringType.STRING; public class ColumnTransformerBuilder - extends AstVisitor { + extends CommonQueryAstVisitor { private static final String UNSUPPORTED_EXPRESSION = "Unsupported expression: %s"; 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 1ec9713ce0275..24c4b377ea8be 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 @@ -39,6 +39,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.PreparedStatementInfo; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; @@ -147,7 +148,6 @@ 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.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.statement.IConfigStatement; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java index ec1bdeed0c629..e74cf637ed1f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java @@ -30,6 +30,9 @@ import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.template.Template; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.NodeRef; @@ -39,9 +42,6 @@ import org.apache.iotdb.db.queryengine.plan.execution.memory.StatementMemorySource; import org.apache.iotdb.db.queryengine.plan.execution.memory.StatementMemorySourceContext; import org.apache.iotdb.db.queryengine.plan.execution.memory.StatementMemorySourceVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.TimePredicate; import org.apache.iotdb.db.queryengine.plan.planner.plan.TreeModelTimePredicate; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; 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 dacdc69ba4596..96df9ed1f921f 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 @@ -46,6 +46,14 @@ import org.apache.iotdb.db.exception.metadata.view.UnsupportedViewException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExistUnknownTypeInExpression; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; @@ -62,14 +70,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.lock.SchemaLockType; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher; import org.apache.iotdb.db.queryengine.plan.analyze.schema.SchemaValidator; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExistUnknownTypeInExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.MeasurementGroup; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.DeviceViewIntoPathDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.FillDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java index 041f08e1b5cf3..2203c90dd6066 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.path.PathPatternTreeUtils; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; import org.apache.iotdb.db.queryengine.plan.statement.component.SelectComponent; 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 9a847a9ebd132..754081b48436e 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 @@ -25,34 +25,34 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.UnknownExpressionTypeException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.BindTypeForTimeSeriesOperandVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.CollectAggregationExpressionsVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.CollectSourceExpressionsVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionNormalizeVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.GetMeasurementExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.LowercaseNormalizeVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ReplaceRawPathWithGroupedPathVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ReplaceSubTreeWithViewVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.BindSchemaForPredicateVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForExpressionVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForHavingVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForPredicateVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.ConcatExpressionWithSuffixPathsVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.BindTypeForTimeSeriesOperandVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.CollectAggregationExpressionsVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.CollectSourceExpressionsVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionNormalizeVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.GetMeasurementExpressionVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.LowercaseNormalizeVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ReplaceRawPathWithGroupedPathVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ReplaceSubTreeWithViewVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForPredicateVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForExpressionVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForHavingVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForPredicateVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatExpressionWithSuffixPathsVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java index adc80c7bb1522..a14e1236b1774 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java @@ -20,27 +20,27 @@ package org.apache.iotdb.db.queryengine.plan.analyze; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.binary.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDAFInformationInferrer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFInformationInferrer; import org.apache.iotdb.db.utils.TypeInferenceUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java index 1d9bb7838d5f9..997bbde224f4e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java @@ -20,37 +20,37 @@ package org.apache.iotdb.db.queryengine.plan.analyze; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.UnknownExpressionTypeException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.DivisionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ModuloExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; -import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java index a220fdf2883d3..02bc405f39879 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java index 55cfd18f16f48..0b4a26e836f93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java @@ -22,26 +22,26 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.UnknownExpressionTypeException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.logical.PredicateCanPushDownToSourceChecker; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.logical.TimeFilterExistChecker; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate.ConvertPredicateToFilterVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate.ConvertPredicateToTimeFilterVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate.PredicatePushIntoScanChecker; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate.PredicateSimplifier; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate.ReversePredicateVisitor; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; -import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.logical.PredicateCanPushDownToSourceChecker; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.logical.TimeFilterExistChecker; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.ConvertPredicateToFilterVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.ConvertPredicateToTimeFilterVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.PredicatePushIntoScanChecker; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.PredicateSimplifier; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.ReversePredicateVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java index 7e23b0b4590fb..e0c83f54c2d0a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Pair; 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 3fc8b7e5339a1..0fff0c0c2a011 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 @@ -21,14 +21,14 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.NodeRef; 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.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java index 21b8d9d8dc105..472076f695355 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java @@ -25,14 +25,14 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.TemplatedConcatRemoveUnExistentMeasurementVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.DeviceSchemaInfo; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.TemplatedConcatRemoveUnExistentMeasurementVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java index 12e27ea91e3f5..4e5504d66cba0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.analyze; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; @@ -41,7 +41,7 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; /** * If in align by device query ,all queried devices are set in one template, we can store the common diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java index 69ea9f63cb369..9cdae0982de04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java @@ -38,7 +38,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; public class TypeProvider { 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 650999844056a..56a8d17bdf3ce 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 @@ -45,6 +45,7 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; @@ -161,7 +162,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTopic; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTraining; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateView; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DatabaseStatement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Deallocate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice; @@ -279,12 +279,12 @@ import static org.apache.iotdb.commons.schema.table.TsTable.TABLE_ALLOWED_PROPERTIES; import static org.apache.iotdb.commons.schema.table.TsTable.TIME_COLUMN_NAME; import static org.apache.iotdb.commons.schema.table.TsTable.TTL_PROPERTY; +import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask.DATA_REGION_GROUP_NUM_KEY; import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask.SCHEMA_REGION_GROUP_NUM_KEY; import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask.TIME_PARTITION_INTERVAL_KEY; import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask.TTL_KEY; -import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.tsfile.common.constant.TsFileConstant.PATH_SEPARATOR; public class TableConfigTaskVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java index cf404e8d57b76..29cff1e4f982f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java @@ -180,6 +180,8 @@ import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.metadata.SchemaQuotaExceededException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.TransformToViewExpressionVisitor; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.source.dataregion.DataRegionListeningFilter; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; @@ -250,8 +252,6 @@ import org.apache.iotdb.db.queryengine.plan.execution.config.sys.quota.ShowThrottleQuotaTask; import org.apache.iotdb.db.queryengine.plan.execution.config.sys.subscription.ShowSubscriptionsTask; import org.apache.iotdb.db.queryengine.plan.execution.config.sys.subscription.ShowTopicsTask; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.TransformToViewExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.AlterLogicalViewNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB; 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 608cc0b284efe..8c1dcbce78720 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 @@ -26,12 +26,12 @@ import org.apache.iotdb.commons.udf.UDFType; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; 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; 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.function.TableBuiltinTableFunction; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction; 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 fcb6013e9a8c8..8aa7b1a163166 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 @@ -25,6 +25,9 @@ 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.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; @@ -33,9 +36,6 @@ 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; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java index bc7de51a91dce..42993dba4d306 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SlidingWindowAggregationNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationSourceNode; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java index fbb9a2c41172b..bb3b79af4ecd7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java @@ -20,12 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.optimization; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.CollectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TransformNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.LeftOuterTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java index b0f2c66be70be..3bb5dee80a5cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java @@ -23,6 +23,8 @@ 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.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; @@ -33,8 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; 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 f377ff91d206b..e523dcf0e28f9 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 @@ -41,6 +41,39 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.DivisionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ModuloExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; @@ -64,42 +97,9 @@ import org.apache.iotdb.db.queryengine.execution.operator.window.ainode.TailInferenceWindow; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ColumnDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateView; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; @@ -308,7 +308,7 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; -import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.canPushDownLimitOffsetToGroupByTime; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.pushDownLimitOffsetToTimeParameter; import static org.apache.iotdb.db.queryengine.plan.relational.sql.parser.AstBuilder.lowerIdentifier; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java index 4fc5e50a060af..6bb58cd60783d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java @@ -27,16 +27,16 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.SqlLexer; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.component.FromComponent; import org.apache.iotdb.db.queryengine.plan.statement.component.GroupByTimeComponent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 09c1e3fbc86c4..ac6c6e2b2f0ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -31,6 +31,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.TableDateBinTimeRangeIterator; @@ -116,10 +119,7 @@ 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.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; @@ -168,6 +168,7 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; +import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.common.DataNodeEndPoints.isSameNode; import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DELIMITER_BETWEEN_ID; import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DOWNSTREAM_PLAN_NODE_ID; @@ -178,7 +179,6 @@ import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions.updateFilterUsingTTL; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_PRIMITIVE_TYPE; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; -import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.utils.constant.SqlConstant.AVG; import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT; import static org.apache.iotdb.db.utils.constant.SqlConstant.EXTREME; 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 a840f447bb794..6e6480c7bec66 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 @@ -30,6 +30,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.template.Template; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.common.DeviceContext; @@ -41,9 +44,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesCountNode; 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 47695ce2683b5..2b04bc5432fe6 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 @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.TransformToViewExpressionVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFileNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index 5279899177233..48dce74658872 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -30,9 +30,18 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ColumnTransformerVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.NodeRef; @@ -170,12 +179,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ColumnTransformerVisitor; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimatorFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; @@ -223,7 +226,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TransformNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.InnerTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.LeftOuterTimeJoinNode; @@ -265,8 +267,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; import org.apache.iotdb.db.queryengine.plan.statement.literal.Literal; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSourceType; import org.apache.iotdb.db.utils.columngenerator.ColumnGenerator; @@ -315,6 +315,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; import static org.apache.iotdb.db.queryengine.common.DataNodeEndPoints.isSameNode; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.calculateMaxAggregationResultSize; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.calculateMaxAggregationResultSizeForLastQuery; @@ -324,7 +325,6 @@ import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DELIMITER_BETWEEN_ID; import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DOWNSTREAM_PLAN_NODE_ID; import static org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils.convertPredicateToFilter; -import static org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor.getAggregationTypeByFuncName; import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions.updateFilterUsingTTL; import static org.apache.iotdb.db.queryengine.plan.statement.component.Ordering.ASC; 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 dfb65abe44c5e..b8adcba520aaa 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 @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; 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 0a7d369565854..6358a966b04a6 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 @@ -22,10 +22,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.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java index 5055f43aaf0bc..53bcc7baba3e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.external.commons.lang3.Validate; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java index 008ec3909591f..7f4beb55d6d69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; @@ -68,7 +69,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.RegionScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import java.util.Arrays; import java.util.HashMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NodeGroupContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NodeGroupContext.java index 2612a83c7e056..2ee389c740371 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NodeGroupContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NodeGroupContext.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowTimeSeriesStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java index d9005b42bec7c..03307f51aaa1e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.plan.ClusterTopology; 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.planner.plan.AbstractFragmentParallelPlanner; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java index 2476939c13c64..f07edbf17f625 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java @@ -30,17 +30,18 @@ import org.apache.iotdb.commons.schema.table.Audit; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ConcatDeviceVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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.TemplatedInfo; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionType; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.ConcatDeviceVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.BaseSourceRewriter; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaFetchMergeNode; @@ -76,7 +77,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationSourceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesSourceNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.TimeseriesRegionScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; 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 0d72e355dae11..fd68db64083ed 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 @@ -22,13 +22,13 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.partition.DataPartition; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPartitionRelatedNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.SubPlanTypeExtractor; import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.IPartitionRelatedNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesAggregationScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java index cd61a2f5737a9..8d97570ba550d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.tsfile.read.filter.basic.Filter; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.java index 132077d801b61..8a86fc6c8827e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.read.filter.basic.Filter; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 045b96ab16c7c..fb7c228c562c9 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 @@ -23,12 +23,16 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; @@ -45,7 +49,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.CollectNode; @@ -87,15 +90,12 @@ 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.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; 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.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableDiskUsageInformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; 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 12aaf7dbb2c94..b330e09e554c7 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 @@ -22,8 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; @@ -142,9 +144,7 @@ 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.node.AlignedAggregationTreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.NonAlignedAggregationTreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableDiskUsageInformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeAlignedDeviceViewScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java index e0907d76aebcf..59a8c8607ad4b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPartitionRelatedNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java index 80e5de4d82e47..adfcde050bf68 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java index 2ca23961d8265..c20a94fd04f50 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java @@ -26,9 +26,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import java.util.Collections; import java.util.List; 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 d96652a3ba586..587f6fabc7f3d 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 @@ -27,8 +27,8 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java index e6ac495afab90..1e71100ce126a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; 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.parameter.OrderByParameter; 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 9886ef5b0db28..9820c24133fbf 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 @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; 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.SeriesAggregationSourceNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java index 84d0e52930b56..a0a707379e551 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; 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.statement.component.Ordering; 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 0e4f38655b5f2..2f90be6410a91 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 @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; 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.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java index a9fdb43e042c9..f8e1fe81b7814 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; 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.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java index 4bd5f7280eb98..e4eba09f3d911 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java @@ -22,9 +22,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; 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.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java index 96d6c8a92cd76..2c172660e96bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java @@ -24,10 +24,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; 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.LastQueryScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java index 1714262fc13f2..0a87a671d9bec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/AlignedSeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java index 78725ad064acc..fe11735c92cb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/LastSeriesSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java index 9d2acee670b32..f4a23e798a6a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java index a186124e44f29..13466eb8a02fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java index db92d11ec624d..30c1d092c2e7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java @@ -22,11 +22,11 @@ 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.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/SeriesAggregationSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationSourceNode.java index 2b0ae8a9e1389..4dbab3b7e1ee1 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 @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java index af9a2f99e9ce7..7d47431b4fd30 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java @@ -22,11 +22,11 @@ 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.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/SeriesScanSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java index 62136d5764e5d..477a8c0dffc42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java index a6368fedca1d8..b20a26dde5661 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java @@ -20,8 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java index d24012e898d78..ec1adf95003b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/parameter/AggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java index 40ad0aab985c4..e52e517f8c553 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java @@ -21,7 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java index d986baf2faa3c..c673c4ddf0bef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java index ec277b5aae11d..34d0fbea52c09 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java index 6156d81142b58..83545bc8c6720 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java @@ -30,6 +30,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -38,22 +39,21 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import com.google.common.collect.ImmutableList; 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 33c7d45b11f7c..9fc9e818ff394 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 @@ -24,12 +24,15 @@ import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.schema.table.InformationSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; @@ -41,12 +44,10 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.tablefunction.TableFunctionInvocationAnalysis; 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.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.security.Identity; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; @@ -68,7 +69,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 60fb35dc17415..8f34de337cf5c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -21,6 +21,11 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; @@ -38,8 +43,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -48,12 +55,16 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StackableAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; @@ -66,40 +77,29 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.NavigationMode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.PatternFunctionAnalysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.ScalarInputDescriptor; -import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; -import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionKind; -import org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Columns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import com.google.common.collect.HashMultimap; @@ -141,20 +141,20 @@ import static java.util.Collections.unmodifiableSet; import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.FOLLOWING; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.PRECEDING; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_FOLLOWING; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_PRECEDING; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.GROUPS; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.ROWS; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.ExpressionTreeUtils.extractExpressions; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isNumericType; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isTwoTypeComparable; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression.isQualifiedAllFieldsReference; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound.Type.FOLLOWING; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound.Type.PRECEDING; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_FOLLOWING; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_PRECEDING; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame.Type.GROUPS; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame.Type.RANGE; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame.Type.ROWS; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java index 9ee8cb4fd61ac..2ea2f5d80eef1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index 19a77bc90747f..040487addb670 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; @@ -34,7 +35,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -44,10 +47,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -63,7 +70,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.tablefunction.ArgumentsAnalysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.tablefunction.TableArgumentAnalysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.tablefunction.TableFunctionInvocationAnalysis; -import org.apache.iotdb.db.queryengine.plan.relational.function.TableBuiltinTableFunction; 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.metadata.QualifiedObjectName; @@ -114,12 +120,10 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FetchDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingElement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRow; @@ -134,7 +138,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; @@ -148,7 +151,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetOperation; @@ -176,7 +178,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; @@ -186,7 +187,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Window; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowSpecification; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; @@ -271,6 +271,7 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.schema.table.TsTable.TABLE_ALLOWED_PROPERTIES; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; +import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction.TIMECOL_PARAMETER_NAME; import static org.apache.iotdb.db.queryengine.execution.warnings.StandardWarningCode.REDUNDANT_ORDER_BY; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AggregationAnalyzer.verifyOrderByAggregations; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AggregationAnalyzer.verifySourceAggregations; @@ -280,7 +281,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.ExpressionTreeUtils.extractWindowExpressions; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.ExpressionTreeUtils.extractWindowFunctions; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope.BasisType.TABLE; -import static org.apache.iotdb.db.queryengine.plan.relational.function.tvf.ForecastTableFunction.TIMECOL_PARAMETER_NAME; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.MetadataUtil.createQualifiedObjectName; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isTimestampType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java index d679e9527d105..842538431aecc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java @@ -31,6 +31,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -39,15 +40,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableList; import com.google.common.math.DoubleMath; @@ -76,7 +76,7 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.ConvertPredicateToTimeFilterVisitor.getLongValue; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java index e1e0531a99af8..c127cf71d368c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -30,12 +31,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java index 6c94071e9740a..21b99e362817d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -30,12 +31,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import java.util.List; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java index 54bcf9d2502d7..72abe93350982 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java @@ -36,6 +36,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -44,16 +45,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import java.util.List; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java index 3ada53cdc3b2d..7dca4f07e49a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -29,11 +30,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java index 5e579686aef78..edae4682aeef5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java @@ -22,17 +22,17 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; /** * This class provides a visitor of {@link Expression}, which can be extended to create a visitor diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java index 27f779fb3125c..bdd08f0e647f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java @@ -35,6 +35,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -42,14 +43,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicateVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import javax.annotation.Nullable; @@ -62,7 +62,7 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java index bf5d70fd96864..267f58dfc6cf5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -29,12 +30,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicateVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; public class ExtractPredicateColumnNameVisitor extends PredicateVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java index 99290c93b82f4..9bd5980faed5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java @@ -26,11 +26,11 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinWindowFunction; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java index bc874d53f4fdd..aa50cfbc45d62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; import com.google.common.base.Joiner; 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 2c33ed3f1d1f6..b5b2be960366e 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 @@ -32,23 +32,23 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.AdditionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.DivisionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.ModulusResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.MultiplicationResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.SubtractionResolver; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType; -import org.apache.iotdb.db.queryengine.plan.relational.function.TableBuiltinTableFunction; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.AdditionResolver; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.DivisionResolver; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.ModulusResolver; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.MultiplicationResolver; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.SubtractionResolver; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableSchema.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableSchema.java index 1344586e42555..cc523503c990f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableSchema.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableSchema.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java index 7f578cef4ae57..688d7ec168ae8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java @@ -36,6 +36,7 @@ import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.ColumnCreationFailException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.lock.DataNodeSchemaLockManager; import org.apache.iotdb.db.queryengine.plan.analyze.lock.SchemaLockType; @@ -47,7 +48,6 @@ 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.metadata.TableSchema; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; import org.apache.iotdb.rpc.TSStatusCode; @@ -74,7 +74,7 @@ import java.util.stream.Collectors; import static org.apache.iotdb.commons.schema.table.TsTable.TIME_COLUMN_NAME; -import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.utils.EncodingInferenceUtils.getDefaultEncoding; public class TableHeaderSchemaValidator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java index e246663c0652b..c086bbbbc7241 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java index 80f8bce5b8af5..bcea7ed8daa51 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java @@ -20,6 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.CastFunctionHelper; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.InterpretedFunctionInvoker; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; @@ -31,6 +34,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -43,14 +47,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.queryengine.plan.relational.function.InterpretedFunctionInvoker; -import org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeCoercion; @@ -79,10 +79,10 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.MINUS; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.PLUS; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; public class IrExpressionInterpreter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java index 524d42b9a501b..c20ff30538077 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; @@ -37,6 +38,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -45,7 +47,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; @@ -53,15 +57,11 @@ import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; 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.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeCoercionUtils; @@ -89,7 +89,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; import static org.apache.tsfile.read.common.type.FloatType.FLOAT; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java index 8778b6a77cebf..f61f9a838c526 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java @@ -44,10 +44,10 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBlobType; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBool; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; import static org.apache.tsfile.read.common.type.FloatType.FLOAT; import static org.apache.tsfile.read.common.type.IntType.INT32; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java index bfc1220dead47..d69f1f8e3134a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java @@ -20,14 +20,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java index 56a5b15fb9b31..2631870290a38 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.expression.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index c3053a2cf608d..d99e98445eeca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -21,6 +21,9 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Aggregation; @@ -38,10 +41,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -55,8 +61,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; @@ -65,7 +69,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -102,6 +105,10 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.GROUPS; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.ROWS; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isNumericType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingTranslator.sortItemToSortOrder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder; @@ -109,10 +116,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator.GROUP_KEY_SUFFIX; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GapFillStartAndEndTimeExtractVisitor.CAN_NOT_INFER_TIME_RANGE; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame.Type.GROUPS; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame.Type.RANGE; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame.Type.ROWS; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; 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 ed45e60848890..8044f661ebd7c 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 @@ -22,8 +22,13 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; @@ -47,6 +52,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -82,9 +88,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; @@ -124,7 +128,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Values; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowsStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java index a770524e6bd20..44fa109838de9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java @@ -20,13 +20,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; @@ -40,10 +43,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; import org.apache.iotdb.db.queryengine.plan.relational.planner.QueryPlanner.PlanAndMappings; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; -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.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; 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 81bd5fefbf3ad..1df67793ab87d 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 @@ -28,12 +28,14 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -85,7 +87,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WrappedStatement; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import com.google.common.collect.ImmutableList; @@ -103,13 +104,13 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode.COLUMN_NAME_PREFIX; +import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet.LOGICAL_PLANNER; import static org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet.LOGICAL_PLAN_OPTIMIZE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.MetadataUtil.createQualifiedObjectName; import static org.apache.iotdb.db.queryengine.plan.relational.planner.QueryPlanner.visibleFields; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountDevice.COUNT_DEVICE_HEADER_STRING; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDevice.getDeviceColumnHeaderList; -import static org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; public class TableLogicalPlanner { private final MPPQueryContext queryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java index f3672ff584d9e..d1db6b788ce5c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java @@ -22,8 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.ResolvedField; @@ -32,11 +34,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; 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.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.util.AstUtil; import com.google.common.collect.ImmutableMap; 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 e9995904fa233..1df79fc6881fe 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 @@ -36,6 +36,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; @@ -78,15 +83,10 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; -import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; 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.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; @@ -144,9 +144,9 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED; +import static org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind.AGGREGATE; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; -import static org.apache.iotdb.db.queryengine.plan.relational.function.FunctionKind.AGGREGATE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PushPredicateIntoTableScan.containsDiffFunction; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.TransformSortToStreamSort.isOrderByAllIdsAndTime; 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 4185b97f0cc79..1a436ce656a07 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 @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; @@ -44,7 +45,6 @@ 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; import java.util.Collections; import java.util.HashMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java index 850f74d048b91..12593f5cfd23f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java @@ -30,11 +30,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; public abstract class DefaultTraversalVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java index ca519aeabcdd1..7edfd9538e213 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java @@ -30,6 +30,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -37,22 +39,20 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; public class ExpressionRewriter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java index 222b431f0904e..de9427a7e4711 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java @@ -27,9 +27,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -37,26 +40,23 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java index 4beed6cf23a3f..b62e49a675a4d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java @@ -19,12 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.expression.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -32,13 +34,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java index a566236e072bf..1dad29f5beedd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java index b6152baf6b657..cb211b72bf116 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import java.util.function.Function; import java.util.stream.Stream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java index e7be1cf151a29..c3a88a0883505 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.common.QueryId; import com.google.common.collect.HashMultiset; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java index dd1dbee7cc1c1..fba90e9318f7e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java index 2cab086c71df9..f2504a4b1c6d4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java index 14db0d38cd3a1..cde237a7b516c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java index 9a37d27aca97f..ee3095f9ae043 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; @@ -27,7 +28,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java index fea9848e01500..b4d13a34d1b86 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java index be890aca5d071..df0e8bf08b087 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; @@ -28,9 +30,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java index 64eb1cad23a87..7aa4d30775e55 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java index 18b54f1c9bf71..57ac120e8b965 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java @@ -20,15 +20,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java index 5fb01ec8078ec..2da41be6c216f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java index ab6f60c2a2879..2ac7db35e454f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java index 02b64418008cf..d356987b5aebb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java index 5e9e49372cecc..35672ab91b056 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java index 08fb908e22f2c..349b6a76bf536 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java index 1786909ec998b..71dbdb0dbf497 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java index 86357f1113c3d..97a194e409edf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java index d5a85b8ed4363..58170aa17ba95 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java @@ -21,7 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java index e5d7612756937..f883d1cfc5b14 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java index 079fd11ae1da9..10edb885f4ffa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java @@ -21,8 +21,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java index ac5bb710dd480..ca530546f4b93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java @@ -21,12 +21,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java index 269750d37a896..5e482ec8aee76 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java index 2fcda25f33bdf..517ae1366d660 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java index 03033298b0faf..b62b41dd1d463 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java index 1de219d348295..98130b3cc15a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java index f2adfb9b3b77b..7e225161c79bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java index 9c563cfd7a7d6..cf47238240222 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java index fcecc2c3b8219..c8b3c2f192639 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java index fd0c33f9e4210..3843d16a4cf90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java index d2cec89dda755..80e3d78375d56 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java @@ -21,12 +21,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SetOperationNode; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java index 502e7c541cd1a..2b289673950de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java @@ -20,30 +20,30 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; -import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionKind; import org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; -import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SetOperationNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.utils.constant.SqlConstant; import com.google.common.collect.ImmutableList; @@ -65,8 +65,8 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.LongType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java index e376f7c4781f3..ca4362107917c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; @@ -44,7 +44,7 @@ import static com.google.common.base.Verify.verify; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.function.FunctionKind.AGGREGATE; +import static org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind.AGGREGATE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java index 03309984f2c5c..4f2fc0a1e985d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java index b010a8a706541..1bb25ae9a4720 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java index 982cb2a873f9b..750b9fb34d0d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java index 339c8c1cc79fb..702e2e7aaea69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index 24ffe8fe98a11..ded0c1dc99abb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; @@ -49,14 +49,14 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; +import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanNodeSearcher.searchFrom; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.LongType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java index de0b000801070..816f5a973058d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java @@ -20,8 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; @@ -29,11 +32,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -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.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; @@ -54,9 +54,9 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java index b796a95de2c66..7396c03b2845f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java index 5e7d402bfcc26..02bb7450bbda1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java index c2ab5d05a4934..f896c676cb163 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; @@ -42,10 +42,10 @@ import static com.google.common.base.Preconditions.checkState; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.empty; public class TransformUncorrelatedSubqueryToJoin implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java index b36344a4abdca..133cd1d80759f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import com.google.common.collect.ImmutableList; 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 4420fd7355e49..6c7d0df515744 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 @@ -22,6 +22,9 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; @@ -29,12 +32,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; 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.function.BoundSignature; 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.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java index d63e8930a2c2d..6395498b28160 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; @@ -29,7 +30,6 @@ 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.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java index cf0a8a61bb7bd..58e400df82a4c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; @@ -29,7 +30,6 @@ 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.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java index 919adeac92ea4..f1644744e50c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java @@ -22,13 +22,13 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java index 096a4e19e14d4..202344a504fb5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java @@ -25,10 +25,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; 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.sql.ast.QualifiedName; import org.apache.iotdb.db.utils.cte.CteDataStore; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java index 4cbc0398f7397..5856c3c188568 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; @@ -29,7 +30,6 @@ 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.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java index 3573ddff90a85..a5fa5cd8bd1ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java @@ -22,12 +22,15 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; 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 81fb9933e35fe..f3a906d962524 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 @@ -24,11 +24,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; 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.Metadata; 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/planner/optimizations/CheckSubqueryNodesAreRewritten.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java index 19bc7c5886aa0..676100e466127 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java index e72b54eef1f02..59b330d98c6bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; @@ -33,8 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java index 04efdd6d72725..fe1bb93d8a4bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java @@ -22,7 +22,9 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; @@ -33,11 +35,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; 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.SymbolsExtractor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeCoercion; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; 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 f6f3ec0d86331..edff2481a967d 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,6 +22,7 @@ import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -40,7 +41,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; 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.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; 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 a40f669a18d3e..0cf9b91296540 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 @@ -27,6 +27,8 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; @@ -59,11 +61,9 @@ 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.NonAlignedDeviceEntry; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.EqualityInference; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java index 9025d5ecc5336..9c90ee5a4100a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; 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 2f4f220b4bf7b..f7bd319a9e6ce 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; 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.node.DeviceTableScanNode; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java index 826f8ad63dd91..f8afb1dfb30d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java @@ -21,8 +21,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; @@ -39,13 +42,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; 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 bf1f36b59afdc..1cc2aa3f0dfc7 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,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; @@ -31,8 +33,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; 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.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java index abeb762e3a732..c96dfd56e8e10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java @@ -20,8 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; @@ -34,12 +37,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.SimplePlanRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils; -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.sql.ast.WhenClause; @@ -58,6 +58,7 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.globalAggregation; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode.Quantifier.ALL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; @@ -66,10 +67,9 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.NOT_EQUAL; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SimplePlanRewriter.rewriteWith; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode.Quantifier.ALL; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; public class TransformQuantifiedComparisonApplyToCorrelatedJoin implements PlanOptimizer { 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 e322004707ba7..9604c0a20e58e 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; 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.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; 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 199f3837506a3..a622b014c7ab2 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 @@ -20,13 +20,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; @@ -52,21 +58,15 @@ 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.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; -import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.NodeAndMappings; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java index 58d4bd8e0af23..4896179d47b8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java @@ -20,15 +20,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; -import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionKind; import org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java index 742b3ba71a1df..dd11d60a5c0a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; 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 50694d4b687e7..7c780556ffd02 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 @@ -144,18 +144,6 @@ protected R visitDereferenceExpression(DereferenceExpression node, C context) { return visitExpression(node, context); } - protected R visitTrim(Trim node, C context) { - return visitExpression(node, context); - } - - protected R visitIfExpression(IfExpression node, C context) { - return visitExpression(node, context); - } - - protected R visitNullIfExpression(NullIfExpression node, C context) { - return visitExpression(node, context); - } - protected R visitWindowDefinition(WindowDefinition node, C context) { return visitNode(node, context); } @@ -168,14 +156,6 @@ protected R visitWindowSpecification(WindowSpecification node, C context) { return visitNode(node, context); } - protected R visitWindowFrame(WindowFrame node, C context) { - return visitNode(node, context); - } - - protected R visitFrameBound(FrameBound node, C context) { - return visitNode(node, context); - } - protected R visitSelectItem(SelectItem node, C context) { return visitNode(node, context); } @@ -208,10 +188,6 @@ protected R visitValues(Values node, C context) { return visitQueryBody(node, context); } - protected R visitRow(Row node, C context) { - return visitExpression(node, context); - } - protected R visitTableSubquery(TableSubquery node, C context) { return visitQueryBody(node, context); } @@ -440,14 +416,6 @@ protected R visitQuantifiedComparisonExpression(QuantifiedComparisonExpression n return visitExpression(node, context); } - protected R visitDataType(DataType node, C context) { - return visitExpression(node, context); - } - - protected R visitGenericDataType(GenericDataType node, C context) { - return visitDataType(node, context); - } - protected R visitDataTypeParameter(DataTypeParameter node, C context) { return visitNode(node, context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java index 327185b7177fe..25da5affc1ca2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java index 28a51ad93f363..c52addca99dcc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java @@ -28,6 +28,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -35,8 +36,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; public abstract class DefaultTraversalVisitor extends AstVisitor { @Override 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 725ef7e07cc3e..5befa0987a08e 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 @@ -28,6 +28,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceBlackListConstructor; @@ -39,8 +41,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; 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.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.rescon.MemSchemaRegionStatistics; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.storageengine.dataregion.modification.ModEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TypeParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TypeParameter.java index 1aa2b27afe32c..9425b59314556 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TypeParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TypeParameter.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java index ad88124cd5037..b1397805be829 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java index 93c26d5c8a5cf..1faace4322a6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; 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 b354befae6175..e56350cd4f8f5 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 @@ -45,10 +45,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -59,11 +63,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; @@ -91,7 +99,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTopic; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTraining; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateView; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Deallocate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; @@ -119,13 +126,10 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExtendRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Flush; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingElement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; @@ -142,7 +146,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MigrateRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OneOrMoreQuantifier; @@ -174,7 +177,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RemoveRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; @@ -229,7 +231,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UnloadModel; @@ -242,7 +243,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Window; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowSpecification; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java index bb549f926c107..55460da064d60 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.protocol.session.IClientSession; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlBaseListener; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlLexer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java index be4e0191bed79..9ab89c6566396 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java @@ -35,8 +35,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -46,11 +49,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; @@ -58,28 +65,21 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingElement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; 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.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleGroupBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Window; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowSpecification; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java index efa209cc6073e..28529fe701758 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; @@ -70,7 +71,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RelationalAuthorStatement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java index ec45a90a4b827..8f4620d64c752 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; public abstract class GroupByComponent extends StatementNode { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java index 2e54f2b4a0dd7..9d1e5f27fe209 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; public class GroupByConditionComponent extends GroupByComponent { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java index 34d7d272c636f..5b8b6360337b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; /** This class maintains information of {@code HAVING} clause. */ diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java index 00bd6f01b0a5a..69aacd46905a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java index 236a939dc9aef..2e54f22346918 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java index f97391330811e..6e9436c6c2bff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java index 1bf41bd8abfb3..5539cf79b9fdf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java index 6d6bb4ef30a42..9fe3f346369d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java index 7352c1e96fcb6..d97032d2c0662 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; /** This class maintains information of {@code WHERE} clause. */ diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java index d8786e33959a5..b0e83a5eb7153 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java @@ -28,12 +28,12 @@ import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.schemaengine.schemaregion.attribute.update.UpdateDetailContainer; import org.apache.iotdb.db.utils.CommonUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java index 12369d81bfd30..4315f84338e2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java @@ -29,6 +29,7 @@ import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException; import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.IMeasurementSchemaInfo; @@ -39,7 +40,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertTablet; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor; import org.apache.iotdb.db.utils.CommonUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java index d966903abd392..554ae1b273fa6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java @@ -21,13 +21,13 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.CountTimeAggregationAmountVisitor; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType; import org.apache.iotdb.db.queryengine.execution.operator.window.ainode.InferenceWindow; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.CountTimeAggregationAmountVisitor; import org.apache.iotdb.db.queryengine.plan.statement.AuthorityInformationStatement; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java index 8bca6b8f5d1cf..2f44a61e98316 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.metadata.view; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.IConfigStatement; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java index e1a122b081620..0fce97ee402aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.exception.metadata.view.UnsupportedViewException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.analyze.SelectIntoUtils; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java index 14acfa529e39b..0f5814bc25a9e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java @@ -29,7 +29,7 @@ import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.commons.udf.service.UDFExecutableManager; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.queryengine.plan.relational.function.TableBuiltinTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; import org.apache.iotdb.udf.api.UDF; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.exception.UDFManagementException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java index a404a63f8d31e..6c8bb616d6c79 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.builder; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.IntermediateLayerVisitor; import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.IntermediateLayerVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.input.QueryDataSetInputLayer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java index 14643a7b6ac50..48de9d9232349 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.input; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.utils.CommonUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java index 72127aad5a56e..f66f51b5bb48b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.dag.input.ConstantInputReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java index 149485ef3b5b5..f13b1b79adf59 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.udf.api.customizer.strategy.AccessStrategy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java index 78e0c7451b7c6..c4b3e66ecd033 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java index 2bf5f2b3eb84d..ad8a4e118d313 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java index e7d67c36349ce..1d918ea94e03b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/LayerMemoryAssigner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/LayerMemoryAssigner.java index 0eb796b72aa2e..721016f99ecf2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/LayerMemoryAssigner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/LayerMemoryAssigner.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.memory; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import java.util.HashMap; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java index 195acb6de8527..0d7d08b45804f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.CastFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.UnaryTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java index 771ecbd9b96ad..acb3b9980d8ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.service.TemporaryQueryDataFileService; import java.time.ZoneId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java index 015904399c201..9c409dc3c7e56 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.datastructure.util.ValueRecorder; import org.apache.iotdb.db.utils.CommonUtils; 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 b16041fdfc2e7..f7334e84e26d3 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 @@ -46,6 +46,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceAttributeUpdater; @@ -70,8 +72,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableNodeLocationAddNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.metric.ISchemaRegionMetric; import org.apache.iotdb.db.schemaengine.metric.SchemaRegionMemMetric; import org.apache.iotdb.db.schemaengine.rescon.DataNodeSchemaQuotaManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java index b4f37815d748e..b1e916672c0b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java @@ -26,13 +26,13 @@ import org.apache.iotdb.commons.schema.tree.SchemaIterator; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.CompleteMeasurementSchemaVisitor; import org.apache.iotdb.db.queryengine.common.NodeRef; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ClusterSchemaFetcher; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.CompleteMeasurementSchemaVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ITimeSeriesSchemaInfo; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.reader.ISchemaReader; import org.apache.iotdb.db.schemaengine.schemaregion.utils.filter.FilterContainsVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java index 73127f25c153f..25258231642f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.metadata.view.UnsupportedViewException; import org.apache.iotdb.db.exception.metadata.view.ViewContainsAggregationException; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.visitor.CollectAggregationExpressionsVisitor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.CollectAggregationExpressionsVisitor; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java index 0b3bce049c26d..024b138a9d12d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java @@ -55,24 +55,32 @@ import org.apache.iotdb.commons.schema.view.viewExpression.unary.RegularViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.unary.UnaryViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.visitor.ViewExpressionVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.DivisionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ModuloExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; import org.apache.tsfile.utils.Pair; @@ -134,21 +142,19 @@ public Expression visitUnaryExpression(UnaryViewExpression unaryViewExpression, @Override public Expression visitInExpression(InViewExpression inExpression, Void context) { Expression child = this.process(inExpression.getExpression(), context); - return new org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression( - child, inExpression.isNotIn(), inExpression.getValuesInLinkedHashSet()); + return new InExpression(child, inExpression.isNotIn(), inExpression.getValuesInLinkedHashSet()); } @Override public Expression visitIsNullExpression(IsNullViewExpression isNullExpression, Void context) { Expression child = this.process(isNullExpression.getExpression(), context); - return new org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression( - child, isNullExpression.isNot()); + return new IsNullExpression(child, isNullExpression.isNot()); } @Override public Expression visitLikeExpression(LikeViewExpression likeExpression, Void context) { Expression child = this.process(likeExpression.getExpression(), context); - return new org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression( + return new LikeExpression( child, likeExpression.getPattern(), likeExpression.getEscape(), likeExpression.isNot()); } @@ -156,20 +162,20 @@ public Expression visitLikeExpression(LikeViewExpression likeExpression, Void co public Expression visitLogicNotExpression( LogicNotViewExpression logicNotExpression, Void context) { Expression child = this.process(logicNotExpression.getExpression(), context); - return new org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression(child); + return new LogicNotExpression(child); } @Override public Expression visitNegationExpression( NegationViewExpression negationExpression, Void context) { Expression child = this.process(negationExpression.getExpression(), context); - return new org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression(child); + return new NegationExpression(child); } @Override public Expression visitRegularExpression(RegularViewExpression regularExpression, Void context) { Expression child = this.process(regularExpression.getExpression(), context); - return new org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression( + return new RegularExpression( child, regularExpression.getPatternString(), regularExpression.getPattern(), @@ -307,8 +313,7 @@ public Expression visitBetweenExpression( Expression first = this.process(betweenViewExpression.getFirstExpression(), null); Expression second = this.process(betweenViewExpression.getSecondExpression(), null); Expression third = this.process(betweenViewExpression.getThirdExpression(), null); - return new org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression( - first, second, third, betweenViewExpression.isNotBetween()); + return new BetweenExpression(first, second, third, betweenViewExpression.isNotBetween()); } // endregion @@ -321,7 +326,7 @@ public Expression visitFunctionExpression( for (ViewExpression viewExpression : viewExpressionList) { expressionList.add(this.process(viewExpression, null)); } - return new org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression( + return new FunctionExpression( functionViewExpression.getFunctionName(), functionViewExpression.getFunctionAttributes(), expressionList); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java index aa2855f7b0592..b9505032c9de5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java @@ -22,14 +22,14 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java index b85e745c12bba..02ac04aa30fd4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.common.schematree; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.tsfile.enums.TSDataType; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index 581a2952696b4..d598c38630d70 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -26,7 +26,13 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.TimeColumnTransformer; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -76,17 +82,11 @@ import org.apache.iotdb.db.queryengine.execution.operator.window.TimeWindowParameter; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowParameter; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.TimeColumnTransformer; import com.google.common.collect.Sets; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java index 03154d821435c..a5ddd820b9000 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java @@ -22,6 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.NodeRef; @@ -32,8 +34,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.process.TransformOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.input.QueryDataSetInputLayer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java index 3e8c75f943d9e..c0427030c2c54 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.expression.predicate; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.utils.TimestampPrecisionUtils; @@ -36,22 +36,22 @@ import java.util.LinkedHashSet; import java.util.TimeZone; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.between; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.eq; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.groupByTime; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gte; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.in; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.lt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.lte; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.neq; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.not; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.notBetween; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.notIn; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.or; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.between; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.eq; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.groupByTime; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gte; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.in; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.lt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.lte; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.neq; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.not; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.notBetween; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.notIn; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.or; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.time; import static org.apache.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG; public class ConvertPredicateToTimeFilterTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicatePushIntoScanTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicatePushIntoScanTest.java index 8ee7bdaf77663..e82f6036afcbf 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicatePushIntoScanTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicatePushIntoScanTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.expression.predicate; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.junit.Assert; import org.junit.Test; @@ -30,22 +30,22 @@ import java.util.Arrays; import java.util.LinkedHashSet; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.add; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.between; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.eq; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gte; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.in; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.isNotNull; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.isNull; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.like; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.lt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.not; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.notRegex; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.sin; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.time; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.add; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.between; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.eq; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gte; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.in; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.isNotNull; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.isNull; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.like; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.lt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.not; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.notRegex; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.sin; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; public class PredicatePushIntoScanTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateRemoveNotTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateRemoveNotTest.java index 6171cc4829473..cf1f54c56a1f4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateRemoveNotTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateRemoveNotTest.java @@ -25,23 +25,23 @@ import java.util.Arrays; import java.util.LinkedHashSet; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.between; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.eq; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gte; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.in; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.lt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.lte; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.neq; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.not; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.notBetween; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.notIn; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.or; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.time; import static org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils.predicateRemoveNot; import static org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils.reversePredicate; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.between; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.eq; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gte; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.in; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.lt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.lte; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.neq; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.not; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.notBetween; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.notIn; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.or; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.time; public class PredicateRemoveNotTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateUtilsTest.java index 8cd0d106047d5..b9bc917766d9b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateUtilsTest.java @@ -24,11 +24,11 @@ import org.junit.Assert; import org.junit.Test; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.add; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.add; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.schemaMap; public class PredicateUtilsTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/TreePredicateConversionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/TreePredicateConversionTest.java index e4692e0166c4c..ddcf7cbf2ad78 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/TreePredicateConversionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/TreePredicateConversionTest.java @@ -21,17 +21,17 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/serde/CaseWhenThenExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/serde/CaseWhenThenExpressionTest.java index fb614928741e2..2ff5ce0445a1d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/serde/CaseWhenThenExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/serde/CaseWhenThenExpressionTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.expression.serde; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; import org.junit.Test; @@ -30,12 +30,12 @@ import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.eq; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.lt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.whenThen; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.eq; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.lt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.whenThen; import static org.junit.Assert.assertEquals; public class CaseWhenThenExpressionTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AggregationDescriptorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AggregationDescriptorTest.java index 2252b2b74493e..fd41d5f072d68 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AggregationDescriptorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AggregationDescriptorTest.java @@ -23,7 +23,7 @@ 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.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.CrossSeriesAggregationDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java index 66dc7edb8fde1..10a8ad78c4066 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java @@ -29,7 +29,7 @@ import java.time.ZonedDateTime; -import static org.apache.iotdb.db.queryengine.plan.expression.visitor.CountTimeAggregationAmountVisitor.COUNT_TIME_ONLY_SUPPORT_ONE_WILDCARD; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.CountTimeAggregationAmountVisitor.COUNT_TIME_ONLY_SUPPORT_ONE_WILDCARD; import static org.apache.iotdb.db.queryengine.plan.statement.component.IntoComponent.DEVICE_ALIGNMENT_INCONSISTENT_ERROR_MSG; import static org.apache.iotdb.db.queryengine.plan.statement.component.IntoComponent.DEVICE_NUM_MISMATCH_ERROR_MSG; import static org.apache.iotdb.db.queryengine.plan.statement.component.IntoComponent.DUPLICATE_TARGET_PATH_ERROR_MSG; 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 542a3db907d99..67c2f8d63e4bd 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 @@ -24,26 +24,26 @@ 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.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.DivisionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ModuloExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; 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.DatasetHeader; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; @@ -67,12 +67,12 @@ import java.util.Map; 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; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gte; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.groupByTime; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gte; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.time; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzerTest.java index 0bd16ad83cf1f..f1b94e8e09cba 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzerTest.java @@ -22,22 +22,22 @@ 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.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.junit.Test; import java.util.Arrays; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.count; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.path; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.count; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.path; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; import static org.junit.Assert.assertEquals; public class ExpressionAnalyzerTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java index d0ba14461f799..17cf91ead5b76 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.optimization; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; @@ -34,9 +34,9 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.getAggregationDescriptor; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.schemaMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java index b59a783988442..a70d7d4a8912c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.optimization; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java index 214289d4e7ff9..d2bf0dbe3a070 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.Analyzer; import org.apache.iotdb.db.queryengine.plan.analyze.FakePartitionFetcherImpl; import org.apache.iotdb.db.queryengine.plan.analyze.FakeSchemaFetcherImpl; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; @@ -51,11 +51,11 @@ import java.util.LinkedHashMap; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.add; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.function; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.add; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.function; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.schemaMap; /** Use optimize rule: LimitOffsetPushDown and OrderByExpressionWithLimitChangeToTopK */ diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java index f1c5438ec2702..22d1fe4a2a225 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java @@ -24,6 +24,7 @@ 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.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.Analyzer; import org.apache.iotdb.db.queryengine.plan.analyze.FakePartitionFetcherImpl; import org.apache.iotdb.db.queryengine.plan.analyze.FakeSchemaFetcherImpl; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.LogicalPlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java index 16ce7c9112864..0675771affeba 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java @@ -30,13 +30,13 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.add; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.or; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.sin; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.add; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.or; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.sin; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.schemaMap; public class PredicatePushDownTest { 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 2301cc1b3c1ae..4fc9645d45a5a 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 @@ -22,9 +22,9 @@ 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.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ColumnInjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java index 168923c7a4285..8f77f5bb4422d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java @@ -27,15 +27,15 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementTestUtils; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java index 0b41923a2135d..552a771e9b4cd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.tsfile.enums.TSDataType; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java index f5e8d6be70f23..d4d96f364c29c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java @@ -30,12 +30,12 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.TreeModelTimePredicate; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java index 63920f55f5f50..6889e3401e420 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java @@ -26,6 +26,7 @@ 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.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.ExchangeOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.memory.ConsumeAllChildrenPipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.ConsumeChildrenOneByOnePipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java index eac3821e0ddf1..f7bec14b3db13 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java @@ -24,13 +24,13 @@ 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.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; 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.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java index 387900bf69715..07618c44fc27e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java @@ -36,6 +36,8 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; @@ -49,8 +51,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaComputationWithAutoCreation; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.LogicalPlanner; import org.apache.iotdb.db.queryengine.plan.statement.Statement; 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 0db43153e14d9..270f074cad485 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 @@ -23,13 +23,13 @@ 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.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.QueryId; -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; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java index 30497d4863556..4ff271ce71241 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java @@ -25,9 +25,9 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilterType; import org.apache.iotdb.commons.schema.filter.impl.PathContainsFilter; import org.apache.iotdb.commons.schema.filter.impl.TagFilter; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java index 86bc0f13f65e6..3aab784c52984 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java @@ -23,8 +23,8 @@ 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.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; @@ -44,8 +44,8 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.in; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.in; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; import static org.junit.Assert.assertEquals; public class AggregationNodeSerdeTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java index 887f3b261d463..0227368208c1c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java @@ -20,11 +20,11 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -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.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java index 10f9b3d08b09b..568998373017a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java @@ -22,8 +22,8 @@ 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.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; @@ -44,9 +44,9 @@ import java.util.Arrays; import java.util.Collections; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.time; import static org.junit.Assert.assertEquals; public class GroupByLevelNodeSerdeTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java index a146a6a934755..b811c1f5d3c02 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.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.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByTagNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; @@ -50,9 +50,9 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.time; public class GroupByTagNodeSerdeTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java index cb2a96555bbf9..81717d2c3f271 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java @@ -23,18 +23,18 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionId; -import org.apache.iotdb.db.queryengine.plan.relational.function.FunctionKind; import org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java index 25d86e17887ec..8608cc4fb7fc8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; @@ -41,9 +41,9 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.time; import static org.junit.Assert.assertEquals; public class SeriesAggregationScanNodeSerdeTest { 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 19ac522894fd4..efa9407726a3c 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 @@ -33,6 +33,7 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -42,6 +43,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -54,7 +56,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; -import org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnHandle; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ITableDeviceSchemaValidation; @@ -73,7 +74,6 @@ 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.relational.type.InternalTypeManager; 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; 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 631640d5dda5a..6df308c7dd306 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -32,7 +33,6 @@ 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.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.junit.Test; import org.mockito.Mockito; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java index ecb8c6fb26652..7304d00233fc6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java @@ -14,6 +14,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -23,7 +24,6 @@ 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.relational.type.InternalTypeManager; import org.junit.Assert; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java index 3fdf170f18368..d0153169e17aa 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java @@ -26,11 +26,12 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; -import org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnMetadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; @@ -42,7 +43,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java index a2e3a72b127cb..890162c254579 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.relational.function.tvf.ForecastTableFunction; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.TableFunctionProcessorMatcher; @@ -37,11 +37,11 @@ import java.util.Collections; import java.util.function.Consumer; +import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_INTERVAL; +import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_START_TIME; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AnalyzerTest.analyzeSQL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.QUERY_CONTEXT; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.TEST_MATADATA; -import static org.apache.iotdb.db.queryengine.plan.relational.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_INTERVAL; -import static org.apache.iotdb.db.queryengine.plan.relational.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_START_TIME; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index c6d553be5305d..a65516fc64a30 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -28,19 +28,20 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.SubtractionResolver; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.function.Exclude; import org.apache.iotdb.db.queryengine.plan.function.Repeat; import org.apache.iotdb.db.queryengine.plan.function.Split; -import org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType; -import org.apache.iotdb.db.queryengine.plan.relational.function.TableBuiltinTableFunction; -import org.apache.iotdb.db.queryengine.plan.relational.function.arithmetic.SubtractionResolver; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnMetadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; @@ -54,7 +55,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TreeDeviceViewSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; 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 b549702f47414..9dd13640ed0ed 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; @@ -31,7 +32,6 @@ 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.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java index c0100ce2898b3..a6f25f4fbe71c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; 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 91075acd18f19..4d4deddf91d7e 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 @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; @@ -46,7 +47,6 @@ 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.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableList; import org.mockito.Mockito; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java index 31f9e3a879452..4fa07a722e17c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java index c7f9f693acbdc..a06a00152f2b2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import com.google.common.base.Joiner; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java index ef7dbd70e6920..c73e6c430b3e3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java @@ -32,6 +32,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -40,15 +41,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Row; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java index 794614524dabe..63d2d47ee579c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.Ordering; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java index f1cc223811791..55941e59cdf1a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanNodeSearcher; -import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import java.time.ZoneId; 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 06f998f172964..4f2c16ba92155 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 @@ -20,7 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; @@ -44,12 +46,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AlignedAggregationTreeDeviceViewScanNode; @@ -62,7 +63,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeAlignedDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java index b9b577e70eb0a..691ac8e78d48d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; @@ -32,7 +32,7 @@ import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments.identity; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments.identity; 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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java index 2186a745894be..ea0411dad81b6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.queryengine.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import com.google.common.collect.ImmutableList; 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 47d8bf02ace46..96c2def8707df 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 @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java index c81ed2c1b3141..d00dea7a0055c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.Ordering; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java index 2b9d5bb90463d..545d435ce7c9a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme; import java.util.List; import java.util.Objects; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java index dbbadd1be91fb..efaf992b4ebfa 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.schema.table.column.TagColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRow; -import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java index fc3723ea82016..747e4ef07e7c6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java index 991455cbc0b69..7dbe69fabb4ac 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java index 739bc55d7cb91..51558fe05d08e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java index e121db1dcce58..a1d57f0444892 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java index ba0a763173122..f52d85dc09f8f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java @@ -20,8 +20,8 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; - import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.LpadColumnTransformer; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java index 593dc97c11a9b..048633b3d1e66 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java @@ -20,8 +20,8 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; - import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.RpadColumnTransformer; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java index e6895f84e7051..566db78200d25 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java @@ -20,7 +20,6 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; - import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.ArithmeticNegationColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.InColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.IsNullColumnTransformer; @@ -28,6 +27,7 @@ import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LogicNotColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.RegularColumnTransformer; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.common.regexp.LikePattern; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java index ce55e7b072472..af074c2a17d50 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; - import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BlobLengthColumnTransformer; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; import org.apache.tsfile.utils.Binary; From 6d37835b2227c6265194debb54b058888fdfa855 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Tue, 14 Apr 2026 14:38:55 +0800 Subject: [PATCH 12/45] move ExpressionFormatter --- .../ArithmeticBinaryColumnTransformer.ftl | 6 +- .../ArithmeticColumnTransformerApi.ftl | 2 +- .../ArithmeticUnaryColumnTransformer.ftl | 2 +- .../plan/planner/TableOperatorGenerator.java | 22 +- .../common/ConnectionInfo.java | 9 +- .../common/NodeRef.java | 2 +- .../execution/MemoryEstimationHelper.java | 2 +- .../aggregation/grouped/UpdateMemory.java | 2 +- .../hash}/hash/CombineHashFunction.java | 2 +- .../grouped/hash}/hash/FlatGroupByHash.java | 8 +- .../grouped/hash}/hash/FlatHash.java | 8 +- .../grouped/hash}/hash/FlatHashStrategy.java | 2 +- .../grouped/hash}/hash/GroupByHash.java | 4 +- .../grouped/hash}/hash/HashStrategy.java | 8 +- .../grouped/hash}/hash/MarkDistinctHash.java | 8 +- .../hash}/hash/NoChannelGroupByHash.java | 2 +- .../grouped/hash}/hash/VariableWidthData.java | 8 +- .../grouped/hash}/hash/XxHash64.java | 2 +- .../{ => expression}/multi/FunctionType.java | 2 +- .../plan/node/ICoreQueryPlanVisitor.java | 5 +- .../planner/plan/parameter/InputLocation.java | 2 +- .../plan/relational/analyzer/NodeRef.java | 2 +- .../function/function/BoundSignature.java | 2 +- .../function/function/Signature.java | 2 +- .../function/TypeVariableConstraint.java | 2 +- .../function/tvf/ClassifyTableFunction.java | 4 +- .../function/tvf/ForecastTableFunction.java | 4 +- .../relational/metadata/ResolvedFunction.java | 2 +- .../relational/planner/OrderingScheme.java | 2 - .../plan/relational/planner/SortOrder.java | 2 +- .../planner/iterative/GroupReference.java | 4 +- .../planner/node/AggregationNode.java | 2 +- .../planner/node/CorrelatedJoinNode.java | 7 +- .../plan/relational/planner/node/Measure.java | 2 +- .../planner/node/PatternRecognitionNode.java | 4 +- .../relational/planner/node/RowsPerMatch.java | 2 +- .../planner/node/SkipToPosition.java | 2 +- .../plan/relational/security/Identity.java | 2 +- .../plan/relational/sql/ast/AllColumns.java | 9 +- .../plan/relational/sql/ast/AllRows.java | 9 +- .../sql/ast/ArithmeticBinaryExpression.java | 2 - .../sql/ast/ArithmeticUnaryExpression.java | 2 - .../sql/ast/AstMemoryEstimationHelper.java | 5 +- .../relational/sql/ast/BetweenPredicate.java | 2 - .../relational/sql/ast/BinaryLiteral.java | 1 - .../relational/sql/ast/BooleanLiteral.java | 2 - .../plan/relational/sql/ast/Cast.java | 2 - .../sql/ast/CoalesceExpression.java | 2 - .../plan/relational/sql/ast/Columns.java | 10 +- .../sql/ast/CommonQueryAstVisitor.java | 98 +++++++ .../sql/ast/ComparisonExpression.java | 2 - .../relational/sql/ast/CurrentDatabase.java | 2 - .../plan/relational/sql/ast/CurrentTime.java | 2 - .../plan/relational/sql/ast/CurrentUser.java | 2 - .../relational/sql/ast/DataTypeParameter.java | 8 +- .../relational/sql/ast/DecimalLiteral.java | 2 - .../sql/ast/DereferenceExpression.java | 9 +- .../relational/sql/ast/DoubleLiteral.java | 2 - .../relational/sql/ast/ExistsPredicate.java | 9 +- .../plan/relational/sql/ast/Expression.java | 5 +- .../plan/relational/sql/ast/Extract.java | 2 - .../relational/sql/ast/FieldReference.java | 8 +- .../plan/relational/sql/ast/FloatLiteral.java | 1 - .../plan/relational/sql/ast/FrameBound.java | 2 - .../plan/relational/sql/ast/FunctionCall.java | 5 - .../relational/sql/ast/GenericDataType.java | 4 - .../relational/sql/ast/GenericLiteral.java | 1 - .../plan/relational/sql/ast/GroupBy.java | 8 +- .../relational/sql/ast/GroupingElement.java | 9 +- .../plan/relational/sql/ast/GroupingSets.java | 9 +- .../plan/relational/sql/ast/Identifier.java | 10 +- .../plan/relational/sql/ast/IfExpression.java | 2 - .../relational/sql/ast/InListExpression.java | 10 +- .../plan/relational/sql/ast/InPredicate.java | 2 - .../sql/ast/IsNotNullPredicate.java | 2 - .../relational/sql/ast/IsNullPredicate.java | 2 - .../relational/sql/ast/LikePredicate.java | 2 - .../relational/sql/ast/LogicalExpression.java | 2 - .../plan/relational/sql/ast/LongLiteral.java | 1 - .../relational/sql/ast/NotExpression.java | 2 - .../relational/sql/ast/NullIfExpression.java | 2 - .../plan/relational/sql/ast/NullLiteral.java | 2 - .../relational/sql/ast/NumericParameter.java | 8 +- .../plan/relational/sql/ast/OrderBy.java | 8 +- .../plan/relational/sql/ast/Parameter.java | 9 +- .../relational/sql/ast/QualifiedName.java | 4 +- .../ast/QuantifiedComparisonExpression.java | 11 +- .../plan/relational/sql/ast/Row.java | 2 - .../sql/ast/SearchedCaseExpression.java | 3 - .../plan/relational/sql/ast/SelectItem.java | 5 +- .../sql/ast/SimpleCaseExpression.java | 3 - .../relational/sql/ast/SimpleGroupBy.java | 9 +- .../plan/relational/sql/ast/SortItem.java | 9 +- .../relational/sql/ast/StringLiteral.java | 2 - .../sql/ast/SubqueryExpression.java | 9 +- .../relational/sql/ast/SymbolReference.java | 2 - .../plan/relational/sql/ast/Trim.java | 2 - .../relational/sql/ast/TypeParameter.java | 8 +- .../plan/relational/sql/ast/WhenClause.java | 10 +- .../plan/relational/sql/ast/Window.java | 2 +- .../plan/relational/sql/ast/WindowFrame.java | 2 - .../relational/sql/ast/WindowReference.java | 8 +- .../sql/ast/WindowSpecification.java | 10 +- .../sql/util/ExpressionFormatter.java | 54 ++-- .../relational/type/InternalTypeManager.java | 1 - .../plan/relational/type/TypeSignature.java | 6 +- .../type/TypeSignatureTranslator.java | 9 +- .../utils/ResultColumnAppender.java | 2 +- .../plan/relational/utils/TypeUtil.java | 12 +- .../visitor/PipePlanToStatementVisitor.java | 2 +- .../db/protocol/session/IClientSession.java | 2 +- .../db/protocol/session/SessionManager.java | 2 +- .../thrift/impl/ClientRPCServiceImpl.java | 4 +- .../impl/DataNodeInternalRPCServiceImpl.java | 12 +- .../queryengine/common/MPPQueryContext.java | 4 +- .../db/queryengine/common/SessionInfo.java | 2 +- .../aggregation/AccumulatorFactory.java | 6 +- .../execution/aggregation/TreeAggregator.java | 2 +- .../aggregation/UDAFAccumulator.java | 2 +- .../EmptyQueueSlidingWindowAggregator.java | 2 +- ...MonotonicQueueSlidingWindowAggregator.java | 2 +- .../NormalQueueSlidingWindowAggregator.java | 2 +- .../SlidingWindowAggregator.java | 2 +- .../SlidingWindowAggregatorFactory.java | 4 +- .../SmoothQueueSlidingWindowAggregator.java | 2 +- .../TableDateBinTimeRangeIterator.java | 2 +- .../execution/operator/EmptyDataOperator.java | 2 +- .../operator/ExplainAnalyzeOperator.java | 4 +- .../operator/GroupedTopNRowNumberBuilder.java | 2 +- .../execution/operator/OperatorContext.java | 2 +- .../SimpleTsBlockWithPositionComparator.java | 2 +- .../process/AbstractFillOperator.java | 2 +- .../process/AbstractLinearFillOperator.java | 2 +- .../process/AbstractTreeIntoOperator.java | 2 +- .../ActiveRegionScanMergeOperator.java | 2 +- .../process/AggregationMergeSortOperator.java | 2 +- .../operator/process/AggregationOperator.java | 2 +- .../process/AssignUniqueIdOperator.java | 2 +- .../operator/process/CollectOperator.java | 2 +- .../process/ColumnInjectOperator.java | 2 +- .../process/DeviceViewIntoOperator.java | 4 +- .../operator/process/DeviceViewOperator.java | 2 +- .../process/EnforceSingleRowOperator.java | 2 +- .../process/FilterAndProjectOperator.java | 22 +- .../InsertTabletStatementGenerator.java | 2 +- .../operator/process/LimitOperator.java | 2 +- .../operator/process/MergeSortOperator.java | 2 +- .../operator/process/OffsetOperator.java | 2 +- .../process/PatternRecognitionOperator.java | 6 +- .../PreviousFillWithGroupOperator.java | 2 +- .../operator/process/ProjectOperator.java | 2 +- .../process/RawDataAggregationOperator.java | 2 +- .../process/SingleDeviceViewOperator.java | 2 +- .../SlidingWindowAggregationOperator.java | 2 +- .../operator/process/SortOperator.java | 2 +- .../TableInsertTabletStatementGenerator.java | 2 +- .../operator/process/TableIntoOperator.java | 4 +- .../process/TableStreamSortOperator.java | 2 +- .../process/TagAggregationOperator.java | 2 +- .../operator/process/TopKOperator.java | 2 +- .../operator/process/TransformOperator.java | 8 +- .../TreeInsertTabletStatementGenerator.java | 2 +- .../operator/process/TreeIntoOperator.java | 4 +- .../operator/process/ValuesOperator.java | 2 +- .../process/ai/InferenceOperator.java | 2 +- .../process/copyto/TableCopyToOperator.java | 2 +- .../process/function/PartitionRecognizer.java | 2 +- .../function/TableFunctionOperator.java | 2 +- .../gapfill/AbstractGapFillOperator.java | 2 +- .../gapfill/GapFillWGroupWMoOperator.java | 2 +- .../gapfill/GapFillWGroupWoMoOperator.java | 2 +- .../gapfill/GapFillWoGroupWMoOperator.java | 2 +- .../gapfill/GapFillWoGroupWoMoOperator.java | 2 +- .../join/FullOuterTimeJoinOperator.java | 2 +- .../join/HorizontallyConcatOperator.java | 2 +- .../process/join/InnerTimeJoinOperator.java | 4 +- .../join/LeftOuterTimeJoinOperator.java | 2 +- .../SimpleNestedLoopCrossJoinOperator.java | 2 +- .../join/TableLeftOuterTimeJoinOperator.java | 2 +- .../join/merge/MergeSortComparator.java | 2 +- .../process/join/merge/MultiColumnMerger.java | 2 +- .../merge/NonOverlappedMultiColumnMerger.java | 2 +- .../join/merge/SingleColumnMerger.java | 2 +- .../last/AlignedUpdateLastCacheOperator.java | 2 +- .../last/LastQueryCollectOperator.java | 2 +- .../process/last/LastQueryMergeOperator.java | 2 +- .../process/last/LastQueryOperator.java | 2 +- .../process/last/LastQuerySortOperator.java | 2 +- .../last/LastQueryTransformOperator.java | 2 +- .../operator/process/last/LastQueryUtil.java | 2 +- .../process/last/UpdateLastCacheOperator.java | 2 +- .../rowpattern/PatternPartitionExecutor.java | 4 +- .../process/window/RowNumberOperator.java | 8 +- .../process/window/TableWindowOperator.java | 2 +- .../process/window/TopKRankingOperator.java | 10 +- .../window/partition/frame/FrameInfo.java | 2 +- .../CountGroupByLevelMergeOperator.java | 2 +- .../schema/CountGroupByLevelScanOperator.java | 2 +- .../operator/schema/CountMergeOperator.java | 2 +- .../schema/NodeManageMemoryMergeOperator.java | 2 +- .../schema/NodePathsConvertOperator.java | 2 +- .../schema/NodePathsCountOperator.java | 2 +- .../operator/schema/SchemaCountOperator.java | 2 +- .../schema/SchemaFetchMergeOperator.java | 2 +- .../schema/SchemaFetchScanOperator.java | 2 +- .../schema/SchemaQueryMergeOperator.java | 2 +- .../SchemaQueryOrderByHeatOperator.java | 2 +- .../schema/SchemaQueryScanOperator.java | 2 +- .../schema/source/DeviceAttributeUpdater.java | 4 +- .../source/DeviceBlackListConstructor.java | 4 +- .../schema/source/DevicePredicateFilter.java | 4 +- .../schema/source/DevicePredicateHandler.java | 4 +- .../operator/schema/source/DeviceUpdater.java | 4 +- .../operator/sink/IdentitySinkOperator.java | 2 +- .../operator/sink/ShuffleHelperOperator.java | 2 +- .../AbstractRegionScanDataSourceOperator.java | 2 +- .../AlignedSeriesAggregationScanOperator.java | 2 +- .../source/AlignedSeriesScanOperator.java | 2 +- .../operator/source/ExchangeOperator.java | 2 +- .../source/LastCacheScanOperator.java | 2 +- .../source/SeriesAggregationScanOperator.java | 2 +- .../operator/source/SeriesScanOperator.java | 2 +- .../source/ShowDiskUsageOperator.java | 2 +- .../operator/source/ShowQueriesOperator.java | 2 +- .../AbstractDefaultAggTableScanOperator.java | 2 +- .../relational/AbstractTableScanOperator.java | 2 +- .../AsofMergeSortInnerJoinOperator.java | 2 +- .../AsofMergeSortLeftJoinOperator.java | 2 +- .../source/relational/CteScanOperator.java | 2 +- .../DeviceIteratorScanOperator.java | 2 +- ...formationSchemaContentSupplierFactory.java | 6 +- .../InformationSchemaTableScanOperator.java | 2 +- .../LastQueryAggTableScanOperator.java | 2 +- .../relational/MarkDistinctOperator.java | 6 +- .../MergeSortFullOuterJoinOperator.java | 2 +- .../MergeSortInnerJoinOperator.java | 2 +- .../relational/MergeSortLeftJoinOperator.java | 2 +- .../relational/MergeSortSemiJoinOperator.java | 2 +- ...gnedDeviceViewAggregationScanOperator.java | 2 +- .../TreeToTableViewAdaptorOperator.java | 2 +- .../aggregation/AccumulatorFactory.java | 4 +- .../aggregation/AggregationOperator.java | 2 +- .../grouped/HashAggregationOperator.java | 4 +- .../grouped/StreamingAggregationOperator.java | 2 +- .../StreamingHashAggregationOperator.java | 4 +- .../InMemoryHashAggregationBuilder.java | 6 +- .../window/ConditionWindowParameter.java | 2 +- .../relational/ColumnTransformerBuilder.java | 262 +++++++++--------- .../db/queryengine/plan/Coordinator.java | 4 +- .../db/queryengine/plan/analyze/Analysis.java | 8 +- .../plan/analyze/AnalyzeUtils.java | 2 +- .../plan/analyze/AnalyzeVisitor.java | 16 +- .../plan/analyze/ConcatPathRewriter.java | 2 +- .../plan/analyze/ExpressionAnalyzer.java | 52 ++-- .../plan/analyze/ExpressionTypeAnalyzer.java | 42 +-- .../plan/analyze/ExpressionUtils.java | 60 ++-- .../plan/analyze/GroupByLevelHelper.java | 2 +- .../plan/analyze/PredicateUtils.java | 38 +-- .../plan/analyze/SelectIntoUtils.java | 4 +- .../analyze/TemplatedAggregationAnalyze.java | 12 +- .../plan/analyze/TemplatedAnalyze.java | 8 +- .../plan/analyze/TemplatedInfo.java | 8 +- .../plan/analyze/TypeProvider.java | 4 +- .../config/TableConfigTaskVisitor.java | 2 +- .../executor/ClusterConfigTaskExecutor.java | 4 +- ...ableModelStatementMemorySourceVisitor.java | 2 +- .../expression/expression/Expression.java | 66 ++--- .../expression/ExpressionFactory.java | 44 +-- .../expression/expression/ExpressionType.java | 2 +- .../UnknownExpressionTypeException.java | 2 +- .../expression/binary/AdditionExpression.java | 8 +- .../binary/ArithmeticBinaryExpression.java | 6 +- .../expression/binary/BinaryExpression.java | 16 +- .../binary/CompareBinaryExpression.java | 16 +- .../expression/binary/DivisionExpression.java | 8 +- .../expression/binary/EqualToExpression.java | 8 +- .../binary/GreaterEqualExpression.java | 8 +- .../binary/GreaterThanExpression.java | 8 +- .../binary/LessEqualExpression.java | 8 +- .../expression/binary/LessThanExpression.java | 8 +- .../expression/binary/LogicAndExpression.java | 8 +- .../binary/LogicBinaryExpression.java | 6 +- .../expression/binary/LogicOrExpression.java | 8 +- .../expression/binary/ModuloExpression.java | 8 +- .../binary/MultiplicationExpression.java | 8 +- .../expression/binary/NonEqualExpression.java | 8 +- .../binary/SubtractionExpression.java | 8 +- .../expression/binary/WhenThenExpression.java | 8 +- .../expression/leaf/ConstantOperand.java | 10 +- .../expression/leaf/LeafOperand.java | 6 +- .../expression/leaf/NullOperand.java | 10 +- .../expression/leaf/TimeSeriesOperand.java | 12 +- .../expression/leaf/TimestampOperand.java | 10 +- .../expression/multi/FunctionExpression.java | 21 +- .../multi/builtin/BuiltInFunctionHelper.java | 2 +- .../builtin/BuiltInScalarFunctionHelper.java | 8 +- .../BuiltInScalarFunctionHelperFactory.java | 12 +- .../builtin/helper/CastFunctionHelper.java | 10 +- .../builtin/helper/DiffFunctionHelper.java | 10 +- .../builtin/helper/ReplaceFunctionHelper.java | 10 +- .../builtin/helper/RoundFunctionHelper.java | 10 +- .../helper/SubStringFunctionHelper.java | 8 +- .../other/CaseWhenThenExpression.java | 22 +- .../other/GroupByTimeExpression.java | 16 +- .../expression/ternary/BetweenExpression.java | 10 +- .../expression/ternary/TernaryExpression.java | 12 +- .../expression/unary/InExpression.java | 20 +- .../expression/unary/IsNullExpression.java | 10 +- .../expression/unary/LikeExpression.java | 10 +- .../expression/unary/LogicNotExpression.java | 18 +- .../expression/unary/NegationExpression.java | 18 +- .../expression/unary/RegularExpression.java | 10 +- .../expression/unary/UnaryExpression.java | 12 +- .../BindTypeForTimeSeriesOperandVisitor.java | 8 +- .../CollectAggregationExpressionsVisitor.java | 8 +- .../CollectSourceExpressionsVisitor.java | 10 +- .../expression/visitor/CollectVisitor.java | 12 +- .../visitor/ColumnTransformerVisitor.java | 100 +++---- .../CompleteMeasurementSchemaVisitor.java | 14 +- .../visitor/ConcatDeviceVisitor.java | 6 +- .../CountTimeAggregationAmountVisitor.java | 8 +- .../visitor/ExistUnknownTypeInExpression.java | 10 +- .../visitor/ExpressionAnalyzeVisitor.java | 4 +- .../visitor/ExpressionNormalizeVisitor.java | 8 +- .../expression/visitor/ExpressionVisitor.java | 76 ++--- .../GetMeasurementExpressionVisitor.java | 6 +- .../visitor/IntermediateLayerVisitor.java | 38 +-- .../visitor/LowercaseNormalizeVisitor.java | 6 +- .../visitor/ReconstructVisitor.java | 16 +- .../visitor/RemoveRootPrefixVisitor.java | 6 +- .../visitor/ReplaceLogicalViewVisitor.java | 14 +- .../ReplaceRawPathWithGroupedPathVisitor.java | 10 +- .../ReplaceSubTreeWithViewVisitor.java | 6 +- ...catRemoveUnExistentMeasurementVisitor.java | 8 +- .../TransformToViewExpressionVisitor.java | 56 ++-- .../BindSchemaForExpressionVisitor.java | 14 +- .../BindSchemaForPredicateVisitor.java | 20 +- .../cartesian/CartesianProductVisitor.java | 16 +- ...viceAndBindSchemaForExpressionVisitor.java | 14 +- ...atDeviceAndBindSchemaForHavingVisitor.java | 8 +- ...eviceAndBindSchemaForPredicateVisitor.java | 16 +- ...oncatExpressionWithSuffixPathsVisitor.java | 12 +- .../cartesian/QueryContextProvider.java | 2 +- .../visitor/logical/LogicalAndVisitor.java | 16 +- .../visitor/logical/LogicalOrVisitor.java | 16 +- .../PredicateCanPushDownToSourceChecker.java | 6 +- .../logical/TimeFilterExistChecker.java | 6 +- .../ConvertPredicateToFilterVisitor.java | 44 +-- .../ConvertPredicateToTimeFilterVisitor.java | 44 +-- .../PredicatePushIntoScanChecker.java | 40 +-- .../predicate/PredicateSimplifier.java | 48 ++-- .../visitor/predicate/PredicateVisitor.java | 38 +-- .../predicate/ReversePredicateVisitor.java | 39 +-- .../optimization/AggregationPushDown.java | 8 +- .../optimization/LimitOffsetPushDown.java | 2 +- .../plan/optimization/PredicatePushDown.java | 4 +- .../queryengine/plan/parser/ASTVisitor.java | 74 ++--- .../plan/parser/StatementGenerator.java | 14 +- .../DataNodeTableOperatorGenerator.java | 6 +- .../plan/planner/LogicalPlanBuilder.java | 8 +- .../plan/planner/LogicalPlanVisitor.java | 4 +- .../plan/planner/OperatorTreeGenerator.java | 22 +- .../plan/planner/TemplatedLogicalPlan.java | 8 +- .../planner/TemplatedLogicalPlanBuilder.java | 2 +- .../distribution/DistributionPlanContext.java | 2 +- .../SimpleFragmentParallelPlanner.java | 2 +- .../planner/distribution/SourceRewriter.java | 10 +- .../plan/planner/plan/TimePredicate.java | 2 +- .../planner/plan/TreeModelTimePredicate.java | 2 +- .../planner/plan/node/PlanGraphPrinter.java | 4 +- .../process/AggregationMergeSortNode.java | 2 +- .../plan/node/process/AggregationNode.java | 2 +- .../planner/plan/node/process/FilterNode.java | 2 +- .../node/process/RawDataAggregationNode.java | 2 +- .../plan/node/process/TransformNode.java | 2 +- .../AlignedSeriesAggregationScanNode.java | 4 +- .../node/source/AlignedSeriesScanNode.java | 4 +- .../plan/node/source/LastQueryScanNode.java | 2 +- .../node/source/LastSeriesSourceNode.java | 2 +- .../source/SeriesAggregationScanNode.java | 4 +- .../source/SeriesAggregationSourceNode.java | 2 +- .../plan/node/source/SeriesScanNode.java | 4 +- .../node/source/SeriesScanSourceNode.java | 2 +- .../plan/node/source/SeriesSourceNode.java | 2 +- .../plan/node/source/ShowDiskUsageNode.java | 2 +- .../plan/parameter/AggregationDescriptor.java | 2 +- .../CrossSeriesAggregationDescriptor.java | 2 +- .../parameter/GroupByConditionParameter.java | 2 +- .../planner/plan/parameter/OutputColumn.java | 2 + .../analyzer/AggregationAnalyzer.java | 19 +- .../plan/relational/analyzer/Analysis.java | 21 +- .../plan/relational/analyzer/Analyzer.java | 3 +- .../analyzer/CanonicalizationAware.java | 2 +- .../analyzer/ExpressionAnalysis.java | 7 +- .../analyzer/ExpressionAnalyzer.java | 29 +- .../analyzer/ExpressionTreeUtils.java | 6 +- .../plan/relational/analyzer/Field.java | 2 +- .../analyzer/PatternRecognitionAnalysis.java | 1 + .../analyzer/PatternRecognitionAnalyzer.java | 3 +- .../plan/relational/analyzer/RelationId.java | 1 + .../relational/analyzer/RelationType.java | 2 +- .../plan/relational/analyzer/Scope.java | 6 +- .../analyzer/ScopeReferenceExtractor.java | 1 + .../analyzer/StatementAnalyzer.java | 49 ++-- .../ConvertPredicateToFilterVisitor.java | 4 +- .../ConvertPredicateToTimeFilterVisitor.java | 2 +- .../PredicateCombineIntoTableScanChecker.java | 2 +- .../PredicatePushIntoMetadataChecker.java | 2 +- ...ConvertSchemaPredicateToFilterVisitor.java | 4 +- .../tablefunction/TableArgumentAnalysis.java | 4 +- .../relational/metadata/ColumnSchema.java | 2 +- .../plan/relational/metadata/Metadata.java | 2 +- .../relational/metadata/MetadataUtil.java | 2 +- .../metadata/OperatorNotFoundException.java | 2 +- .../metadata/TableMetadataImpl.java | 4 +- .../relational/planner/CteMaterializer.java | 2 +- .../planner/IrExpressionInterpreter.java | 10 +- .../relational/planner/IrTypeAnalyzer.java | 6 +- .../planner/OrderingTranslator.java | 3 +- .../relational/planner/PredicateUtils.java | 4 +- .../plan/relational/planner/QueryPlanner.java | 11 +- .../relational/planner/RelationPlanner.java | 19 +- .../plan/relational/planner/ScopeAware.java | 2 +- .../relational/planner/SubqueryPlanner.java | 14 +- .../relational/planner/SymbolAllocator.java | 2 +- .../relational/planner/SymbolsExtractor.java | 10 +- .../relational/planner/TableModelPlanner.java | 4 +- .../relational/planner/TranslationMap.java | 12 +- .../TableDistributedPlanGenerator.java | 2 +- .../planner/ir/DefaultTraversalVisitor.java | 2 +- .../planner/ir/ExpressionRewriter.java | 18 +- .../planner/ir/ExpressionTreeRewriter.java | 24 +- .../GapFillStartAndEndTimeExtractVisitor.java | 2 +- .../ir/GlobalTimePredicateExtractVisitor.java | 2 +- .../plan/relational/planner/ir/IrUtils.java | 4 +- .../ir/NormalizeOrExpressionRewriter.java | 2 +- ...correlatedScalarSubqueryReconstructor.java | 6 +- .../rule/CanonicalizeExpressionRewriter.java | 2 +- .../iterative/rule/ImplementExceptAll.java | 2 +- .../iterative/rule/ImplementIntersectAll.java | 2 +- .../rule/ImplementPatternRecognition.java | 2 +- .../rule/ImplementTableFunctionSource.java | 4 +- .../rule/PruneCorrelatedJoinColumns.java | 2 +- .../rule/PruneCorrelatedJoinCorrelation.java | 2 +- .../PrunePatternRecognitionSourceColumns.java | 2 +- .../PushDownNegationsExpressionRewriter.java | 2 +- .../RemoveUnreferencedScalarSubqueries.java | 2 +- .../rule/SetOperationNodeTranslator.java | 2 +- .../iterative/rule/SimplifyExpressions.java | 2 +- ...atedDistinctAggregationWithProjection.java | 2 +- ...dDistinctAggregationWithoutProjection.java | 2 +- ...elatedGlobalAggregationWithProjection.java | 2 +- ...tedGlobalAggregationWithoutProjection.java | 2 +- ...latedGroupedAggregationWithProjection.java | 2 +- ...edGroupedAggregationWithoutProjection.java | 2 +- .../rule/TransformCorrelatedJoinToJoin.java | 2 +- .../TransformCorrelatedScalarSubquery.java | 8 +- .../TransformExistsApplyToCorrelatedJoin.java | 2 +- .../TransformUncorrelatedSubqueryToJoin.java | 2 +- .../relational/planner/node/CteScanNode.java | 2 +- .../relational/planner/node/Patterns.java | 2 + .../CheckSubqueryNodesAreRewritten.java | 2 +- .../optimizations/ParallelizeGrouping.java | 2 +- .../PushPredicateIntoTableScan.java | 10 +- .../planner/optimizations/SymbolMapper.java | 2 +- ...tifiedComparisonApplyToCorrelatedJoin.java | 4 +- .../UnaliasSymbolReferences.java | 2 +- .../rowpattern/RowPatternToIrRewriter.java | 12 +- .../relational/sql/ParameterExtractor.java | 4 +- .../sql/ast/AbstractQueryDeviceWithCache.java | 1 + .../sql/ast/AbstractTraverseDevice.java | 1 + .../plan/relational/sql/ast/AddColumn.java | 2 + .../relational/sql/ast/AliasedRelation.java | 2 + .../sql/ast/AlterColumnDataType.java | 3 + .../plan/relational/sql/ast/AlterPipe.java | 1 + .../relational/sql/ast/AnchorPattern.java | 1 + .../plan/relational/sql/ast/AsofJoinOn.java | 1 + .../plan/relational/sql/ast/AstVisitor.java | 97 ------- .../plan/relational/sql/ast/ClearCache.java | 1 + .../relational/sql/ast/ColumnDefinition.java | 2 + .../plan/relational/sql/ast/CopyTo.java | 1 + .../relational/sql/ast/CountStatement.java | 1 + .../sql/ast/CreateExternalService.java | 1 + .../relational/sql/ast/CreateFunction.java | 1 + .../plan/relational/sql/ast/CreateIndex.java | 3 + .../plan/relational/sql/ast/CreateModel.java | 1 + .../sql/ast/CreateOrUpdateDevice.java | 1 + .../plan/relational/sql/ast/CreatePipe.java | 1 + .../relational/sql/ast/CreatePipePlugin.java | 1 + .../plan/relational/sql/ast/CreateTable.java | 2 + .../plan/relational/sql/ast/CreateTopic.java | 1 + .../relational/sql/ast/CreateTraining.java | 1 + .../plan/relational/sql/ast/CreateView.java | 3 +- .../relational/sql/ast/DatabaseStatement.java | 1 + .../plan/relational/sql/ast/Deallocate.java | 2 + .../DefaultExpressionTraversalVisitor.java | 2 + .../sql/ast/DefaultTraversalVisitor.java | 14 + .../plan/relational/sql/ast/Delete.java | 1 + .../plan/relational/sql/ast/DeleteDevice.java | 6 +- .../relational/sql/ast/DescribeTable.java | 2 + .../plan/relational/sql/ast/DropColumn.java | 3 + .../plan/relational/sql/ast/DropDB.java | 2 + .../sql/ast/DropExternalService.java | 1 + .../plan/relational/sql/ast/DropFunction.java | 1 + .../plan/relational/sql/ast/DropIndex.java | 3 + .../plan/relational/sql/ast/DropModel.java | 1 + .../plan/relational/sql/ast/DropPipe.java | 1 + .../relational/sql/ast/DropPipePlugin.java | 1 + .../relational/sql/ast/DropSubscription.java | 1 + .../plan/relational/sql/ast/DropTable.java | 2 + .../plan/relational/sql/ast/DropTopic.java | 1 + .../plan/relational/sql/ast/EmptyPattern.java | 1 + .../plan/relational/sql/ast/Except.java | 1 + .../relational/sql/ast/ExcludedPattern.java | 1 + .../plan/relational/sql/ast/Execute.java | 2 + .../relational/sql/ast/ExecuteImmediate.java | 1 + .../plan/relational/sql/ast/Explain.java | 1 + .../relational/sql/ast/ExplainAnalyze.java | 1 + .../plan/relational/sql/ast/ExtendRegion.java | 1 + .../plan/relational/sql/ast/FetchDevice.java | 1 + .../plan/relational/sql/ast/Fill.java | 1 + .../plan/relational/sql/ast/Insert.java | 3 + .../plan/relational/sql/ast/Intersect.java | 1 + .../plan/relational/sql/ast/Join.java | 1 + .../plan/relational/sql/ast/JoinOn.java | 1 + .../plan/relational/sql/ast/JoinUsing.java | 2 + .../plan/relational/sql/ast/KillQuery.java | 1 + .../plan/relational/sql/ast/Limit.java | 3 + .../plan/relational/sql/ast/LoadModel.java | 1 + .../plan/relational/sql/ast/LoadTsFile.java | 1 + .../relational/sql/ast/MeasureDefinition.java | 2 + .../relational/sql/ast/MigrateRegion.java | 1 + .../plan/relational/sql/ast/Offset.java | 2 + .../sql/ast/OneOrMoreQuantifier.java | 1 + .../sql/ast/PatternAlternation.java | 1 + .../sql/ast/PatternConcatenation.java | 1 + .../sql/ast/PatternPermutation.java | 1 + .../sql/ast/PatternRecognitionRelation.java | 2 + .../relational/sql/ast/PatternVariable.java | 2 + .../plan/relational/sql/ast/PipeEnriched.java | 1 + .../plan/relational/sql/ast/Prepare.java | 2 + .../relational/sql/ast/ProcessingMode.java | 1 + .../plan/relational/sql/ast/Property.java | 2 + .../relational/sql/ast/QuantifiedPattern.java | 1 + .../plan/relational/sql/ast/Query.java | 2 + .../sql/ast/QuerySpecification.java | 3 + .../relational/sql/ast/RangeQuantifier.java | 1 + .../relational/sql/ast/ReconstructRegion.java | 1 + .../sql/ast/RelationalAuthorStatement.java | 1 + .../plan/relational/sql/ast/RemoveAINode.java | 1 + .../relational/sql/ast/RemoveConfigNode.java | 1 + .../relational/sql/ast/RemoveDataNode.java | 1 + .../plan/relational/sql/ast/RemoveRegion.java | 1 + .../plan/relational/sql/ast/RenameColumn.java | 3 + .../plan/relational/sql/ast/RenameTable.java | 3 + .../plan/relational/sql/ast/Select.java | 2 + .../relational/sql/ast/SetColumnComment.java | 3 + .../relational/sql/ast/SetProperties.java | 2 + .../relational/sql/ast/SetSqlDialect.java | 1 + .../relational/sql/ast/SetTableComment.java | 2 + .../relational/sql/ast/ShowAIDevices.java | 1 + .../plan/relational/sql/ast/ShowAINodes.java | 1 + .../relational/sql/ast/ShowAvailableUrls.java | 1 + .../plan/relational/sql/ast/ShowCluster.java | 1 + .../relational/sql/ast/ShowClusterId.java | 1 + .../relational/sql/ast/ShowConfigNodes.java | 1 + .../sql/ast/ShowCurrentDatabase.java | 1 + .../sql/ast/ShowCurrentSqlDialect.java | 1 + .../sql/ast/ShowCurrentTimestamp.java | 1 + .../relational/sql/ast/ShowCurrentUser.java | 1 + .../plan/relational/sql/ast/ShowDB.java | 1 + .../relational/sql/ast/ShowDataNodes.java | 1 + .../plan/relational/sql/ast/ShowDevice.java | 1 + .../sql/ast/ShowExternalService.java | 1 + .../relational/sql/ast/ShowFunctions.java | 1 + .../plan/relational/sql/ast/ShowIndex.java | 2 + .../relational/sql/ast/ShowLoadedModels.java | 1 + .../plan/relational/sql/ast/ShowModels.java | 1 + .../relational/sql/ast/ShowPipePlugins.java | 1 + .../plan/relational/sql/ast/ShowPipes.java | 1 + .../sql/ast/ShowQueriesStatement.java | 1 + .../plan/relational/sql/ast/ShowRegions.java | 1 + .../relational/sql/ast/ShowStatement.java | 2 + .../relational/sql/ast/ShowSubscriptions.java | 1 + .../plan/relational/sql/ast/ShowTables.java | 2 + .../plan/relational/sql/ast/ShowTopics.java | 1 + .../relational/sql/ast/ShowVariables.java | 1 + .../plan/relational/sql/ast/ShowVersion.java | 1 + .../plan/relational/sql/ast/SingleColumn.java | 3 + .../plan/relational/sql/ast/SkipTo.java | 2 + .../sql/ast/StartExternalService.java | 1 + .../plan/relational/sql/ast/StartPipe.java | 1 + .../sql/ast/StopExternalService.java | 1 + .../plan/relational/sql/ast/StopPipe.java | 1 + .../relational/sql/ast/SubsetDefinition.java | 2 + .../plan/relational/sql/ast/Table.java | 2 + .../sql/ast/TableFunctionArgument.java | 2 + .../sql/ast/TableFunctionInvocation.java | 2 + .../sql/ast/TableFunctionTableArgument.java | 4 +- .../relational/sql/ast/TableSubquery.java | 1 + .../plan/relational/sql/ast/TimeRange.java | 1 + .../plan/relational/sql/ast/Union.java | 1 + .../plan/relational/sql/ast/UnloadModel.java | 1 + .../plan/relational/sql/ast/Update.java | 1 + .../relational/sql/ast/UpdateAssignment.java | 1 + .../plan/relational/sql/ast/Use.java | 2 + .../plan/relational/sql/ast/Values.java | 1 + .../sql/ast/VariableDefinition.java | 2 + .../sql/ast/ViewFieldDefinition.java | 1 + .../relational/sql/ast/WindowDefinition.java | 3 + .../plan/relational/sql/ast/With.java | 1 + .../plan/relational/sql/ast/WithQuery.java | 2 + .../sql/ast/ZeroOrMoreQuantifier.java | 1 + .../sql/ast/ZeroOrOneQuantifier.java | 1 + .../relational/sql/parser/AstBuilder.java | 58 ++-- .../relational/sql/rewrite/ShowRewrite.java | 10 +- .../sql/rewrite/StatementRewrite.java | 4 +- .../plan/relational/sql/util/AstUtil.java | 2 +- .../plan/relational/sql/util/QueryUtil.java | 16 +- .../sql/util/ReservedIdentifiers.java | 2 +- .../sql/util/RowPatternFormatter.java | 1 + .../relational/sql/util/SqlFormatter.java | 15 +- .../relational/type/NamedTypeSignature.java | 2 + .../plan/relational/type/TypeCoercion.java | 2 + .../plan/relational/type/TypeManager.java | 2 + .../type/TypeNotFoundException.java | 1 + .../type/TypeSignatureParameter.java | 2 + .../plan/relational/utils/NodeUtils.java | 4 +- .../statement/component/GroupByComponent.java | 2 +- .../component/GroupByConditionComponent.java | 2 +- .../statement/component/HavingCondition.java | 2 +- .../statement/component/IntoComponent.java | 2 +- .../statement/component/OrderByComponent.java | 2 +- .../statement/component/ResultColumn.java | 2 +- .../statement/component/SelectComponent.java | 2 +- .../plan/statement/component/SortItem.java | 2 +- .../statement/component/WhereCondition.java | 2 +- .../statement/crud/InsertBaseStatement.java | 2 +- .../plan/statement/crud/QueryStatement.java | 8 +- .../view/AlterLogicalViewStatement.java | 2 +- .../view/CreateLogicalViewStatement.java | 4 +- .../dag/builder/EvaluationDAGBuilder.java | 10 +- .../factory/HmacStrategiesFactory.java | 4 +- ...AbstractCaseWhenThenColumnTransformer.java | 2 +- .../dag}/dag/column/column/ColumnCache.java | 2 +- .../dag/column/column/ColumnTransformer.java | 4 +- .../column/FailFunctionColumnTransformer.java | 2 +- .../TableCaseWhenThenColumnTransformer.java | 2 +- .../TreeCaseWhenThenColumnTransformer.java | 2 +- .../ArithmeticAdditionColumnTransformer.java | 4 +- .../ArithmeticBinaryColumnTransformer.java | 4 +- .../ArithmeticDivisionColumnTransformer.java | 4 +- .../ArithmeticModuloColumnTransformer.java | 4 +- ...hmeticMultiplicationColumnTransformer.java | 4 +- ...rithmeticSubtractionColumnTransformer.java | 4 +- .../binary/BinaryColumnTransformer.java | 4 +- .../CompareBinaryColumnTransformer.java | 4 +- .../CompareEqualToColumnTransformer.java | 4 +- .../CompareGreaterEqualColumnTransformer.java | 4 +- .../CompareGreaterThanColumnTransformer.java | 4 +- .../CompareLessEqualColumnTransformer.java | 4 +- .../CompareLessThanColumnTransformer.java | 4 +- .../CompareNonEqualColumnTransformer.java | 4 +- .../column/binary/HmacColumnTransformer.java | 8 +- .../column/binary/Like2ColumnTransformer.java | 4 +- .../binary/LogicAndColumnTransformer.java | 4 +- .../binary/LogicBinaryColumnTransformer.java | 4 +- .../binary/LogicOrColumnTransformer.java | 4 +- .../binary/strategies/HmacStrategy.java | 2 +- .../leaf/ConstantColumnTransformer.java | 2 +- .../leaf/IdentityColumnTransformer.java | 2 +- .../column/leaf/LeafColumnTransformer.java | 4 +- .../column/leaf/NullColumnTransformer.java | 2 +- .../column/leaf/TimeColumnTransformer.java | 2 +- ...bstractGreatestLeastColumnTransformer.java | 4 +- .../BinaryGreatestColumnTransformer.java | 4 +- .../multi/BinaryLeastColumnTransformer.java | 4 +- .../BooleanGreatestColumnTransformer.java | 4 +- .../multi/BooleanLeastColumnTransformer.java | 4 +- .../multi/CoalesceColumnTransformer.java | 4 +- .../DoubleGreatestColumnTransformer.java | 4 +- .../multi/DoubleLeastColumnTransformer.java | 4 +- .../multi/FloatGreatestColumnTransformer.java | 4 +- .../multi/FloatLeastColumnTransformer.java | 4 +- .../multi/InBinaryMultiColumnTransformer.java | 4 +- .../InBooleanMultiColumnTransformer.java | 4 +- .../multi/InDoubleMultiColumnTransformer.java | 4 +- .../multi/InFloatMultiColumnTransformer.java | 4 +- .../multi/InInt32MultiColumnTransformer.java | 4 +- .../multi/InInt64MultiColumnTransformer.java | 4 +- .../multi/InMultiColumnTransformer.java | 4 +- .../multi/Int32GreatestColumnTransformer.java | 4 +- .../multi/Int32LeastColumnTransformer.java | 4 +- .../multi/Int64GreatestColumnTransformer.java | 4 +- .../multi/Int64LeastColumnTransformer.java | 4 +- .../LogicalAndMultiColumnTransformer.java | 4 +- .../multi/LogicalMultiColumnTransformer.java | 4 +- .../LogicalOrMultiColumnTransformer.java | 4 +- .../multi/MappableUDFColumnTransformer.java | 4 +- .../column/multi/MultiColumnTransformer.java | 4 +- .../ternary/BetweenColumnTransformer.java | 4 +- .../CompareTernaryColumnTransformer.java | 4 +- .../ternary/Like3ColumnTransformer.java | 6 +- .../column/ternary/LpadColumnTransformer.java | 6 +- .../column/ternary/RpadColumnTransformer.java | 6 +- .../ternary/TernaryColumnTransformer.java | 4 +- .../ternary/utils/BytePaddingUtils.java | 2 +- .../UserDefineScalarFunctionTransformer.java | 6 +- .../ArithmeticNegationColumnTransformer.java | 4 +- .../column/unary/InColumnTransformer.java | 4 +- .../column/unary/IsNullColumnTransformer.java | 4 +- .../column/unary/LikeColumnTransformer.java | 4 +- .../unary/LogicNotColumnTransformer.java | 4 +- .../unary/RegularColumnTransformer.java | 4 +- .../column/unary/UnaryColumnTransformer.java | 4 +- .../unary/scalar/AbsColumnTransformer.java | 6 +- .../AbstractBitwise2ColumnTransformer.java | 6 +- .../AbstractBitwiseColumnTransformer.java | 6 +- ...AbstractCastFunctionColumnTransformer.java | 10 +- .../AbstractLengthColumnTransformer.java | 6 +- .../unary/scalar/AcosColumnTransformer.java | 6 +- .../unary/scalar/AsinColumnTransformer.java | 6 +- .../unary/scalar/AtanColumnTransformer.java | 6 +- .../scalar/BitCount2ColumnTransformer.java | 8 +- .../scalar/BitCountColumnTransformer.java | 8 +- .../scalar/BitwiseAnd2ColumnTransformer.java | 6 +- .../scalar/BitwiseAndColumnTransformer.java | 6 +- .../BitwiseLeftShift2ColumnTransformer.java | 6 +- .../BitwiseLeftShiftColumnTransformer.java | 6 +- .../scalar/BitwiseNotColumnTransformer.java | 8 +- .../scalar/BitwiseOr2ColumnTransformer.java | 6 +- .../scalar/BitwiseOrColumnTransformer.java | 6 +- .../BitwiseRightShift2ColumnTransformer.java | 6 +- ...ightShiftArithmetic2ColumnTransformer.java | 6 +- ...RightShiftArithmeticColumnTransformer.java | 6 +- .../BitwiseRightShiftColumnTransformer.java | 6 +- .../scalar/BitwiseXor2ColumnTransformer.java | 6 +- .../scalar/BitwiseXorColumnTransformer.java | 6 +- .../scalar/BlobLengthColumnTransformer.java | 4 +- .../BytesToDoubleColumnTransformer.java | 10 +- .../scalar/BytesToFloatColumnTransformer.java | 10 +- .../scalar/BytesToIntColumnTransformer.java | 10 +- .../scalar/BytesToLongColumnTransformer.java | 10 +- .../column/unary/scalar/CRC32Transformer.java | 6 +- .../scalar/CastFunctionColumnTransformer.java | 4 +- .../unary/scalar/CeilColumnTransformer.java | 6 +- .../scalar/Concat2ColumnTransformer.java | 8 +- .../unary/scalar/ConcatColumnTransformer.java | 6 +- .../scalar/ConcatMultiColumnTransformer.java | 6 +- .../unary/scalar/CosColumnTransformer.java | 6 +- .../unary/scalar/CoshColumnTransformer.java | 6 +- .../DateBinFunctionColumnTransformer.java | 6 +- .../scalar/DegreesColumnTransformer.java | 6 +- .../unary/scalar/DiffColumnTransformer.java | 6 +- .../scalar/DiffFunctionColumnTransformer.java | 6 +- .../DoubleToBytesColumnTransformer.java | 8 +- .../scalar/EndsWith2ColumnTransformer.java | 8 +- .../scalar/EndsWithColumnTransformer.java | 8 +- .../unary/scalar/ExpColumnTransformer.java | 6 +- .../unary/scalar/ExtractTransformer.java | 6 +- .../scalar/FloatToBytesColumnTransformer.java | 8 +- .../unary/scalar/FloorColumnTransformer.java | 6 +- .../unary/scalar/FormatColumnTransformer.java | 6 +- .../scalar/GenericCodecColumnTransformer.java | 10 +- .../HmacConstantKeyColumnTransformer.java | 8 +- .../scalar/IntToBytesColumnTransformer.java | 8 +- .../unary/scalar/LTrim2ColumnTransformer.java | 8 +- .../unary/scalar/LTrimColumnTransformer.java | 8 +- .../unary/scalar/LengthColumnTransformer.java | 4 +- .../unary/scalar/LnColumnTransformer.java | 6 +- .../unary/scalar/Log10ColumnTransformer.java | 6 +- .../scalar/LongToBytesColumnTransformer.java | 8 +- .../unary/scalar/LowerColumnTransformer.java | 6 +- .../scalar/ObjectLengthColumnTransformer.java | 4 +- .../unary/scalar/RTrim2ColumnTransformer.java | 8 +- .../unary/scalar/RTrimColumnTransformer.java | 8 +- .../scalar/RadiansColumnTransformer.java | 6 +- .../scalar/RegexpLike2ColumnTransformer.java | 6 +- .../scalar/RegexpLikeColumnTransformer.java | 6 +- .../scalar/Replace2ColumnTransformer.java | 6 +- .../scalar/Replace3ColumnTransformer.java | 6 +- .../ReplaceFunctionColumnTransformer.java | 6 +- .../unary/scalar/RoundColumnTransformer.java | 6 +- .../RoundFunctionColumnTransformer.java | 6 +- .../unary/scalar/SignColumnTransformer.java | 6 +- .../unary/scalar/SinColumnTransformer.java | 6 +- .../unary/scalar/SinhColumnTransformer.java | 6 +- .../unary/scalar/SqrtColumnTransformer.java | 6 +- .../scalar/StartsWith2ColumnTransformer.java | 8 +- .../scalar/StartsWithColumnTransformer.java | 6 +- .../scalar/Strcmp2ColumnTransformer.java | 6 +- .../unary/scalar/StrcmpColumnTransformer.java | 6 +- .../scalar/Strpos2ColumnTransformer.java | 6 +- .../unary/scalar/StrposColumnTransformer.java | 6 +- .../scalar/SubString2ColumnTransformer.java | 6 +- .../scalar/SubString3ColumnTransformer.java | 8 +- .../scalar/SubStringColumnTransformer.java | 6 +- .../unary/scalar/TanColumnTransformer.java | 6 +- .../unary/scalar/TanhColumnTransformer.java | 6 +- .../unary/scalar/Trim2ColumnTransformer.java | 8 +- .../unary/scalar/TrimColumnTransformer.java | 6 +- .../TryCastFunctionColumnTransformer.java | 4 +- .../unary/scalar/UpperColumnTransformer.java | 6 +- .../factory/CodecStrategiesFactory.java | 8 +- .../NumericCodecStrategiesFactory.java | 2 +- .../unary/scalar/inteface/CodecStrategy.java | 2 +- .../column/unary/scalar/util/HexUtils.java | 2 +- .../unary/scalar/util/SpookyHashV2Utils.java | 2 +- .../scalar/util/TransformerDebugUtils.java | 2 +- .../{ => dag}/memory/LayerMemoryAssigner.java | 8 +- .../dag/{ => dag}/util/BitwiseUtils.java | 2 +- .../dag/input/ConstantInputReader.java | 2 +- .../ConstantIntermediateLayer.java | 2 +- .../dag/intermediate/IntermediateLayer.java | 2 +- .../dag/intermediate/MultiInputLayer.java | 2 +- .../SingleInputMultiReferenceLayer.java | 2 +- .../SingleInputSingleReferenceLayer.java | 2 +- .../unary/scalar/CastFunctionTransformer.java | 2 +- .../SubStringFunctionColumnTransformer.java | 4 +- .../scalar/SubStringFunctionTransformer.java | 2 +- .../transformation/dag/udf/UDTFContext.java | 4 +- .../dag/util/TransformUtils.java | 2 +- .../impl/SchemaRegionMemoryImpl.java | 6 +- .../impl/TimeseriesReaderWithViewFetch.java | 6 +- .../schemaregion/view/ViewPaths.java | 6 +- .../visitor/TransformToExpressionVisitor.java | 52 ++-- .../modification/TableDeletionEntry.java | 2 +- .../modification/TreeDeletionEntry.java | 2 +- .../iotdb/db/utils/TypeInferenceUtils.java | 14 +- .../common/schematree/NodeRefTest.java | 6 +- .../queryengine/execution/DataDriverTest.java | 2 +- .../operator/AggregationOperatorTest.java | 2 +- ...gnedSeriesAggregationScanOperatorTest.java | 2 +- .../AlignedSeriesScanOperatorTest.java | 2 +- .../operator/DeviceViewIntoOperatorTest.java | 2 +- .../execution/operator/LimitOperatorTest.java | 2 +- .../operator/MergeTreeSortOperatorTest.java | 2 +- .../operator/MultiColumnMergerTest.java | 2 +- .../NonOverlappedMultiColumnMergerTest.java | 2 +- .../operator/OffsetOperatorTest.java | 2 +- .../operator/OperatorMemoryTest.java | 12 +- .../RawDataAggregationOperatorTest.java | 2 +- .../operator/SingleColumnMergerTest.java | 2 +- .../SingleDeviceViewOperatorTest.java | 2 +- .../SlidingWindowAggregationOperatorTest.java | 2 +- .../operator/TransformOperatorTest.java | 8 +- .../operator/TreeIntoOperatorTest.java | 2 +- .../operator/TreeSortOperatorTest.java | 2 +- .../operator/TreeTopKOperatorTest.java | 2 +- .../process/TableStreamSortOperatorTest.java | 2 +- .../gapfill/GapFillWGroupWMoOperatorTest.java | 2 +- .../GapFillWGroupWoMoOperatorTest.java | 2 +- .../join/InnerTimeJoinOperatorTest.java | 2 +- .../window/TopKRankingOperatorTest.java | 2 +- .../AggregationWindowFunctionTest.java | 2 +- .../partition/frame/RangeFrameTest.java | 2 +- .../ConvertPredicateToTimeFilterTest.java | 34 +-- .../predicate/PredicatePushIntoScanTest.java | 36 +-- .../predicate/PredicateRemoveNotTest.java | 30 +- .../predicate/PredicateUtilsTest.java | 10 +- .../TreePredicateConversionTest.java | 18 +- .../serde/CaseWhenThenExpressionTest.java | 18 +- .../analyze/AggregationDescriptorTest.java | 2 +- .../plan/analyze/AnalyzeFailTest.java | 2 +- .../queryengine/plan/analyze/AnalyzeTest.java | 44 +-- .../plan/analyze/ExpressionAnalyzerTest.java | 14 +- .../optimization/AggregationPushDownTest.java | 8 +- .../ColumnInjectionPushDownTest.java | 2 +- .../optimization/LimitOffsetPushDownTest.java | 12 +- .../optimization/OptimizationTestUtil.java | 2 +- .../optimization/PredicatePushDownTest.java | 14 +- .../plan/optimization/TestPlanBuilder.java | 2 +- .../plan/parser/StatementGeneratorTest.java | 14 +- .../plan/planner/ExpressionTest.java | 8 +- .../planner/FragmentInstanceSerdeTest.java | 2 +- .../plan/planner/PipelineBuilderTest.java | 2 +- .../AggregationDistributionTest.java | 4 +- .../plan/planner/distribution/Util.java | 4 +- .../logical/DataQueryLogicalPlannerTest.java | 10 +- .../SchemaQueryLogicalPlannerTest.java | 4 +- .../process/AggregationNodeSerdeTest.java | 6 +- .../node/process/FilterNodeSerdeTest.java | 8 +- .../process/GroupByLevelNodeSerdeTest.java | 8 +- .../node/process/GroupByTagNodeSerdeTest.java | 10 +- .../node/process/WindowNodeSerdeTest.java | 4 +- .../SeriesAggregationScanNodeSerdeTest.java | 8 +- .../analyzer/AggregationCornerCaseTest.java | 4 +- .../relational/analyzer/AggregationTest.java | 2 +- .../relational/analyzer/AsofJoinTest.java | 6 +- .../relational/analyzer/TSBSMetadata.java | 2 +- .../plan/relational/analyzer/TSBSTest.java | 2 +- .../analyzer/TableFunctionTest.java | 8 +- .../relational/analyzer/TestMetadata.java | 2 +- .../planner/CteMaterializerTest.java | 4 +- .../plan/relational/planner/ExampleTest.java | 6 +- .../PatternRecognitionNodeSerdeTest.java | 9 +- .../AggregationFunctionProvider.java | 2 +- .../assertions/ExpressionVerifier.java | 6 +- .../planner/assertions/PlanMatchPattern.java | 20 +- .../assertions/SpecificationProvider.java | 2 +- ...AndCompareBinaryColumnTransformerTest.java | 24 +- .../LogicBinaryColumnTransformerTest.java | 8 +- .../hmac/HmacMd5ColumnTransformerTest.java | 10 +- .../hmac/HmacSha1ColumnTransformerTest.java | 10 +- .../hmac/HmacSha256ColumnTransformerTest.java | 10 +- .../hmac/HmacSha512ColumnTransformerTest.java | 10 +- .../ternary/LpadColumnTransformerTest.java | 4 +- .../ternary/RpadColumnTransformerTest.java | 4 +- .../unary/UnaryColumnTransformerTest.java | 16 +- .../BlobLengthColumnTransformerTest.java | 4 +- .../unary/scalar/DateBinFunctionTest.java | 2 +- .../FromBigEndian32ColumnTransformerTest.java | 6 +- .../FromBigEndian64ColumnTransformerTest.java | 6 +- ...E754_32BigEndianColumnTransformerTest.java | 6 +- ...E754_64BigEndianColumnTransformerTest.java | 6 +- ...omLittleEndian32ColumnTransformerTest.java | 6 +- ...omLittleEndian64ColumnTransformerTest.java | 6 +- .../ToBigEndian32ColumnTransformerTest.java | 6 +- .../ToBigEndian64ColumnTransformerTest.java | 6 +- ...E754_32BigEndianColumnTransformerTest.java | 6 +- ...E754_64BigEndianColumnTransformerTest.java | 6 +- ...ToLittleEndian32ColumnTransformerTest.java | 6 +- ...ToLittleEndian64ColumnTransformerTest.java | 6 +- .../scalar/ReverseColumnTransformerTest.java | 6 +- .../FromBase32ColumnTransformerTest.java | 6 +- .../FromBase64ColumnTransformerTest.java | 6 +- .../FromBase64UrlColumnTransformerTest.java | 6 +- .../ToBase32ColumnTransformerTest.java | 6 +- .../ToBase64ColumnTransformerTest.java | 6 +- .../ToBase64UrlColumnTransformerTest.java | 6 +- .../hashing/Crc32ColumnTransformerTest.java | 4 +- .../hashing/Md5ColumnTransformerTest.java | 6 +- .../hashing/Murmur3ColumnTransformerTest.java | 6 +- .../hashing/Sha1ColumnTransformerTest.java | 6 +- .../hashing/Sha256ColumnTransformerTest.java | 6 +- .../hashing/Sha512ColumnTransformerTest.java | 6 +- .../SpookyHashV2_32ColumnTransformerTest.java | 6 +- .../SpookyHashV2_64ColumnTransformerTest.java | 6 +- .../XxHash64ColumnTransformerTest.java | 6 +- .../FromHexColumnTransformerTest.java | 6 +- .../ToHexColumnTransformerTest.java | 6 +- .../dag/util/BitwiseUtilsTest.java | 17 +- 942 files changed, 2964 insertions(+), 2914 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/common/ConnectionInfo.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/common/NodeRef.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/execution/MemoryEstimationHelper.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/source/relational/aggregation/grouped => node_commons/execution/operator/source/relational/aggregation/grouped/hash}/hash/CombineHashFunction.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/source/relational/aggregation/grouped => node_commons/execution/operator/source/relational/aggregation/grouped/hash}/hash/FlatGroupByHash.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/source/relational/aggregation/grouped => node_commons/execution/operator/source/relational/aggregation/grouped/hash}/hash/FlatHash.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/source/relational/aggregation/grouped => node_commons/execution/operator/source/relational/aggregation/grouped/hash}/hash/FlatHashStrategy.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/source/relational/aggregation/grouped => node_commons/execution/operator/source/relational/aggregation/grouped/hash}/hash/GroupByHash.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/source/relational/aggregation/grouped => node_commons/execution/operator/source/relational/aggregation/grouped/hash}/hash/HashStrategy.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/source/relational/aggregation/grouped => node_commons/execution/operator/source/relational/aggregation/grouped/hash}/hash/MarkDistinctHash.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/source/relational/aggregation/grouped => node_commons/execution/operator/source/relational/aggregation/grouped/hash}/hash/NoChannelGroupByHash.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/source/relational/aggregation/grouped => node_commons/execution/operator/source/relational/aggregation/grouped/hash}/hash/VariableWidthData.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/source/relational/aggregation/grouped => node_commons/execution/operator/source/relational/aggregation/grouped/hash}/hash/XxHash64.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/{ => expression}/multi/FunctionType.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/planner/plan/parameter/InputLocation.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/analyzer/NodeRef.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/SortOrder.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/CorrelatedJoinNode.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/RowsPerMatch.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/planner/node/SkipToPosition.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/security/Identity.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/AllColumns.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/AllRows.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/AstMemoryEstimationHelper.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Columns.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/DataTypeParameter.java (74%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/DereferenceExpression.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/ExistsPredicate.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/FieldReference.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/GroupBy.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/GroupingElement.java (71%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/GroupingSets.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Identifier.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/InListExpression.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/NumericParameter.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/OrderBy.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Parameter.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/QualifiedName.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/QuantifiedComparisonExpression.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/SelectItem.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/SimpleGroupBy.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/SortItem.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/SubqueryExpression.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/TypeParameter.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/WhenClause.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Window.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/WindowReference.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/WindowSpecification.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/util/ExpressionFormatter.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/type/TypeSignature.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/utils/ResultColumnAppender.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/utils/TypeUtil.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/Expression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/ExpressionFactory.java (78%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/ExpressionType.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/UnknownExpressionTypeException.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/AdditionExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/ArithmeticBinaryExpression.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/BinaryExpression.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/CompareBinaryExpression.java (69%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/DivisionExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/EqualToExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/GreaterEqualExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/GreaterThanExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/LessEqualExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/LessThanExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/LogicAndExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/LogicBinaryExpression.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/LogicOrExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/ModuloExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/MultiplicationExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/NonEqualExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/SubtractionExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/binary/WhenThenExpression.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/leaf/ConstantOperand.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/leaf/LeafOperand.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/leaf/NullOperand.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/leaf/TimeSeriesOperand.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/leaf/TimestampOperand.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/multi/FunctionExpression.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/multi/builtin/BuiltInFunctionHelper.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java (69%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/multi/builtin/helper/CastFunctionHelper.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/multi/builtin/helper/DiffFunctionHelper.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/multi/builtin/helper/RoundFunctionHelper.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/other/CaseWhenThenExpression.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/other/GroupByTimeExpression.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/ternary/BetweenExpression.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/ternary/TernaryExpression.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/unary/InExpression.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/unary/IsNullExpression.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/unary/LikeExpression.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/unary/LogicNotExpression.java (72%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/unary/NegationExpression.java (75%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/unary/RegularExpression.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/unary/UnaryExpression.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/CollectAggregationExpressionsVisitor.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/CollectSourceExpressionsVisitor.java (75%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/CollectVisitor.java (77%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/ColumnTransformerVisitor.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/ConcatDeviceVisitor.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/CountTimeAggregationAmountVisitor.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/ExistUnknownTypeInExpression.java (78%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/ExpressionAnalyzeVisitor.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/ExpressionNormalizeVisitor.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/ExpressionVisitor.java (64%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/GetMeasurementExpressionVisitor.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/IntermediateLayerVisitor.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/LowercaseNormalizeVisitor.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/ReconstructVisitor.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/RemoveRootPrefixVisitor.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/ReplaceLogicalViewVisitor.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/TransformToViewExpressionVisitor.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/cartesian/CartesianProductVisitor.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/cartesian/QueryContextProvider.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/logical/LogicalAndVisitor.java (73%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/logical/LogicalOrVisitor.java (73%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/logical/TimeFilterExistChecker.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java (76%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/predicate/PredicateSimplifier.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/plan => queryengine/plan/expression}/expression/expression/visitor/predicate/PredicateVisitor.java (61%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons => queryengine}/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java (71%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons => queryengine}/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/binary/factory/factory/HmacStrategiesFactory.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/AbstractCaseWhenThenColumnTransformer.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/ColumnCache.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/ColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/FailFunctionColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/TableCaseWhenThenColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/TreeCaseWhenThenColumnTransformer.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/ArithmeticModuloColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/BinaryColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/CompareBinaryColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/CompareEqualToColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/CompareGreaterThanColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/CompareLessEqualColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/CompareLessThanColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/CompareNonEqualColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/HmacColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/Like2ColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/LogicAndColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/LogicBinaryColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/LogicOrColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/binary/strategies/HmacStrategy.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/leaf/ConstantColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/leaf/IdentityColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/leaf/LeafColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/leaf/NullColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/leaf/TimeColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/BinaryGreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/BinaryLeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/BooleanGreatestColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/BooleanLeastColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/CoalesceColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/DoubleGreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/DoubleLeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/FloatGreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/FloatLeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/InBinaryMultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/InBooleanMultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/InDoubleMultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/InFloatMultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/InInt32MultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/InInt64MultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/InMultiColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/Int32GreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/Int32LeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/Int64GreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/Int64LeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/LogicalAndMultiColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/LogicalMultiColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/LogicalOrMultiColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/MappableUDFColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/multi/MultiColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/ternary/BetweenColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/ternary/CompareTernaryColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/ternary/Like3ColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/ternary/LpadColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/ternary/RpadColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/ternary/TernaryColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/ternary/utils/BytePaddingUtils.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/udf/UserDefineScalarFunctionTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/ArithmeticNegationColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/InColumnTransformer.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/IsNullColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/LikeColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/LogicNotColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/RegularColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/UnaryColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/AbsColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/AcosColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/AsinColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/AtanColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitCountColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/CRC32Transformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/CeilColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/Concat2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/ConcatColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/CosColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/CoshColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/DegreesColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/DiffColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/EndsWithColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/ExpColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/ExtractTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/FloorColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/FormatColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/LTrimColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/LengthColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/LnColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/Log10ColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/LowerColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/RTrimColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/RadiansColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/Replace2ColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/Replace3ColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/RoundColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/SignColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/SinColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/SinhColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/SqrtColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/StartsWithColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/StrcmpColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/StrposColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/SubString2ColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/SubString3ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/SubStringColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/TanColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/TanhColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/Trim2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/TrimColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/UpperColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/inteface/CodecStrategy.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/util/HexUtils.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons/transformation => queryengine/transformation/dag}/dag/column/column/unary/scalar/util/TransformerDebugUtils.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{ => dag}/memory/LayerMemoryAssigner.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{ => dag}/util/BitwiseUtils.java (98%) diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl index 44846547b6b36..554a2c285ca90 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl @@ -31,7 +31,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; @@ -175,7 +175,7 @@ public class ${className} extends BinaryColumnTransformer { package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; @@ -293,7 +293,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl index 75881b32b2130..2f71280aef96a 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl @@ -28,7 +28,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.func import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.ModulusResolver; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.MultiplicationResolver; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.SubtractionResolver; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.DoubleNegationColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.FloatNegationColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.IntNegationColumnTransformer; diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl index 33ea08b242053..c893a601217bb 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl @@ -26,7 +26,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index d054095cf97c4..f02df34223e5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -25,10 +25,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; @@ -74,8 +76,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; @@ -153,7 +153,6 @@ import org.apache.iotdb.db.queryengine.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToBlobLiteralVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToBooleanLiteralVisitor; @@ -164,8 +163,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToInt64LiteralVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToStringLiteralVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToTimestampLiteralVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; @@ -210,6 +210,13 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.DEFAULT_GROUP_NUMBER; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch.ONE; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition.LAST; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; @@ -218,17 +225,10 @@ import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory.createAccumulator; import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory.createBuiltinAccumulator; import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.IDENTITY_FILL; import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.UNKNOWN_DATATYPE; import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.getLinearFill; import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.getPreviousFill; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.DESC_NULLS_LAST; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch.ONE; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition.LAST; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_AGGREGATION; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ConnectionInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/ConnectionInfo.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ConnectionInfo.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/ConnectionInfo.java index 3889e53318707..d5c2dd5106394 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ConnectionInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/ConnectionInfo.java @@ -17,12 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.common; - -import org.apache.iotdb.db.conf.IoTDBDescriptor; +package org.apache.iotdb.db.node_commons.common; public class ConnectionInfo { - private static final int dataNodeId = IoTDBDescriptor.getInstance().getConfig().getDataNodeId(); private final long userId; private final String userName; private final long sessionId; @@ -38,10 +35,6 @@ public ConnectionInfo( this.clientAddress = clientAddress; } - public int getDataNodeId() { - return dataNodeId; - } - public long getUserId() { return userId; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/NodeRef.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/NodeRef.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/NodeRef.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/NodeRef.java index eb4a9b5792eea..3ce7596307f90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/NodeRef.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/NodeRef.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.common; +package org.apache.iotdb.db.node_commons.common; import static java.lang.String.format; import static java.lang.System.identityHashCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/MemoryEstimationHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/MemoryEstimationHelper.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/MemoryEstimationHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/MemoryEstimationHelper.java index f5db0ccb0a668..defad97799393 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/MemoryEstimationHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/MemoryEstimationHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution; +package org.apache.iotdb.db.node_commons.execution; import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.MeasurementPath; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java index e9d03830d2938..6810dd7f7f2bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped; public interface UpdateMemory { UpdateMemory NOOP = () -> true; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/CombineHashFunction.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/CombineHashFunction.java index 91561eee75786..5fb5750779121 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/CombineHashFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; public final class CombineHashFunction { private CombineHashFunction() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatGroupByHash.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatGroupByHash.java index 7f5e0abd07bb2..825c3395b2748 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatGroupByHash.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.queryengine.plan.relational.utils.TypeUtil; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -35,7 +35,7 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Verify.verify; import static java.lang.Math.min; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.sumExact; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.FlatHash.sumExact; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; // This implementation assumes arrays used in the hash are always a power of 2 diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatHash.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatHash.java index 207bab62914c7..508cd37b8c35f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatHash.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -32,8 +32,8 @@ import static java.lang.Math.max; import static java.lang.Math.min; import static java.lang.Math.toIntExact; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.VariableWidthData.EMPTY_CHUNK; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.VariableWidthData.POINTER_SIZE; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.VariableWidthData.EMPTY_CHUNK; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.VariableWidthData.POINTER_SIZE; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfByteArray; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfIntArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatHashStrategy.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatHashStrategy.java index b1ac02c9b3ee4..75bac8f0f8835 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatHashStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/GroupByHash.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/GroupByHash.java index 60059ae105f29..72acfa3833689 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/GroupByHash.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import com.google.common.annotations.VisibleForTesting; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/HashStrategy.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/HashStrategy.java index 6a5cf351dd994..02fd8edba8774 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/HashStrategy.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; -import org.apache.iotdb.db.queryengine.plan.relational.utils.TypeUtil; +import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.Column; @@ -27,8 +27,8 @@ import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.TypeUtil.getFlatVariableWidthSize; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.TypeUtil.notDistinctFrom; +import static org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil.getFlatVariableWidthSize; +import static org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil.notDistinctFrom; public class HashStrategy implements FlatHashStrategy { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/MarkDistinctHash.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/MarkDistinctHash.java index 7001bdf056e95..677cbf96de28d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/MarkDistinctHash.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import com.google.common.annotations.VisibleForTesting; import org.apache.tsfile.block.column.Column; @@ -32,8 +32,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.DEFAULT_GROUP_NUMBER; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.createGroupByHash; public class MarkDistinctHash { private final GroupByHash groupByHash; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/NoChannelGroupByHash.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/NoChannelGroupByHash.java index e0647b895f1f3..4fff74ad3a42f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/NoChannelGroupByHash.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlockBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/VariableWidthData.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/VariableWidthData.java index 143153112db4c..159766822d1c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/VariableWidthData.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; import com.google.common.primitives.Ints; import org.apache.tsfile.utils.RamUsageEstimator; @@ -30,9 +30,9 @@ import static java.lang.Math.addExact; import static java.lang.Math.max; import static java.lang.Math.subtractExact; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.bytesToInt; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.intToBytes; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.sumExact; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.FlatHash.bytesToInt; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.FlatHash.intToBytes; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.FlatHash.sumExact; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfObjectArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/XxHash64.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/XxHash64.java index bf38564ee06e3..e2f493e5b7652 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/XxHash64.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; import java.io.IOException; import java.io.InputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/FunctionType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/expression/multi/FunctionType.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/FunctionType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/expression/multi/FunctionType.java index 95d4e37215282..70c4f888e2436 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/FunctionType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/expression/multi/FunctionType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.multi; +package org.apache.iotdb.db.node_commons.plan.expression.expression.expression.multi; /** */ public enum FunctionType { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java index cfffdd82d02ef..ef6d4eef14472 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; @@ -105,9 +106,7 @@ default R visitEnforceSingleRow(EnforceSingleRowNode node, C context) { return visitSingleChildProcess(node, context); } - default R visitCorrelatedJoin( - org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode node, - C context) { + default R visitCorrelatedJoin(CorrelatedJoinNode node, C context) { return visitTwoChildProcess(node, context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/InputLocation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/parameter/InputLocation.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/InputLocation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/parameter/InputLocation.java index d0b88fbda2875..32c3cabdc5e1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/InputLocation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/parameter/InputLocation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; +package org.apache.iotdb.db.node_commons.plan.planner.plan.parameter; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/NodeRef.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/analyzer/NodeRef.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/NodeRef.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/analyzer/NodeRef.java index 33b99a326e0d1..2aff097c58104 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/NodeRef.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/analyzer/NodeRef.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +package org.apache.iotdb.db.node_commons.plan.relational.analyzer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/BoundSignature.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/BoundSignature.java index 7ccae2a01708d..4aae233fd4036 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/BoundSignature.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/BoundSignature.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.function.function; -import org.apache.iotdb.db.queryengine.plan.relational.utils.TypeUtil; +import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/Signature.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/Signature.java index 94f3e190e7015..bcb46be547bcf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/Signature.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/Signature.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.function.function; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TypeVariableConstraint.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TypeVariableConstraint.java index 22b8caaa388e4..4517f2fea0969 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TypeVariableConstraint.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TypeVariableConstraint.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.function.function; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import java.util.HashSet; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ClassifyTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ClassifyTableFunction.java index a735d7add9a78..96e6ae36ee6a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ClassifyTableFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ClassifyTableFunction.java @@ -26,9 +26,9 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.utils.ResultColumnAppender; import org.apache.iotdb.db.protocol.client.an.AINodeClient; import org.apache.iotdb.db.protocol.client.an.AINodeClientManager; -import org.apache.iotdb.db.queryengine.plan.relational.utils.ResultColumnAppender; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.relational.TableFunction; @@ -73,7 +73,7 @@ import java.util.stream.Collectors; import static org.apache.iotdb.commons.udf.builtin.relational.tvf.WindowTVFUtils.findColumnIndex; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.ResultColumnAppender.createResultColumnAppender; +import static org.apache.iotdb.db.node_commons.plan.relational.utils.ResultColumnAppender.createResultColumnAppender; public class ClassifyTableFunction implements TableFunction { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ForecastTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ForecastTableFunction.java index 44c552f35f7ee..a89f1bf771a19 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ForecastTableFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ForecastTableFunction.java @@ -26,9 +26,9 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.utils.ResultColumnAppender; import org.apache.iotdb.db.protocol.client.an.AINodeClient; import org.apache.iotdb.db.protocol.client.an.AINodeClientManager; -import org.apache.iotdb.db.queryengine.plan.relational.utils.ResultColumnAppender; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.access.Record; @@ -74,7 +74,7 @@ import static org.apache.iotdb.commons.udf.builtin.relational.tvf.WindowTVFUtils.findColumnIndex; import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.TableFunctionUtils.checkType; import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.TableFunctionUtils.parseOptions; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.ResultColumnAppender.createResultColumnAppender; +import static org.apache.iotdb.db.node_commons.plan.relational.utils.ResultColumnAppender.createResultColumnAppender; public class ForecastTableFunction implements TableFunction { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java index 3e2804b928ac0..b1a053fa56ac5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/OrderingScheme.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/OrderingScheme.java index 721c58c99ce36..bd5c112bf2d6b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/OrderingScheme.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/OrderingScheme.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SortOrder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/SortOrder.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SortOrder.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/SortOrder.java index 173886794ccd8..c7c6d5f4ab49a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SortOrder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/SortOrder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner; +package org.apache.iotdb.db.node_commons.plan.relational.planner; import static java.lang.String.format; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/iterative/GroupReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/iterative/GroupReference.java index a53ef3131a72e..30dc12ce13460 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/iterative/GroupReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/iterative/GroupReference.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.iterative; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; @@ -73,7 +73,7 @@ public List getOutputColumnNames() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitGroupReference(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitGroupReference(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java index 564eb31451ddf..3fa61cff53a30 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionType; +import org.apache.iotdb.db.node_commons.plan.expression.expression.expression.multi.FunctionType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CorrelatedJoinNode.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CorrelatedJoinNode.java index f1644744e50c6..9947b4410a088 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CorrelatedJoinNode.java @@ -17,18 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; @@ -141,7 +140,7 @@ public PlanNode replaceChildren(List newChildren) { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitCorrelatedJoin(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitCorrelatedJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/Measure.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/Measure.java index 232aa50dc958e..837b15cd23872 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/Measure.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/Measure.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.queryengine.plan.relational.utils.TypeUtil; +import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java index ff838336727fe..76c57dab6be64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java @@ -30,8 +30,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -49,7 +47,7 @@ import java.util.Set; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch.ONE; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch.ONE; public class PatternRecognitionNode extends SingleChildProcessNode { private final List partitionBy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/RowsPerMatch.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowsPerMatch.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/RowsPerMatch.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowsPerMatch.java index aa92f1d665dce..c9627f6756605 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/RowsPerMatch.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowsPerMatch.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SkipToPosition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SkipToPosition.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SkipToPosition.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SkipToPosition.java index cf610f66f344e..6c1e6ac4c9855 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/SkipToPosition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SkipToPosition.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +package org.apache.iotdb.db.node_commons.plan.relational.planner.node; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/security/Identity.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/security/Identity.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/security/Identity.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/security/Identity.java index 1f9d13716dfaa..9591e603ea4fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/security/Identity.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/security/Identity.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.security; +package org.apache.iotdb.db.node_commons.plan.relational.security; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AllColumns.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllColumns.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AllColumns.java index 00a58d2e44c50..81c9c48a94db4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AllColumns.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; @@ -84,7 +79,7 @@ public Optional getTarget() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitAllColumns(this, context); + return ((CommonQueryAstVisitor) visitor).visitAllColumns(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllRows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AllRows.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllRows.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AllRows.java index 4cad8430b75d5..5d0af4ce17641 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AllRows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AllRows.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -46,7 +41,7 @@ public AllRows(@Nonnull NodeLocation location) { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitAllRows(this, context); + return ((CommonQueryAstVisitor) visitor).visitAllRows(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java index 78a8336e16d98..50d94a49d38ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java index c904d8b2211b0..24d0ec949723b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AstMemoryEstimationHelper.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AstMemoryEstimationHelper.java index 238a3bdfc043e..a4af76cc2b1d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AstMemoryEstimationHelper.java @@ -17,10 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.Accountable; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BetweenPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BetweenPredicate.java index b9c0aacd7e89e..41b9384479736 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BetweenPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BetweenPredicate.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java index a0ba81bce1cf2..e95fa1b78aa2e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; import com.google.common.base.CharMatcher; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BooleanLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BooleanLiteral.java index 8255ba90c3483..bc0411289ef26 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BooleanLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BooleanLiteral.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java index 0596116e8c224..70be10cc96597 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CoalesceExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CoalesceExpression.java index 4fddb358bfce3..3066135f90da2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CoalesceExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CoalesceExpression.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Columns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Columns.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Columns.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Columns.java index 5b1f98a9ce548..5514acf0ba2cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Columns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Columns.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -57,7 +51,7 @@ public boolean isColumnsAsterisk() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitColumns(this, context); + return ((CommonQueryAstVisitor) visitor).visitColumns(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java index 93a125086af2b..7b616d53adda2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java @@ -14,6 +14,8 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +import org.apache.iotdb.db.exception.sql.SemanticException; + import javax.annotation.Nullable; public abstract class CommonQueryAstVisitor implements IAstVisitor { @@ -185,4 +187,100 @@ protected R visitWindowFrame(WindowFrame node, C context) { protected R visitRow(Row node, C context) { return visitExpression(node, context); } + + protected R visitIdentifier(Identifier node, C context) { + return visitExpression(node, context); + } + + protected R visitDataTypeParameter(DataTypeParameter node, C context) { + return visitNode(node, context); + } + + protected R visitNumericTypeParameter(NumericParameter node, C context) { + return visitDataTypeParameter(node, context); + } + + protected R visitInListExpression(InListExpression node, C context) { + return visitExpression(node, context); + } + + protected R visitWhenClause(WhenClause node, C context) { + return visitExpression(node, context); + } + + protected R visitFieldReference(FieldReference node, C context) { + return visitExpression(node, context); + } + + protected R visitGroupingElement(GroupingElement node, C context) { + return visitNode(node, context); + } + + protected R visitGroupingSets(GroupingSets node, C context) { + return visitGroupingElement(node, context); + } + + protected R visitDereferenceExpression(DereferenceExpression node, C context) { + return visitExpression(node, context); + } + + protected R visitExists(ExistsPredicate node, C context) { + return visitExpression(node, context); + } + + protected R visitColumns(Columns node, C context) { + return visitExpression(node, context); + } + + protected R visitAllRows(AllRows node, C context) { + return visitExpression(node, context); + } + + protected R visitAllColumns(AllColumns node, C context) { + return visitSelectItem(node, context); + } + + protected R visitSelectItem(SelectItem node, C context) { + return visitNode(node, context); + } + + protected R visitOrderBy(OrderBy node, C context) { + return visitNode(node, context); + } + + protected R visitParameter(Parameter node, C context) { + return visitExpression(node, context); + } + + protected R visitGroupBy(GroupBy node, C context) { + return visitNode(node, context); + } + + protected R visitSimpleGroupBy(SimpleGroupBy node, C context) { + return visitGroupingElement(node, context); + } + + protected R visitQuantifiedComparisonExpression(QuantifiedComparisonExpression node, C context) { + return visitExpression(node, context); + } + + protected R visitSubqueryExpression(SubqueryExpression node, C context) { + throw new SemanticException("Only TableSubquery is supported now"); + } + + protected R visitSortItem(SortItem node, C context) { + return visitNode(node, context); + } + + protected R visitWindowReference(WindowReference node, C context) { + return visitNode(node, context); + } + + protected R visitWindowSpecification(WindowSpecification node, C context) { + return visitNode(node, context); + } + + protected R visitTypeParameter(TypeParameter node, C context) { + return visitDataTypeParameter(node, context); + } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ComparisonExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ComparisonExpression.java index 5acb8a4049e91..19a87074ea08f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ComparisonExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ComparisonExpression.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentDatabase.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentDatabase.java index 4a30f6ba48ea2..d94f93438b81a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentDatabase.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentDatabase.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentTime.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentTime.java index 2a880211bd1c7..419b138b2a990 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentTime.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentTime.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentUser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentUser.java index 6e252af1a0fba..d019ddcda13f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentUser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentUser.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataTypeParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DataTypeParameter.java similarity index 74% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataTypeParameter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DataTypeParameter.java index fb0ee409d6f0d..a7edaf707ea59 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DataTypeParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DataTypeParameter.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import javax.annotation.Nullable; @@ -33,6 +29,6 @@ protected DataTypeParameter(@Nullable NodeLocation location) { @Override protected R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitDataTypeParameter(this, context); + return ((CommonQueryAstVisitor) visitor).visitDataTypeParameter(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DecimalLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DecimalLiteral.java index c4af8b12fe9a3..c058fe836e77b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DecimalLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DecimalLiteral.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DereferenceExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DereferenceExpression.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DereferenceExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DereferenceExpression.java index 6d211a6c3aac6..9ce7383e9ad01 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DereferenceExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DereferenceExpression.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -69,7 +64,7 @@ public DereferenceExpression(NodeLocation location, Identifier field) { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitDereferenceExpression(this, context); + return ((CommonQueryAstVisitor) visitor).visitDereferenceExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DoubleLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DoubleLiteral.java index ae75e74260c8b..987ca6f11c4c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DoubleLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DoubleLiteral.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExistsPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ExistsPredicate.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExistsPredicate.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ExistsPredicate.java index aa715c20844ce..1071d8bd6c4b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExistsPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ExistsPredicate.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -56,7 +51,7 @@ public Expression getSubquery() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitExists(this, context); + return ((CommonQueryAstVisitor) visitor).visitExists(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java index 708526d95940b..2fdda909a4c17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java @@ -19,10 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.queryengine.plan.relational.sql.util.ExpressionFormatter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Extract.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Extract.java index ca57189a513a4..82b68ccd0f470 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Extract.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Extract.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.Immutable; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FieldReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FieldReference.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FieldReference.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FieldReference.java index 4c26bce5a410f..d5452169cee6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FieldReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FieldReference.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -50,7 +46,7 @@ public int getFieldIndex() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitFieldReference(this, context); + return ((CommonQueryAstVisitor) visitor).visitFieldReference(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FloatLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FloatLiteral.java index f31acd24bf320..360cd812bda46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FloatLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FloatLiteral.java @@ -20,7 +20,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FrameBound.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FrameBound.java index 2f970dbb4c66a..2e764265facfd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FrameBound.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FrameBound.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FunctionCall.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FunctionCall.java index 80e6f932d4b74..21c0a4a85ba93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FunctionCall.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FunctionCall.java @@ -19,12 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Window; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowSpecification; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericDataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericDataType.java index e809053437b6a..51926cabf4336 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericDataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericDataType.java @@ -19,10 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericLiteral.java index 165febdfad78b..3da015c7345c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericLiteral.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupBy.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupBy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupBy.java index 5c9a41f6292f3..656f4f55430ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupBy.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -62,7 +58,7 @@ public List getGroupingElements() { @Override protected R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitGroupBy(this, context); + return ((CommonQueryAstVisitor) visitor).visitGroupBy(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingElement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupingElement.java similarity index 71% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingElement.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupingElement.java index 510dfb3454291..5ebaf9fb79d44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingElement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupingElement.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import java.util.List; @@ -36,6 +31,6 @@ protected GroupingElement(NodeLocation location) { @Override protected R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitGroupingElement(this, context); + return ((CommonQueryAstVisitor) visitor).visitGroupingElement(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingSets.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupingSets.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingSets.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupingSets.java index fde0c87a8434f..0563d5599551c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/GroupingSets.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupingSets.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -80,7 +75,7 @@ public List getExpressions() { @Override protected R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitGroupingSets(this, context); + return ((CommonQueryAstVisitor) visitor).visitGroupingSets(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Identifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Identifier.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Identifier.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Identifier.java index 4df8755c19fd4..12e11a8c5c4c2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Identifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Identifier.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.base.CharMatcher; import com.google.common.base.Strings; @@ -114,7 +108,7 @@ public String getCanonicalValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitIdentifier(this, context); + return ((CommonQueryAstVisitor) visitor).visitIdentifier(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IfExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IfExpression.java index f906d95746b1b..e5d62ba9541b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IfExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IfExpression.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InListExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InListExpression.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InListExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InListExpression.java index 040eefc456364..5a42fd9fa59d4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InListExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InListExpression.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -88,7 +82,7 @@ public List getValues() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitInListExpression(this, context); + return ((CommonQueryAstVisitor) visitor).visitInListExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InPredicate.java index 1413cdaffae1c..624bb079dd34f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InPredicate.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java index 9e65ac2e3d606..39c2666013147 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNullPredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNullPredicate.java index 8c43c74cce67f..1126799be73c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNullPredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNullPredicate.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LikePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LikePredicate.java index 217c5d865be5a..b4e5bff48eda6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LikePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LikePredicate.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LogicalExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LogicalExpression.java index 96b6178936b06..5c3a9d6f9fb86 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LogicalExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LogicalExpression.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LongLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LongLiteral.java index 6a03b9434eae0..f5ba4de18131b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LongLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LongLiteral.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NotExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NotExpression.java index c66deb00d79ef..95c5eb2a5fc2b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NotExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NotExpression.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullIfExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullIfExpression.java index 1a28354660dc3..5aeaba493fb52 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullIfExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullIfExpression.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullLiteral.java index d60c46d112512..daaecf72136a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullLiteral.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import org.apache.tsfile.utils.RamUsageEstimator; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NumericParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NumericParameter.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NumericParameter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NumericParameter.java index a47c01d84c68f..c779c3a31ba68 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NumericParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NumericParameter.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -64,7 +60,7 @@ public List getChildren() { @Override protected R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitNumericTypeParameter(this, context); + return ((CommonQueryAstVisitor) visitor).visitNumericTypeParameter(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OrderBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/OrderBy.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OrderBy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/OrderBy.java index 41b0f06a86440..46c5149be4db9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OrderBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/OrderBy.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -64,7 +60,7 @@ public List getSortItems() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitOrderBy(this, context); + return ((CommonQueryAstVisitor) visitor).visitOrderBy(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Parameter.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Parameter.java index 5461a710dc66a..78ffb44998ec0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Parameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Parameter.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -54,7 +49,7 @@ public int getId() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitParameter(this, context); + return ((CommonQueryAstVisitor) visitor).visitParameter(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QualifiedName.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QualifiedName.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QualifiedName.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QualifiedName.java index 4a29ffb6ad72a..0bf8da13b9168 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QualifiedName.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QualifiedName.java @@ -17,9 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuantifiedComparisonExpression.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuantifiedComparisonExpression.java index 9ff795ebbf249..8a7519bd4f2bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuantifiedComparisonExpression.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -92,7 +86,8 @@ public Expression getSubquery() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitQuantifiedComparisonExpression(this, context); + return ((CommonQueryAstVisitor) visitor) + .visitQuantifiedComparisonExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Row.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Row.java index 136005ad88065..9cdedda1ccd60 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Row.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Row.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java index 79992f46dfed1..f79c3d5ef4a12 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java @@ -19,9 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.external.commons.lang3.Validate; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SelectItem.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SelectItem.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SelectItem.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SelectItem.java index 7ba3185af7446..86b240d0e263e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SelectItem.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SelectItem.java @@ -17,10 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; public abstract class SelectItem extends Node { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java index bee8749a4dab1..ced50868b047a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java @@ -19,9 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.external.commons.lang3.Validate; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleGroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleGroupBy.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleGroupBy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleGroupBy.java index 6439274c749bd..740e2d3c16a98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SimpleGroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleGroupBy.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -61,7 +56,7 @@ public List getExpressions() { @Override protected R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitSimpleGroupBy(this, context); + return ((CommonQueryAstVisitor) visitor).visitSimpleGroupBy(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SortItem.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SortItem.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SortItem.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SortItem.java index 6f550f144e273..fe5b6cb1cfb89 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SortItem.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SortItem.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -85,7 +80,7 @@ public NullOrdering getNullOrdering() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitSortItem(this, context); + return ((CommonQueryAstVisitor) visitor).visitSortItem(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StringLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StringLiteral.java index dc123a7a0fbe9..9ac6f57330495 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StringLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StringLiteral.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubqueryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubqueryExpression.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubqueryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubqueryExpression.java index c30971e1dcb10..13b6e6e99d224 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubqueryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubqueryExpression.java @@ -17,12 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -55,7 +52,7 @@ public Query getQuery() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitSubqueryExpression(this, context); + return ((CommonQueryAstVisitor) visitor).visitSubqueryExpression(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SymbolReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SymbolReference.java index 3f4f9e1d6f6c1..8def8bc64b395 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SymbolReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SymbolReference.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Trim.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Trim.java index 4b5d5d65aba14..ecd1585bcb4c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Trim.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Trim.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TypeParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TypeParameter.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TypeParameter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TypeParameter.java index 9425b59314556..59e19df73532d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TypeParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TypeParameter.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -59,7 +55,7 @@ public List getChildren() { @Override protected R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitTypeParameter(this, context); + return ((CommonQueryAstVisitor) visitor).visitTypeParameter(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WhenClause.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WhenClause.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WhenClause.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WhenClause.java index 4645f0c591563..60426feab544d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WhenClause.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WhenClause.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -72,7 +66,7 @@ public Expression getResult() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitWhenClause(this, context); + return ((CommonQueryAstVisitor) visitor).visitWhenClause(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Window.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Window.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Window.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Window.java index edbe81408fa84..d3c2de57a9f20 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Window.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Window.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowFrame.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowFrame.java index 38b7846075926..2ef6aa9a69374 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowFrame.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowFrame.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowReference.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowReference.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowReference.java index 1fae52e706b78..0656223e44af8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowReference.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -52,7 +48,7 @@ public Identifier getName() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitWindowReference(this, context); + return ((CommonQueryAstVisitor) visitor).visitWindowReference(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowSpecification.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowSpecification.java index 1faace4322a6a..5e22e6762841f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowSpecification.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowSpecification.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -80,7 +74,7 @@ public Optional getFrame() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitWindowSpecification(this, context); + return ((CommonQueryAstVisitor) visitor).visitWindowSpecification(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java index 9ab89c6566396..23360e55a72ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ExpressionFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java @@ -17,8 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +package org.apache.iotdb.db.node_commons.plan.relational.sql.util; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllRows; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; @@ -26,20 +28,29 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Columns; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -51,37 +62,26 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Window; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllRows; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Columns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingElement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; -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.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleGroupBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TypeParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Window; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; @@ -116,7 +116,7 @@ public static String formatExpression(Expression expression) { return new Formatter(Optional.empty(), Optional.empty()).process(expression, null); } - public static class Formatter extends AstVisitor { + public static class Formatter extends CommonQueryAstVisitor { private final Optional> literalFormatter; private final Optional> symbolReferenceFormatter; @@ -707,7 +707,7 @@ private static String formatFrameBound(FrameBound frameBound) { } } - static String formatGroupBy(List groupingElements) { + public static String formatGroupBy(List groupingElements) { return groupingElements.stream() .map( groupingElement -> { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/InternalTypeManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/InternalTypeManager.java index 296fcd7dc9a81..029d84c7d0c7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/InternalTypeManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/InternalTypeManager.java @@ -22,7 +22,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.type.TypeId; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignature.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignature.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignature.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignature.java index f6977d7a6a028..f6c773d0fc01f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignature.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignature.java @@ -17,7 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.type; +package org.apache.iotdb.db.node_commons.plan.relational.type; + +import org.apache.iotdb.db.queryengine.plan.relational.type.ParameterKind; +import org.apache.iotdb.db.queryengine.plan.relational.type.StandardTypes; +import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureParameter; import com.google.errorprone.annotations.FormatMethod; import com.google.errorprone.annotations.Immutable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureTranslator.java index 431fab4084559..2e25be99c8549 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureTranslator.java @@ -21,12 +21,11 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataTypeParameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TypeParameter; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureParameter; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/ResultColumnAppender.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/ResultColumnAppender.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/ResultColumnAppender.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/ResultColumnAppender.java index 7748f39382d5d..297164467d1ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/ResultColumnAppender.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/ResultColumnAppender.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils; +package org.apache.iotdb.db.node_commons.plan.relational.utils; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/TypeUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/TypeUtil.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/TypeUtil.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/TypeUtil.java index fe951d1e4ce10..c1b3414f177ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/TypeUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/TypeUtil.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils; +package org.apache.iotdb.db.node_commons.plan.relational.utils; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.FlatHashStrategy; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.HashStrategy; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.XxHash64; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.FlatHashStrategy; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.HashStrategy; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.XxHash64; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -48,8 +48,8 @@ import static java.lang.Double.doubleToLongBits; import static java.lang.Float.floatToIntBits; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.XxHash64.FALSE_XX_HASH; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.XxHash64.TRUE_XX_HASH; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.XxHash64.FALSE_XX_HASH; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.XxHash64.TRUE_XX_HASH; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DateType.DATE; import static org.apache.tsfile.read.common.type.IntType.INT32; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java index a0c311c7d6a41..b23474619539b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; @@ -44,7 +45,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateOrUpdateDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java index 44db640237562..f874aa16e7c44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; -import org.apache.iotdb.db.queryengine.common.ConnectionInfo; +import org.apache.iotdb.db.node_commons.common.ConnectionInfo; import org.apache.iotdb.service.rpc.thrift.TSConnectionInfo; import org.apache.iotdb.service.rpc.thrift.TSConnectionType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java index ac7cc236d9f6d..85e0f0fafa4e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java @@ -36,9 +36,9 @@ import org.apache.iotdb.db.audit.DNAuditLogger; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.auth.LoginLockManager; +import org.apache.iotdb.db.node_commons.common.ConnectionInfo; import org.apache.iotdb.db.protocol.basic.BasicOpenSessionResp; import org.apache.iotdb.db.protocol.thrift.OperationType; -import org.apache.iotdb.db.queryengine.common.ConnectionInfo; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.execution.config.session.PreparedStatementMemoryManager; import org.apache.iotdb.db.storageengine.dataregion.read.control.QueryResourceManager; 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 9b4bf576c0f74..c883cb526a02f 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 @@ -48,9 +48,11 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; @@ -89,7 +91,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache; @@ -99,7 +100,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.security.TreeAccessCheckContext; import org.apache.iotdb.db.queryengine.plan.relational.sql.ParameterExtractor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Execute; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetSqlDialect; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java index df14524c01f6e..9f4ab5fbef49a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -105,12 +105,6 @@ import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.partition.DataPartitionTableGenerator; @@ -149,6 +143,12 @@ import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher; import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; 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/common/MPPQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java index 88bd1998f683c..6f62675efacc1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java @@ -26,6 +26,8 @@ import org.apache.iotdb.commons.audit.IAuditEntity; import org.apache.iotdb.commons.auth.entity.PrivilegeType; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; @@ -33,8 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.lock.SchemaLockType; import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.plan.planner.memory.NotThreadSafeMemoryReservationManager; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.statistics.QueryPlanStatistics; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/SessionInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/SessionInfo.java index 5725207b3edc7..a3ea567e38b4c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/SessionInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/SessionInfo.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.node_commons.plan.relational.security.Identity; import org.apache.iotdb.db.protocol.session.IClientSession; -import org.apache.iotdb.db.queryengine.plan.relational.security.Identity; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java index f1f6e349bc8f0..1896a19573a9b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java index 30ce92091d8e3..578c8825e881e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java index 286eec6abb127..7f0f9ec24f048 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.udf.api.State; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java index 8728d073a357c..c0225f2bf2636 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java index 8776ffbdd2695..e2cfe3aaa0d6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java index a6b1a9369ccf6..6011b7e40e567 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java index adc179f77ecf4..1021297155273 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java index 6eb4182587af9..861f621c78c14 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java index 62295c2be5812..68fca4e36782e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java index e0d2f1d6aa13b..c66525a53dce9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.tsfile.read.common.TimeRange; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java index c36aa745bc4cb..0e902bdd4f483 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java index b4f1a5c7261bf..f3115ff03d27e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java @@ -25,14 +25,14 @@ import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.execution.QueryExecution; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.statistics.FragmentInstanceStatisticsDrawer; import org.apache.iotdb.db.queryengine.statistics.QueryStatisticsFetcher; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberBuilder.java index 172adc82bc9fb..03e955d791bfe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberBuilder.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java index 21192550c5018..7e51a434a76f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.SessionInfo; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/SimpleTsBlockWithPositionComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/SimpleTsBlockWithPositionComparator.java index ad0b1af9523d5..e9b64ac2d0141 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/SimpleTsBlockWithPositionComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/SimpleTsBlockWithPositionComparator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java index 1cd09143e90a1..717a8522b1f7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java index e78fed485cf6a..5254520cc67df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.fill.ILinearFill; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java index 0d15c72cfa1b0..a576c6b134fd6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java index 1749b61b760d3..85ffb93493e00 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.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/AggregationMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationMergeSortOperator.java index f67975d84fbd6..686a627d30787 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationMergeSortOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; 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/AggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java index 1e933f4b41560..2c59982bd8d55 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.Operator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AssignUniqueIdOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AssignUniqueIdOperator.java index 5501764482d38..6134beec2fb7e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AssignUniqueIdOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AssignUniqueIdOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.schedule.task.DriverTaskId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/CollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/CollectOperator.java index 668cf193de97f..ebe44170109f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/CollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/CollectOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.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/ColumnInjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java index 369082e9f0f1c..34c9aa60eef10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.columngenerator.ColumnGenerator; 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 727ef26c1c71d..7f1bf08cbc146 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 @@ -25,10 +25,10 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.IntoProcessException; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java index cd0fdcb5a500d..58f226955e20b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.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/EnforceSingleRowOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/EnforceSingleRowOperator.java index 9438d96dc3057..9c785ef426ea9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/EnforceSingleRowOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/EnforceSingleRowOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.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/FilterAndProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java index 5d9163e9e6879..73635b9e23be7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.AbstractCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.MappableUDFColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.MultiColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.TernaryColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.AbstractCaseWhenThenColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MappableUDFColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/InsertTabletStatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/InsertTabletStatementGenerator.java index 47ff31573e3c8..90f34fb4df9ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/InsertTabletStatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/InsertTabletStatementGenerator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/LimitOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/LimitOperator.java index 85ef22ababd34..99f01907bb452 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/LimitOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/LimitOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.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/MergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MergeSortOperator.java index 813217872aead..a1078f5506ff6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MergeSortOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/OffsetOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/OffsetOperator.java index 24fc72d094177..b28428e30c7b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/OffsetOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/OffsetOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.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/PatternRecognitionOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PatternRecognitionOperator.java index 0275b44e1459a..1282ce4ce8248 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PatternRecognitionOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PatternRecognitionOperator.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.LogicalIndexNavigation; @@ -30,8 +32,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.Matcher; import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.RowComparator; import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java index ca5af889937e0..1b9059dea536c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java index 9c4cd26614300..d4a85adad8011 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.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/RawDataAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java index e177834b8f5b2..b9c7e46c7a939 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.Operator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java index 5c10c916e0bca..a66312d0b28e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.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/SlidingWindowAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java index 7e63d6dd4d27f..42aca2ccf85e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow.SlidingWindowAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SortOperator.java index 31029a30da640..e8d77cb59d0fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SortOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableInsertTabletStatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableInsertTabletStatementGenerator.java index aed6cd3a4c714..29fa126bd8cc9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableInsertTabletStatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableInsertTabletStatementGenerator.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java index bf6f9c5bc94af..95f0e4ca0bd61 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; -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; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperator.java index 90565a8587592..6de85f87c762c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java index bec099e2f4073..46bd64419c303 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; 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/TopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TopKOperator.java index 0df7efdd19f0b..f6efe39a4c0c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TopKOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java index bfa1e582900d7..e5b72cd70836f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeInsertTabletStatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeInsertTabletStatementGenerator.java index 3a24312479cfa..cf29cea813d02 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeInsertTabletStatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeInsertTabletStatementGenerator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java index bed98c4208646..333961e6845ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java @@ -22,10 +22,10 @@ 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.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperator.java index eeac35d918908..9df9006e4e6d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.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/ai/InferenceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java index d39d81aff5bed..96f0f1f545012 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java @@ -25,9 +25,9 @@ import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; import org.apache.iotdb.db.exception.runtime.ModelInferenceProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.protocol.client.an.AINodeClient; import org.apache.iotdb.db.protocol.client.an.AINodeClientManager; -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; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java index 5b85df2e731d1..c3010f753a783 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.copyto; import org.apache.iotdb.commons.schema.column.ColumnHeader; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java index 21c3be51777ce..d8658f9f1fa0b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java @@ -32,8 +32,8 @@ import java.util.List; import java.util.stream.Collectors; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; public class PartitionRecognizer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionOperator.java index c00e05ec17fed..fbefec01b83e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.function; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.AggregationMergeSortOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java index e9a14aa63a7a5..fbb6386e846ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java index c439921aa978e..89623529a3f7a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; // with month interval public class GapFillWGroupWMoOperator extends AbstractGapFillWGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java index a05a0e0be8490..0910ac07fffcc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWGroupWoMoOperator extends AbstractGapFillWGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java index ad87c3fa2d049..d1cde369a4307 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java @@ -27,7 +27,7 @@ import java.time.ZoneId; import java.util.List; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWoGroupWMoOperator extends AbstractGapFillWoGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java index d12048d17cffb..f72b818a9e1bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java @@ -26,7 +26,7 @@ import java.util.List; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWoGroupWoMoOperator extends AbstractGapFillWoGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java index 819a15622252a..d7d9d6e86618b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.AbstractConsumeAllOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java index 6fae539d2f8d7..80bb423a884be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.AbstractConsumeAllOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java index 86c77ac48d043..3905ffb45df59 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java index b8843d4b854a8..9ddb482d80a27 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java index cb31ea61be63b..029fc16c95709 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; 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/join/TableLeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java index 19b9e2eb4d460..a2ea748c7ea69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparator.java index 468e340200af9..2b7dc8b9c5991 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.statement.component.NullOrdering; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MultiColumnMerger.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MultiColumnMerger.java index 149667ed250aa..18e9cc4cb2043 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MultiColumnMerger.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MultiColumnMerger.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/NonOverlappedMultiColumnMerger.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/NonOverlappedMultiColumnMerger.java index 80759e0be13af..cf8c04ad79700 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/NonOverlappedMultiColumnMerger.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/NonOverlappedMultiColumnMerger.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SingleColumnMerger.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SingleColumnMerger.java index ba33e219d0609..9040ad63995b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SingleColumnMerger.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SingleColumnMerger.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java index 67aa5191db51d..3a8a2f4c6dfe4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java @@ -22,7 +22,7 @@ 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.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java index d1cd2d387f0f7..f5a86a1d14f34 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java index ec90442d0e831..7c10defa5cd1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java index d2389a008987a..5d8a169a5d81d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java index e40cb1ad1316a..fa3ca3346cf32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java index 88d67a21f97fb..c8cd70931f868 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryUtil.java index aadd9c8df38f6..0640c03faa32a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryUtil.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.LastValueDescAccumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.MaxTimeDescAccumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java index a1b0a7fd8dc28..12a63c2df2ccf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternPartitionExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternPartitionExecutor.java index 402cc7e831282..07852c6f1ceac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternPartitionExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternPartitionExecutor.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternVariableRecognizer.PatternVariableComputation; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression.PatternExpressionComputation; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.ArrayView; @@ -28,8 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.ColumnList; import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.RowComparator; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java index 56c26c31f0d72..cae0462521e22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java @@ -18,13 +18,13 @@ */ package org.apache.iotdb.db.queryengine.execution.operator.process.window; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -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; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -44,8 +44,8 @@ import java.util.Map; import java.util.Optional; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.createGroupByHash; import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; public class RowNumberOperator implements ProcessOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperator.java index 32e1a44ce45db..d3e0566108053 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java index eab0d71d9dcae..1c10f2c80916f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java @@ -19,9 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.NoChannelGroupByHash; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.GroupedTopNBuilder; import org.apache.iotdb.db.queryengine.execution.operator.GroupedTopNRowNumberBuilder; import org.apache.iotdb.db.queryengine.execution.operator.Operator; @@ -29,10 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.SimpleTsBlockWithPositionComparator; import org.apache.iotdb.db.queryengine.execution.operator.TsBlockWithPositionComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.NoChannelGroupByHash; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameInfo.java index bd811522929c5..64dc54407d6ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameInfo.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java index 5ab2dc1213394..f9e22be38a34b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java index cd421a301e82d..f1851eeb5901c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -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; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java index d406e6f14c42f..37c7e5fe3f78d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; 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 f9a7113ed6ced..e713c851adbcf 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 @@ -23,7 +23,7 @@ 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.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; 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 7fe9914ab0c29..035fd8f8d8bd4 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 @@ -23,7 +23,7 @@ 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.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; 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 e253ca774a4e0..82bb8c6fbaa1c 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 @@ -21,7 +21,7 @@ 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.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java index b21f4f0251abf..bd55f5103b7bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -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; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java index 0ad55af64ce36..ae0736c8f223c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java index 27465248fb2f3..aa65e3441d5d6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java @@ -25,10 +25,10 @@ import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.common.schematree.node.SchemaNode; -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.schemaengine.schemaregion.ISchemaRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java index 890094529ebd0..e3076cc9073f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; 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 fe9f4355ab293..4989d55eed7c9 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 @@ -21,7 +21,7 @@ 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.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; 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 e437938fdfffd..0ba4335eee36d 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 @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; import org.apache.iotdb.commons.schema.column.ColumnHeader; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -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; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; 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 65946d7c96e2f..f94425e9e2038 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo; 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 6ea710f0750ba..ce4d43434b55f 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.rescon.MemSchemaRegionStatistics; 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/DevicePredicateFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateFilter.java index 3a2fef4825999..56e8a776157b8 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 @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import java.util.Iterator; 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 255e7a00c7c60..9dba69842ff22 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.utils.PathUtils; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; 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 f02189bf4c6c9..a4ef5e715dc2b 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.impl.ShowDevicesResult; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java index 071061c29a926..f394dc11f3213 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; import org.apache.iotdb.db.queryengine.execution.operator.Operator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java index 36f076dfd26a4..86d7d8e98db3c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; import org.apache.iotdb.db.queryengine.execution.operator.Operator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractRegionScanDataSourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractRegionScanDataSourceOperator.java index 0f20259d5dcae..6c48c8060158d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractRegionScanDataSourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractRegionScanDataSourceOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java index 4f943e070b128..8ad102ef9f904 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/source/AlignedSeriesScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java index 2e6a3e785fa80..3bdb8f78d9d9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java index 7d6e3a2d7b964..8a7c2fda8dbc3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.exchange.source.ISourceHandle; 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/source/LastCacheScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java index db22f6d350fa5..1ffa6542a8359 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java index 84aa6d2bd34bd..d8ba1cf7989ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.IFullPath; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/source/SeriesScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java index 94d14d31e713b..5d35db1e16146 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.IFullPath; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java index fa573c73eb690..09dc225f9a025 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.db.storageengine.dataregion.utils.StorageEngineTimePartitionIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java index 14ebcaec19ddb..8ddbe5de3306c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java index 8c544a4d56459..9f384237348e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java index 894fec27ab5df..06fd903d0b3e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -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.AbstractSeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java index f8a57dd3c4076..9d93713788efb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java index 8307c242163cc..0684850ba2c2e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java index 202dd06293ef3..70caacbf358eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java @@ -21,9 +21,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; -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.utils.cte.CteDataReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java index 14044158045f3..db76eaab55d60 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; 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 index 3460ea200a0f6..5c1922ae758c1 100644 --- 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 @@ -64,6 +64,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TTableInfo; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.ConnectionInfo; import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; @@ -74,7 +75,6 @@ import org.apache.iotdb.db.protocol.client.ConfigNodeInfo; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; -import org.apache.iotdb.db.queryengine.common.ConnectionInfo; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.QueryState; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; @@ -1567,7 +1567,9 @@ private ConnectionsSupplier(final List dataTypes, final UserEntity u protected void constructLine() { ConnectionInfo connectionInfo = sessionConnectionIterator.next(); columnBuilders[0].writeBinary( - new Binary(String.valueOf(connectionInfo.getDataNodeId()), TSFileConfig.STRING_CHARSET)); + new Binary( + String.valueOf(IoTDBDescriptor.getInstance().getConfig().getDataNodeId()), + TSFileConfig.STRING_CHARSET)); columnBuilders[1].writeBinary( new Binary(String.valueOf(connectionInfo.getUserId()), TSFileConfig.STRING_CHARSET)); columnBuilders[2].writeBinary( 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 index 4ce6336409fdb..579eb316ca982 100644 --- 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 @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java index ef2b10952dcdb..2d8284aef9156 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastAccumulator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MarkDistinctOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MarkDistinctOperator.java index 4794f97c885d0..554a23dff56ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MarkDistinctOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MarkDistinctOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.MarkDistinctHash; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java index 337d90eebac7f..8360e5e59d9a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortInnerJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortInnerJoinOperator.java index 3b7e17fae110c..36938655f9a11 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortInnerJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortInnerJoinOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortLeftJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortLeftJoinOperator.java index be6cb2f3a51be..4e50a097fcd1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortLeftJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortLeftJoinOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortSemiJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortSemiJoinOperator.java index b21ed578965fe..6400d4452db57 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortSemiJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortSemiJoinOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java index 4258f335a12ec..5fd3e0c658123 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java index ff631af40721d..103b85dca9130 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java index 0be8d74cf4568..1a4b9245cc4be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java @@ -21,6 +21,8 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.MarkDistinctHash; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.execution.aggregation.VarianceAccumulator; @@ -52,8 +54,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedVarianceAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.IntGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.AggregateFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AggregationOperator.java index d2ec8af83ffc3..2883b3b02e1c2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AggregationOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java index f6c1e9f2d7bd8..25c38676bf6b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; @@ -38,7 +38,7 @@ import java.util.Optional; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter.CURRENT_USED_MEMORY; public class HashAggregationOperator extends AbstractOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java index ec8d02b41769c..fc8f91b4307c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; 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/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java index a1772e2d23198..3ace018383d34 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; @@ -45,7 +45,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter.CURRENT_USED_MEMORY; import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter.MAX_USED_MEMORY; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java index 6b2e556f7b410..55ab475d9ff81 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.builder; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; @@ -47,7 +47,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.createGroupByHash; public class InMemoryHashAggregationBuilder implements HashAggregationBuilder { private final int[] groupByChannels; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java index 53b389f38372c..bc39e0fd29a58 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.window; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; public class ConditionWindowParameter extends WindowParameter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java index 93c100cecf0da..c6349b42526b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.AdditionResolver; import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.DivisionResolver; import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.ModulusResolver; @@ -49,6 +50,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -64,139 +66,137 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.TableCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareLessThanColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.Like2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.NullColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.TimeColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.AbstractGreatestLeastColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.CoalesceColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.InBinaryMultiColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.InBooleanMultiColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.InDoubleMultiColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.InFloatMultiColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.InInt32MultiColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.InInt64MultiColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.InMultiColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.LogicalAndMultiColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.LogicalOrMultiColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.BetweenColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.Like3ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.LpadColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.RpadColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.udf.UserDefineScalarFunctionTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LikeColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.AbsColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.AcosColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.AsinColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.AtanColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitCount2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitCountColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseAnd2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseAndColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseLeftShift2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseLeftShiftColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseNotColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseOr2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseOrColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseRightShift2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseRightShiftArithmetic2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseRightShiftArithmeticColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseRightShiftColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseXor2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BitwiseXorColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BlobLengthColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToDoubleColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToFloatColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CRC32Transformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CastFunctionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CeilColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.Concat2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ConcatColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ConcatMultiColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CosColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CoshColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DegreesColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DiffColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DiffFunctionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DoubleToBytesColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.EndsWith2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.EndsWithColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ExpColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ExtractTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.FloatToBytesColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.FloorColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.FormatColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LTrim2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LTrimColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LengthColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LnColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.Log10ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LowerColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ObjectLengthColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RTrim2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RTrimColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RadiansColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RegexpLike2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RegexpLikeColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.Replace2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.Replace3ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ReplaceFunctionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RoundColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RoundFunctionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SignColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SinColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SinhColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SqrtColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.StartsWith2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.StartsWithColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.Strcmp2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.StrcmpColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.Strpos2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.StrposColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SubString2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SubString3ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SubStringColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.TanColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.TanhColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.Trim2ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.TrimColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.TryCastFunctionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.UpperColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticColumnTransformerApi; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.TableCaseWhenThenColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessThanColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.Like2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.NullColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.AbstractGreatestLeastColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.CoalesceColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InBinaryMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InBooleanMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InDoubleMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InFloatMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InInt32MultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InInt64MultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.LogicalAndMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.LogicalOrMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.BetweenColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.Like3ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.LpadColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.RpadColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.udf.UserDefineScalarFunctionTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LikeColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.AbsColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.AcosColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.AsinColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.AtanColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitCount2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitCountColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseAnd2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseAndColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseLeftShift2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseLeftShiftColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseNotColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseOr2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseOrColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseRightShift2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseRightShiftArithmetic2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseRightShiftArithmeticColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseRightShiftColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseXor2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseXorColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BlobLengthColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToDoubleColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToFloatColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CRC32Transformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CastFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CeilColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Concat2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ConcatColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ConcatMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CosColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CoshColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DegreesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DiffColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DiffFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DoubleToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.EndsWith2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.EndsWithColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ExpColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ExtractTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.FloatToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.FloorColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.FormatColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LTrim2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LTrimColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LengthColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LnColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Log10ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LowerColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ObjectLengthColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RTrim2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RTrimColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RadiansColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RegexpLike2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RegexpLikeColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Replace2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Replace3ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ReplaceFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RoundColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RoundFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SignColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SinColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SinhColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SqrtColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWith2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWithColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Strcmp2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StrcmpColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Strpos2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StrposColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubString2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubString3ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubStringColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TanColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TanhColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Trim2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TrimColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TryCastFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.UpperColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.ScalarFunction; @@ -230,17 +230,17 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoMetadataChecker.isStringLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBlobType; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; 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 24c4b377ea8be..4f78a5a3d7bea 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 @@ -37,8 +37,10 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryTimeoutRuntimeException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.PreparedStatementInfo; @@ -60,7 +62,6 @@ import org.apache.iotdb.db.queryengine.plan.execution.config.TreeConfigTaskVisitor; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; import org.apache.iotdb.db.queryengine.plan.planner.TreeModelPlanner; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; 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; @@ -98,7 +99,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadConfiguration; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadModel; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MigrateRegion; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeStatement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Prepare; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java index e74cf637ed1f6..b837a33cd0d29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java @@ -30,18 +30,18 @@ import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.template.Template; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.NodeRef; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.execution.memory.StatementMemorySource; import org.apache.iotdb.db.queryengine.plan.execution.memory.StatementMemorySourceContext; import org.apache.iotdb.db.queryengine.plan.execution.memory.StatementMemorySourceVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.TimePredicate; import org.apache.iotdb.db.queryengine.plan.planner.plan.TreeModelTimePredicate; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java index 2e6b8bca68fc1..6ec02317dbdc8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java @@ -32,6 +32,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator; @@ -43,7 +44,6 @@ import org.apache.iotdb.db.protocol.client.ConfigNodeInfo; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TimeRange; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertBaseStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; 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 96df9ed1f921f..d60fb7105930c 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 @@ -46,14 +46,6 @@ import org.apache.iotdb.db.exception.metadata.view.UnsupportedViewException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExistUnknownTypeInExpression; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; @@ -70,6 +62,14 @@ import org.apache.iotdb.db.queryengine.plan.analyze.lock.SchemaLockType; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher; import org.apache.iotdb.db.queryengine.plan.analyze.schema.SchemaValidator; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExistUnknownTypeInExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.MeasurementGroup; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.DeviceViewIntoPathDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.FillDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java index 2203c90dd6066..0b60a8bd70969 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.path.PathPatternTreeUtils; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; import org.apache.iotdb.db.queryengine.plan.statement.component.SelectComponent; 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 754081b48436e..2d507b13072f2 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 @@ -25,34 +25,34 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.UnknownExpressionTypeException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.BindTypeForTimeSeriesOperandVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.CollectAggregationExpressionsVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.CollectSourceExpressionsVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionNormalizeVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.GetMeasurementExpressionVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.LowercaseNormalizeVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ReplaceRawPathWithGroupedPathVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ReplaceSubTreeWithViewVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.BindSchemaForPredicateVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForExpressionVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForHavingVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForPredicateVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.ConcatExpressionWithSuffixPathsVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.BindTypeForTimeSeriesOperandVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CollectAggregationExpressionsVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CollectSourceExpressionsVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionNormalizeVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.GetMeasurementExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.LowercaseNormalizeVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ReplaceRawPathWithGroupedPathVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ReplaceSubTreeWithViewVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForPredicateVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForHavingVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForPredicateVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.ConcatExpressionWithSuffixPathsVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java index a14e1236b1774..f621bef85eebb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java @@ -20,27 +20,27 @@ package org.apache.iotdb.db.queryengine.plan.analyze; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.common.NodeRef; +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ArithmeticBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDAFInformationInferrer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFInformationInferrer; import org.apache.iotdb.db.utils.TypeInferenceUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java index 997bbde224f4e..6754101e0d5a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java @@ -20,37 +20,37 @@ package org.apache.iotdb.db.queryengine.plan.analyze; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.UnknownExpressionTypeException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.DivisionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ModuloExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java index 02bc405f39879..1e276c91ad821 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java index 0b4a26e836f93..bab3676b2f7e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java @@ -22,26 +22,26 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.UnknownExpressionTypeException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.logical.PredicateCanPushDownToSourceChecker; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.logical.TimeFilterExistChecker; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate.ConvertPredicateToFilterVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate.ConvertPredicateToTimeFilterVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate.PredicatePushIntoScanChecker; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate.PredicateSimplifier; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate.ReversePredicateVisitor; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical.PredicateCanPushDownToSourceChecker; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical.TimeFilterExistChecker; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.ConvertPredicateToFilterVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.ConvertPredicateToTimeFilterVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.PredicatePushIntoScanChecker; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.PredicateSimplifier; +import org.apache.iotdb.db.queryengine.plan.expression.expression.visitor.predicate.ReversePredicateVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java index e0c83f54c2d0a..a8441712c2d3c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Pair; 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 0fff0c0c2a011..1a91415fade04 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 @@ -21,14 +21,14 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.NodeRef; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java index 472076f695355..daf7c33f7c139 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java @@ -25,14 +25,14 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.TemplatedConcatRemoveUnExistentMeasurementVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.DeviceSchemaInfo; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.TemplatedConcatRemoveUnExistentMeasurementVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java index 4e5504d66cba0..911e86fefb751 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.analyze; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.tsfile.enums.TSDataType; @@ -41,7 +41,7 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; /** * If in align by device query ,all queried devices are set in one template, we can store the common diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java index 9cdae0982de04..c90456cba0e89 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.utils.TypeUtil; +import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; import com.google.common.collect.ImmutableMap; import org.apache.tsfile.enums.TSDataType; @@ -38,7 +38,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; public class TypeProvider { 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 56a8d17bdf3ce..d74243355a1dd 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 @@ -50,6 +50,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; @@ -184,7 +185,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MigrateRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Prepare; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ReconstructRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RelationalAuthorStatement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RemoveAINode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java index 29cff1e4f982f..73baddacb4e62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java @@ -180,8 +180,6 @@ import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.metadata.SchemaQuotaExceededException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.TransformToViewExpressionVisitor; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.source.dataregion.DataRegionListeningFilter; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; @@ -252,6 +250,8 @@ import org.apache.iotdb.db.queryengine.plan.execution.config.sys.quota.ShowThrottleQuotaTask; import org.apache.iotdb.db.queryengine.plan.execution.config.sys.subscription.ShowSubscriptionsTask; import org.apache.iotdb.db.queryengine.plan.execution.config.sys.subscription.ShowTopicsTask; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.TransformToViewExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.AlterLogicalViewNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB; 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 58e3603f8376e..e6d966f401024 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 @@ -22,13 +22,13 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; 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; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; 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.TableDistributedPlanGenerator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/Expression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/Expression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/Expression.java index c46d2378df975..a3c437cd372a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/Expression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/Expression.java @@ -17,42 +17,42 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.DivisionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ModuloExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; -import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ExpressionFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionFactory.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ExpressionFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionFactory.java index 6428bc6658c40..463da9bb40575 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ExpressionFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionFactory.java @@ -17,33 +17,33 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression; import org.apache.iotdb.common.rpc.thrift.TAggregationType; 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.db.node_commons.plan.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ExpressionType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionType.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ExpressionType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionType.java index bf4ec8790a254..0b99dce1f50e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ExpressionType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression; public enum ExpressionType { CONSTANT((short) -4, (short) 1400), diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/UnknownExpressionTypeException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/UnknownExpressionTypeException.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/UnknownExpressionTypeException.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/UnknownExpressionTypeException.java index 51915a1b9e565..346b66987a345 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/UnknownExpressionTypeException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/UnknownExpressionTypeException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression; public class UnknownExpressionTypeException extends IllegalArgumentException { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/AdditionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/AdditionExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/AdditionExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/AdditionExpression.java index 853194a0325f8..37ac2f7f74f6f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/AdditionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/AdditionExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/ArithmeticBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ArithmeticBinaryExpression.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/ArithmeticBinaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ArithmeticBinaryExpression.java index 8b39751ea188f..8bdacebc0863a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/ArithmeticBinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ArithmeticBinaryExpression.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/BinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/BinaryExpression.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/BinaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/BinaryExpression.java index b25a1d66d9c23..0ab008d6e48a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/BinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/BinaryExpression.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; - -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; + +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/CompareBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/CompareBinaryExpression.java similarity index 69% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/CompareBinaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/CompareBinaryExpression.java index 7d565da51a165..ba03aaa64afb5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/CompareBinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/CompareBinaryExpression.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType.GREATER_EQUAL; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType.GREATER_THAN; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType.LESS_EQUAL; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType.LESS_THAN; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.GREATER_EQUAL; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.GREATER_THAN; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.LESS_EQUAL; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.LESS_THAN; public abstract class CompareBinaryExpression extends BinaryExpression { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/DivisionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/DivisionExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/DivisionExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/DivisionExpression.java index ce47ee1b3bda0..2128de94fc074 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/DivisionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/DivisionExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/EqualToExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/EqualToExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/EqualToExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/EqualToExpression.java index a9f17259e830c..5378780d55f42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/EqualToExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/EqualToExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/GreaterEqualExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterEqualExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/GreaterEqualExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterEqualExpression.java index 82e65daddcb83..384c079e3208f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/GreaterEqualExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterEqualExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/GreaterThanExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterThanExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/GreaterThanExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterThanExpression.java index d3b36dbf3195d..e6313087f0bb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/GreaterThanExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterThanExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LessEqualExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessEqualExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LessEqualExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessEqualExpression.java index 73099bd28e166..c621a81328718 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LessEqualExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessEqualExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LessThanExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessThanExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LessThanExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessThanExpression.java index f993a83e2b12a..2637450827bd9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LessThanExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessThanExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicAndExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicAndExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicAndExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicAndExpression.java index fc3c637aa1b9a..a70906d48c8c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicAndExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicAndExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicBinaryExpression.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicBinaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicBinaryExpression.java index 943c259f91813..933b4fc087612 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicBinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicBinaryExpression.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicOrExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicOrExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicOrExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicOrExpression.java index 20919c90b42a8..d32c12f9a50d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/LogicOrExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicOrExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/ModuloExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ModuloExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/ModuloExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ModuloExpression.java index f646c4674bb5b..c29d3f5a0ced8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/ModuloExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ModuloExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/MultiplicationExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/MultiplicationExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/MultiplicationExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/MultiplicationExpression.java index 8659cf911361c..0053407607fbd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/MultiplicationExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/MultiplicationExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/NonEqualExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/NonEqualExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/NonEqualExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/NonEqualExpression.java index 6f2e2894ef5c0..e73b9093e4907 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/NonEqualExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/NonEqualExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/SubtractionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/SubtractionExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/SubtractionExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/SubtractionExpression.java index 95f46de46398b..d24f2ba5e5317 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/SubtractionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/SubtractionExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/WhenThenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/WhenThenExpression.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/WhenThenExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/WhenThenExpression.java index d69e0fd750693..562d344f9441b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/binary/WhenThenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/WhenThenExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/ConstantOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/ConstantOperand.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/ConstantOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/ConstantOperand.java index 391c234d080f8..d46997c1ea861 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/ConstantOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/ConstantOperand.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.leaf; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/LeafOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/LeafOperand.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/LeafOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/LeafOperand.java index 3173d89590544..add22bf224127 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/LeafOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/LeafOperand.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.leaf; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.common.NodeRef; +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/NullOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/NullOperand.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/NullOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/NullOperand.java index 1988a70f672ac..046a59748b88e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/NullOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/NullOperand.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.leaf; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/TimeSeriesOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimeSeriesOperand.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/TimeSeriesOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimeSeriesOperand.java index c7db6b304f457..10688633f4878 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/TimeSeriesOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimeSeriesOperand.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.leaf; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/TimestampOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimestampOperand.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/TimestampOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimestampOperand.java index ff3c8ba01bff0..cb4b9ba789156 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/leaf/TimestampOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimestampOperand.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.leaf; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/FunctionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/FunctionExpression.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/FunctionExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/FunctionExpression.java index d3cd620d3a5b9..11836b7ba4f0d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/FunctionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/FunctionExpression.java @@ -17,22 +17,23 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.multi; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.expression.expression.expression.multi.FunctionType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.db.queryengine.plan.udf.TreeUDFUtils; -import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFInformationInferrer; import org.apache.iotdb.udf.api.customizer.strategy.AccessStrategy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInFunctionHelper.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInFunctionHelper.java index 062f047ed83bb..ddafd90b7728e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInFunctionHelper.java @@ -17,6 +17,6 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin; public interface BuiltInFunctionHelper {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java index aef002a576879..f7462584fa2f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.tsfile.enums.TSDataType; @@ -71,7 +71,7 @@ ColumnTransformer getBuiltInScalarFunctionColumnTransformer( /** * Construct a {@link Transformer} for this built-in function in {@link - * org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.IntermediateLayerVisitor} + * org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.IntermediateLayerVisitor} * * @param expression The FunctionExpression representing the scalar function * @param layerReader input reader diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java similarity index 69% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java index 6a9066dfa16cf..9892793baf3c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.CastFunctionHelper; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.DiffFunctionHelper; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.ReplaceFunctionHelper; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.RoundFunctionHelper; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.SubStringFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.DiffFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.ReplaceFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.RoundFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.SubStringFunctionHelper; public class BuiltInScalarFunctionHelperFactory { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/CastFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/CastFunctionHelper.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/CastFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/CastFunctionHelper.java index f3a541ab0b714..e9a3eb39fe0a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/CastFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/CastFunctionHelper.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CastFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.common.SessionInfo; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CastFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.CastFunctionTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/DiffFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/DiffFunctionHelper.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/DiffFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/DiffFunctionHelper.java index b39c515900405..02445b9ce54c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/DiffFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/DiffFunctionHelper.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DiffFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DiffFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.DiffFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java index 882eb58505be1..bb81afa54d272 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ReplaceFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ReplaceFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.ReplaceFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/RoundFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/RoundFunctionHelper.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/RoundFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/RoundFunctionHelper.java index 46eef5cf61250..480cf9c33937e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/RoundFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/RoundFunctionHelper.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RoundFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RoundFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.RoundFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java index a4b60cca2f03d..a251321b97265 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.SubStringFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.SubStringFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/other/CaseWhenThenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/CaseWhenThenExpression.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/other/CaseWhenThenExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/CaseWhenThenExpression.java index 6674e082f1eea..0fe1acae15657 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/other/CaseWhenThenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/CaseWhenThenExpression.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.other; - -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other; + +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/other/GroupByTimeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/GroupByTimeExpression.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/other/GroupByTimeExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/GroupByTimeExpression.java index 9d686300158ac..c6e6789a8286b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/other/GroupByTimeExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/GroupByTimeExpression.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.other; - -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other; + +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ternary/BetweenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/BetweenExpression.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ternary/BetweenExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/BetweenExpression.java index 3d18d9a9645cf..6f09047614ded 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ternary/BetweenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/BetweenExpression.java @@ -19,12 +19,12 @@ * */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.ternary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ternary/TernaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/TernaryExpression.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ternary/TernaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/TernaryExpression.java index dc29782ba349a..a6c3239ea5e7e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/ternary/TernaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/TernaryExpression.java @@ -19,13 +19,13 @@ * */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.ternary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/InExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/InExpression.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/InExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/InExpression.java index 3bf47238b782a..441fc56333c9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/InExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/InExpression.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.unary; - -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary; + +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/IsNullExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/IsNullExpression.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/IsNullExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/IsNullExpression.java index d34ac84e4b5f2..875f5139f74e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/IsNullExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/IsNullExpression.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.unary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/LikeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LikeExpression.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/LikeExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LikeExpression.java index 42f089140d377..3f1c351a8f8e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/LikeExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LikeExpression.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.unary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/LogicNotExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LogicNotExpression.java similarity index 72% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/LogicNotExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LogicNotExpression.java index e910eebb4d85e..47d83b4f5721c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/LogicNotExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LogicNotExpression.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.unary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/NegationExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/NegationExpression.java similarity index 75% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/NegationExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/NegationExpression.java index d13a1a9da9c51..17369a1f22fe0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/NegationExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/NegationExpression.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.unary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/RegularExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/RegularExpression.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/RegularExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/RegularExpression.java index 4d974f654048b..70581923c717b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/RegularExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/RegularExpression.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.unary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; import org.apache.tsfile.external.commons.lang3.Validate; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/UnaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/UnaryExpression.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/UnaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/UnaryExpression.java index 20fc66cc08d65..3659ce76433bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/unary/UnaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/UnaryExpression.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.unary; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java index 5bccacbb7fee9..ab85ec601b2ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.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.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectAggregationExpressionsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectAggregationExpressionsVisitor.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectAggregationExpressionsVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectAggregationExpressionsVisitor.java index bdb5094c2e3f8..30cfd786270c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectAggregationExpressionsVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectAggregationExpressionsVisitor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import java.util.Collections; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectSourceExpressionsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectSourceExpressionsVisitor.java similarity index 75% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectSourceExpressionsVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectSourceExpressionsVisitor.java index de09d3e78a232..761483dbb8cd2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectSourceExpressionsVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectSourceExpressionsVisitor.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import java.util.Collections; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectVisitor.java similarity index 77% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectVisitor.java index 05969a4402829..f8d1904558086 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CollectVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectVisitor.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ColumnTransformerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ColumnTransformerVisitor.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ColumnTransformerVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ColumnTransformerVisitor.java index 4722897fcce39..06d4b1971fe34 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ColumnTransformerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ColumnTransformerVisitor.java @@ -17,58 +17,58 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; - -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.TreeCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticDivisionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticModuloColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticMultiplicationColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticSubtractionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareLessThanColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.LogicAndColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.LogicOrColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.NullColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.TimeColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.MappableUDFColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.BetweenColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.ArithmeticNegationColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.InColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LikeColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.RegularColumnTransformer; -import org.apache.iotdb.db.queryengine.common.NodeRef; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; + +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LongDivisionLongColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LongModulusLongColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.TreeCaseWhenThenColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticDivisionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticModuloColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticMultiplicationColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticSubtractionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessThanColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.LogicAndColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.LogicOrColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.NullColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MappableUDFColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.BetweenColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.ArithmeticNegationColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.InColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LikeColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.RegularColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; @@ -84,7 +84,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType.BETWEEN; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.BETWEEN; import static org.apache.tsfile.enums.TSDataType.UNKNOWN; import static org.apache.tsfile.read.common.type.LongType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java index 8ef1018dfcb8c..772e0189bc328 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.metadata.view.BrokenViewException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ConcatDeviceVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ConcatDeviceVisitor.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ConcatDeviceVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ConcatDeviceVisitor.java index 351fb697a76ba..cf8244a92a60c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ConcatDeviceVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ConcatDeviceVisitor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; public class ConcatDeviceVisitor extends ReconstructVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CountTimeAggregationAmountVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CountTimeAggregationAmountVisitor.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CountTimeAggregationAmountVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CountTimeAggregationAmountVisitor.java index c3f5182fc56bc..afd25304d54b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/CountTimeAggregationAmountVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CountTimeAggregationAmountVisitor.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import java.util.Collections; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExistUnknownTypeInExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExistUnknownTypeInExpression.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExistUnknownTypeInExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExistUnknownTypeInExpression.java index 90630ae886dc6..92ebf3639259f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExistUnknownTypeInExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExistUnknownTypeInExpression.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionAnalyzeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionAnalyzeVisitor.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionAnalyzeVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionAnalyzeVisitor.java index fe2e76db8452b..e9b2019bf0f28 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionAnalyzeVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionAnalyzeVisitor.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import java.util.List; import java.util.stream.Collectors; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionNormalizeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionNormalizeVisitor.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionNormalizeVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionNormalizeVisitor.java index 54bea4dc9c35d..cc3c2851e928c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionNormalizeVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionNormalizeVisitor.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionVisitor.java similarity index 64% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionVisitor.java index 2e7ce20c82d37..1a0bec9dc6753 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionVisitor.java @@ -17,44 +17,44 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; - -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.DivisionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ModuloExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; + +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ArithmeticBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; /** * This class provides a visitor of {@link Expression}, which can be extended to create a visitor diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/GetMeasurementExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/GetMeasurementExpressionVisitor.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/GetMeasurementExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/GetMeasurementExpressionVisitor.java index b1f58d6545e36..7a15635b7857d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/GetMeasurementExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/GetMeasurementExpressionVisitor.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionTypeAnalyzer; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; public class GetMeasurementExpressionVisitor extends ReconstructVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/IntermediateLayerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/IntermediateLayerVisitor.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/IntermediateLayerVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/IntermediateLayerVisitor.java index 440007d1df6b3..759d0a14c5932 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/IntermediateLayerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/IntermediateLayerVisitor.java @@ -17,34 +17,34 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.common.NodeRef; +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.input.QueryDataSetInputLayer; import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.ConstantIntermediateLayer; import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.IntermediateLayer; import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.MultiInputLayer; import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.SingleInputMultiReferenceLayer; import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.SingleInputSingleReferenceLayer; -import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary.ArithmeticAdditionTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary.ArithmeticDivisionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/LowercaseNormalizeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/LowercaseNormalizeVisitor.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/LowercaseNormalizeVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/LowercaseNormalizeVisitor.java index fe54650651389..64fe89d0d4251 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/LowercaseNormalizeVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/LowercaseNormalizeVisitor.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReconstructVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReconstructVisitor.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReconstructVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReconstructVisitor.java index 4b4e05ef431c7..1e159ed488754 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReconstructVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReconstructVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; import org.apache.iotdb.db.utils.constant.SqlConstant; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/RemoveRootPrefixVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/RemoveRootPrefixVisitor.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/RemoveRootPrefixVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/RemoveRootPrefixVisitor.java index 8668f310f2bd3..b4d80f134d5ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/RemoveRootPrefixVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/RemoveRootPrefixVisitor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import static org.apache.iotdb.commons.schema.SchemaConstant.ROOT; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceLogicalViewVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceLogicalViewVisitor.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceLogicalViewVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceLogicalViewVisitor.java index 95a1a72cafb6e..96092383e6fac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceLogicalViewVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceLogicalViewVisitor.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.GetSourcePathsVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.TransformToExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java index d63de93bdde0c..5d9c642817969 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; import org.apache.iotdb.db.queryengine.plan.analyze.GroupByLevelHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; import java.util.function.UnaryOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java index 6c03a5a06a69c..9d52c0d3fa5de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java index c4e9257d952f8..18358df5e0ff5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.tsfile.write.schema.IMeasurementSchema; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/TransformToViewExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TransformToViewExpressionVisitor.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/TransformToViewExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TransformToViewExpressionVisitor.java index 09658f1154373..75f2ee419ebac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/TransformToViewExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TransformToViewExpressionVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.binary.arithmetic.AdditionViewExpression; @@ -45,33 +45,33 @@ import org.apache.iotdb.commons.schema.view.viewExpression.unary.LogicNotViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.unary.NegationViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.unary.RegularViewExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.DivisionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ModuloExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java index f4d37f85aee31..4ef553d02ad91 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.CompleteMeasurementSchemaVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CompleteMeasurementSchemaVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.TransformToExpressionVisitor; import org.apache.iotdb.db.utils.constant.SqlConstant; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java index 62c4217dee00a..49c16f76bdf75 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.external.commons.lang3.Validate; @@ -41,11 +41,11 @@ import java.util.List; import java.util.stream.Collectors; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructBinaryExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructTimeSeriesOperandsWithMemoryCheck; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; import static org.apache.iotdb.db.utils.TypeInferenceUtils.bindTypeForBuiltinAggregationNonSeriesInputExpressions; import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/CartesianProductVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/CartesianProductVisitor.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/CartesianProductVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/CartesianProductVisitor.java index ce2e508989e82..381ff5503d9d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/CartesianProductVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/CartesianProductVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionAnalyzeVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionAnalyzeVisitor; import java.util.ArrayList; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java index a1e46e593d22c..9bf57bf0274b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.external.commons.lang3.Validate; @@ -41,9 +41,9 @@ import java.util.List; import java.util.stream.Collectors; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; import static org.apache.iotdb.db.utils.TypeInferenceUtils.bindTypeForBuiltinAggregationNonSeriesInputExpressions; import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java index 2595e52fe9a3c..a1a79b8462249 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.tsfile.enums.TSDataType; @@ -32,7 +32,7 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; public class ConcatDeviceAndBindSchemaForHavingVisitor extends ConcatDeviceAndBindSchemaForExpressionVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java index 9f2b87b608ed5..ed5776255a599 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.tsfile.external.commons.lang3.Validate; @@ -37,10 +37,10 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructTimeSeriesOperandsWithMemoryCheck; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; public class ConcatDeviceAndBindSchemaForPredicateVisitor extends CartesianProductVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java index 3d998089f3dc3..5550930664587 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.common.constant.TsFileConstant; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/QueryContextProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/QueryContextProvider.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/QueryContextProvider.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/QueryContextProvider.java index 22b2b58145ad6..dbbee1bb0faff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/cartesian/QueryContextProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/QueryContextProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/LogicalAndVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalAndVisitor.java similarity index 73% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/LogicalAndVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalAndVisitor.java index 915642ad53690..21654f57e5879 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/LogicalAndVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalAndVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.logical; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionAnalyzeVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionAnalyzeVisitor; public abstract class LogicalAndVisitor extends ExpressionAnalyzeVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/LogicalOrVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalOrVisitor.java similarity index 73% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/LogicalOrVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalOrVisitor.java index e9e9fa7871000..31fd5bdb62ac4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/LogicalOrVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalOrVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.logical; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionAnalyzeVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionAnalyzeVisitor; public abstract class LogicalOrVisitor extends ExpressionAnalyzeVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java index 675a3c39538f3..e80d539593c41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.logical; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; public class PredicateCanPushDownToSourceChecker extends LogicalAndVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/TimeFilterExistChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/TimeFilterExistChecker.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/TimeFilterExistChecker.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/TimeFilterExistChecker.java index 1b5c8160381b6..5c7103a8b3fb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/logical/TimeFilterExistChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/TimeFilterExistChecker.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.logical; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; public class TimeFilterExistChecker extends LogicalOrVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java index 441337bd4aa1b..85586f180ffdc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java @@ -17,30 +17,30 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; import org.apache.iotdb.db.utils.DateTimeUtils; import com.google.common.io.BaseEncoding; @@ -65,7 +65,7 @@ import java.util.Set; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression.flipType; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression.flipType; import static org.apache.tsfile.enums.TSDataType.DOUBLE; import static org.apache.tsfile.enums.TSDataType.INT32; import static org.apache.tsfile.enums.TSDataType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java index 77ccb6695ea82..6748103aec15f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -17,27 +17,27 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate; - -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate; + +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.tsfile.enums.TSDataType; @@ -51,7 +51,7 @@ import java.util.TimeZone; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression.flipType; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression.flipType; import static org.apache.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG; public class ConvertPredicateToTimeFilterVisitor extends PredicateVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java similarity index 76% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java index 8ee8be0ef4802..1bf3a84a3ecd1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java @@ -17,26 +17,26 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate; - -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate; + +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; import static org.apache.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicateSimplifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateSimplifier.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicateSimplifier.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateSimplifier.java index 90596769414e1..24d4383b62230 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicateSimplifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateSimplifier.java @@ -17,35 +17,35 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.UnaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionAnalyzeVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ArithmeticBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionAnalyzeVisitor; import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate.ConvertPredicateToFilterVisitor.getValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.ConvertPredicateToFilterVisitor.getValue; public class PredicateSimplifier extends ExpressionAnalyzeVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateVisitor.java similarity index 61% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicateVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateVisitor.java index 6e3336bcd5b81..c3434c3150df4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/PredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateVisitor.java @@ -17,25 +17,25 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate; - -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ExpressionVisitor; +package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate; + +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; /** * This class provides a visitor of {@link Expression}, which can be extended to create a visitor diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java similarity index 71% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java index 2da98ce9dbf73..d873d1abe8be9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java @@ -17,25 +17,26 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.predicate; - -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +package org.apache.iotdb.db.queryengine.plan.expression.expression.visitor.predicate; + +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.PredicateVisitor; public class ReversePredicateVisitor extends PredicateVisitor { 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 8aa7b1a163166..415ab0e55548b 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 @@ -25,17 +25,17 @@ 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.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -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; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java index bb3b79af4ecd7..cf0717a2c8e55 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.optimization; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.CollectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java index 3bb5dee80a5cc..0bd88de4c052e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java @@ -23,8 +23,6 @@ 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.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; @@ -35,6 +33,8 @@ import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; 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 e523dcf0e28f9..c759ec67fc5c9 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 @@ -41,40 +41,14 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.DivisionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ModuloExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataTypeParameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.ConstantContext; @@ -97,14 +71,40 @@ import org.apache.iotdb.db.queryengine.execution.operator.window.ainode.TailInferenceWindow; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ColumnDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateView; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ViewFieldDefinition; import org.apache.iotdb.db.queryengine.plan.statement.AuthorType; import org.apache.iotdb.db.queryengine.plan.statement.Statement; @@ -308,7 +308,7 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.canPushDownLimitOffsetToGroupByTime; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.pushDownLimitOffsetToTimeParameter; import static org.apache.iotdb.db.queryengine.plan.relational.sql.parser.AstBuilder.lowerIdentifier; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java index 6bb58cd60783d..0c7b18544005d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java @@ -27,16 +27,16 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.SqlLexer; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.component.FromComponent; import org.apache.iotdb.db.queryengine.plan.statement.component.GroupByTimeComponent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index ac6c6e2b2f0ee..13de7172861e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -26,14 +26,13 @@ import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.TableDateBinTimeRangeIterator; @@ -92,7 +91,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.ConvertPredicateToTimeFilterVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; @@ -120,6 +118,8 @@ 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.statement.component.Ordering; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; 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 6e6480c7bec66..c9b0923cb1964 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 @@ -30,20 +30,20 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.template.Template; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; 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.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory; import org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesCountNode; 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 2b04bc5432fe6..5a6fa3c1a7bea 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 @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.TransformToViewExpressionVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.TransformToViewExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFileNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index 48dce74658872..1407bf79f1e6c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -30,21 +30,14 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ColumnTransformerVisitor; +import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; -import org.apache.iotdb.db.queryengine.common.NodeRef; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory; @@ -179,6 +172,12 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ColumnTransformerVisitor; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimatorFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; @@ -255,7 +254,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupBySessionParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByVariationParameter; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.IntoPathDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OutputColumn; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; @@ -267,6 +265,8 @@ import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; import org.apache.iotdb.db.queryengine.plan.statement.literal.Literal; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSourceType; import org.apache.iotdb.db.utils.columngenerator.ColumnGenerator; @@ -315,7 +315,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; import static org.apache.iotdb.db.queryengine.common.DataNodeEndPoints.isSameNode; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.calculateMaxAggregationResultSize; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.calculateMaxAggregationResultSizeForLastQuery; @@ -325,6 +324,7 @@ import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DELIMITER_BETWEEN_ID; import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DOWNSTREAM_PLAN_NODE_ID; import static org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils.convertPredicateToFilter; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor.getAggregationTypeByFuncName; import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions.updateFilterUsingTTL; import static org.apache.iotdb.db.queryengine.plan.statement.component.Ordering.ASC; 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 b8adcba520aaa..73ac215bf758d 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 @@ -20,16 +20,16 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; import org.apache.iotdb.db.utils.SchemaUtils; 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 6358a966b04a6..944a0ad2929dd 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 @@ -22,10 +22,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.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java index 53bcc7baba3e5..71dc7d115f7e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.tsfile.external.commons.lang3.Validate; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java index 03307f51aaa1e..f522c361c8f6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.plan.ClusterTopology; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.AbstractFragmentParallelPlanner; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java index f07edbf17f625..aeccd9b9e827d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java @@ -30,18 +30,18 @@ import org.apache.iotdb.commons.schema.table.Audit; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.ConcatDeviceVisitor; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.expression.expression.expression.multi.FunctionType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -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.TemplatedInfo; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ConcatDeviceVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.BaseSourceRewriter; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaFetchMergeNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java index 8d97570ba550d..75d9bba5b2ecc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.tsfile.read.filter.basic.Filter; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.java index 8a86fc6c8827e..a2ad33f17580d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.tsfile.read.filter.basic.Filter; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 fb7c228c562c9..e1365ab5e5065 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 @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; @@ -49,6 +49,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.CollectNode; @@ -91,7 +92,6 @@ 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.AggregationTreeDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java index 1e71100ce126a..5b9dff59f49a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; 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.parameter.OrderByParameter; 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 9820c24133fbf..adf84068fdb8a 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 @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; 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.SeriesAggregationSourceNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java index a0a707379e551..223163ff4813a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; 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.statement.component.Ordering; 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 2f90be6410a91..51352a1cc0af5 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 @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; 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.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java index f8e1fe81b7814..18b33e88985af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; 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.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java index 0a87a671d9bec..432496b483425 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/AlignedSeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java index fe11735c92cb6..bb6ef32e10887 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/LastQueryScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastQueryScanNode.java index 5d6aad7fff063..497829c013c2c 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 @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/LastSeriesSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java index f4a23e798a6a3..b21341c003eb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java index 30c1d092c2e7b..af660028678a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java @@ -22,11 +22,11 @@ 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.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/SeriesAggregationSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationSourceNode.java index 4dbab3b7e1ee1..e950d2ab6462e 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 @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java index 7d47431b4fd30..7f37b75264cc5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java @@ -22,11 +22,11 @@ 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.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/SeriesScanSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java index 477a8c0dffc42..3f619520ca1f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java index b20a26dde5661..8a2bb0c59bb5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java index ec1adf95003b1..68cc41c7b8195 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; 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/parameter/AggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java index e52e517f8c553..1d27848cb67f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java @@ -21,7 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java index c673c4ddf0bef..fac6a1be5e046 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java index 34d0fbea52c09..8cd35ccbcaf8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/OutputColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/OutputColumn.java index c84a8241fd238..a972c0689b380 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/OutputColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/OutputColumn.java @@ -18,6 +18,8 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; + import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java index 83545bc8c6720..ae1769cebd0a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; @@ -27,10 +28,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -40,21 +46,16 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import com.google.common.collect.ImmutableList; 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 9fc9e818ff394..bcb23b2af3eaa 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 @@ -24,14 +24,25 @@ import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.schema.table.InformationSchema; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.security.Identity; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; @@ -46,18 +57,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.security.Identity; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; -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.QuantifiedComparisonExpression; 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.RangeQuantifier; @@ -65,7 +67,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; 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.SubsetDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; 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 2b24cae6b3be6..e9eb139c0462b 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 @@ -20,12 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; -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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java index 3a63d8cbd3fb2..ef1f96fa14502 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import java.util.OptionalInt; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java index f0d6a68f32de3..d9bfcfd173c49 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java @@ -19,12 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 8f34de337cf5c..5b868c319e532 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; @@ -34,19 +35,25 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Columns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -57,13 +64,20 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StackableAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -83,23 +97,10 @@ 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.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Columns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import com.google.common.collect.HashMultimap; @@ -141,6 +142,7 @@ import static java.util.Collections.unmodifiableSet; import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression.isQualifiedAllFieldsReference; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.FOLLOWING; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.PRECEDING; @@ -154,7 +156,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isNumericType; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isTwoTypeComparable; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression.isQualifiedAllFieldsReference; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java index d9b0bcfeb2220..e2bd46ffeb618 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultExpressionTraversalVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java index 1c2ef2774b3ad..9cd6da921036c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java index 2ea2f5d80eef1..ef0f2bbae21dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java index ac5ab55413dfe..4e7c29c1d9374 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java @@ -20,12 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.Range; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java index 10aab2a88841d..f9a18dd2a78b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java index 69658c39dd313..41165800d94b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java index e3dba1c98b820..450b9bf93a607 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java index 0971d3412405a..82e3baf5acb84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index 040487addb670..3fff1617d7f1c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -25,19 +25,31 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllRows; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Columns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -48,13 +60,25 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Window; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -83,13 +107,10 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AbstractTraverseDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Columns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CopyTo; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateDB; @@ -102,7 +123,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateView; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DescribeTable; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB; @@ -114,17 +134,10 @@ 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.Except; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FetchDevice; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingElement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRow; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; @@ -139,20 +152,15 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; 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.RenameColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetOperation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetProperties; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDB; @@ -164,14 +172,11 @@ 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; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleGroupBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StartPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopPipe; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionArgument; @@ -184,11 +189,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Values; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Window; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowSpecification; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WrappedInsertStatement; @@ -272,6 +273,7 @@ import static org.apache.iotdb.commons.schema.table.TsTable.TABLE_ALLOWED_PROPERTIES; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction.TIMECOL_PARAMETER_NAME; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression.getQualifiedName; import static org.apache.iotdb.db.queryengine.execution.warnings.StandardWarningCode.REDUNDANT_ORDER_BY; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AggregationAnalyzer.verifyOrderByAggregations; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AggregationAnalyzer.verifySourceAggregations; @@ -284,7 +286,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.metadata.MetadataUtil.createQualifiedObjectName; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isTimestampType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression.getQualifiedName; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.FULL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.INNER; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.LEFT; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java index 842538431aecc..bd79521fcd497 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java @@ -32,6 +32,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -47,7 +48,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import com.google.common.collect.ImmutableList; import com.google.common.math.DoubleMath; @@ -76,7 +76,7 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.ConvertPredicateToTimeFilterVisitor.getLongValue; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java index c127cf71d368c..f86b74028c8ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java index 21b99e362817d..e93882ba70054 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import java.util.List; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java index 72abe93350982..9d8992ae3bb11 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java @@ -37,6 +37,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -53,7 +54,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import java.util.List; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java index bdd08f0e647f6..d3afbe8704996 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java @@ -36,6 +36,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -49,7 +50,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicateVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import javax.annotation.Nullable; @@ -62,7 +62,7 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java index 104ec8bed72f5..30818a634d0c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.tablefunction; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Relation; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/ColumnSchema.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/ColumnSchema.java index be1a83e78668c..709bc7b340c7a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/ColumnSchema.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/ColumnSchema.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.utils.TypeUtil; +import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java index 9bd5980faed5d..fd2e9e36411df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java @@ -28,13 +28,13 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.tsfile.file.metadata.IDeviceID; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java index 2872ea9ea9e7b..055f76a2a7a8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.common.SessionInfo; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java index aa50cfbc45d62..7932f8301624c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; 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 b5b2be960366e..89824d6aab463 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 @@ -41,6 +41,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.SubtractionResolver; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher; @@ -51,7 +52,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.utils.constant.SqlConstant; @@ -77,7 +77,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.tsfile.read.common.type.BinaryType.TEXT; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java index 03eb0baa00538..823e1e96b83dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java @@ -28,6 +28,7 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java index bcea7ed8daa51..48c0b0b8f5706 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.CastFunctionHelper; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.function.function.InterpretedFunctionInvoker; import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -35,6 +35,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -45,14 +46,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeCoercion; import com.google.common.collect.ImmutableList; @@ -80,9 +80,9 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.MINUS; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.PLUS; import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; public class IrExpressionInterpreter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java index c20ff30538077..f816aa424b801 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; @@ -39,6 +40,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -54,15 +56,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; 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.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeCoercionUtils; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java index 9d50c7658b665..e3d2a69932ea9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java @@ -19,7 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; public class OrderingTranslator { private OrderingTranslator() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java index 2631870290a38..99d035af37e99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.expression.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index d99e98445eeca..efe81a56de49b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -21,9 +21,11 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Aggregation; @@ -41,12 +43,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -54,20 +59,16 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.GroupingSetAnalysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.FieldId; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.RelationType; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GapFillStartAndEndTimeExtractVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QueryBody; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; import com.google.common.collect.ImmutableList; @@ -100,6 +101,7 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.lang.String.format; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.groupingSets; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; @@ -113,7 +115,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingTranslator.sortItemToSortOrder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware.scopeAwareKey; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator.GROUP_KEY_SUFFIX; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GapFillStartAndEndTimeExtractVisitor.CAN_NOT_INFER_TIME_RANGE; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; 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 8044f661ebd7c..76065b0a24e09 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 @@ -22,9 +22,11 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -33,6 +35,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.AggregationLabelSet; @@ -44,14 +48,18 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.LogicalIndexPointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.MatchNumberValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.RowPatternToIrRewriter; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -69,7 +77,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Field; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.ClassifierDescriptor; @@ -89,17 +96,14 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; 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.RowsPerMatch; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.rowpattern.RowPatternToIrRewriter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Except; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRow; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertTablet; @@ -112,15 +116,12 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; 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.RowPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetOperation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java index 30916287aaf38..e95d2f25cf768 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.CanonicalizationAware; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.ResolvedField; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import java.util.OptionalInt; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java index 44fa109838de9..0235983fa113a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java @@ -20,35 +20,35 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; 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.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Field; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.RelationType; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; import org.apache.iotdb.db.queryengine.plan.relational.planner.QueryPlanner.PlanAndMappings; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -71,9 +71,9 @@ import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression.Quantifier.ALL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware.scopeAwareKey; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression.Quantifier.ALL; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; class SubqueryPlanner { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java index 61b8d1f5b16e4..5d4ecc84b0d41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Field; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java index b3916d45a8305..ca5fed1b160d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java @@ -20,19 +20,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultExpressionTraversalVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultTraversalVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; 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 1c99a379e5357..c0777ade0bf10 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 @@ -24,7 +24,9 @@ import org.apache.iotdb.commons.client.IClientManager; import org.apache.iotdb.commons.client.async.AsyncDataNodeInternalServiceClient; import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.QueryStateMachine; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; @@ -36,7 +38,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analyzer; -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.planner.distribute.TableDistributedPlanner; @@ -44,7 +45,6 @@ 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; -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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java index d1db6b788ce5c..07a18eed4b08c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java @@ -19,24 +19,24 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.ResolvedField; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -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.util.AstUtil; import com.google.common.collect.ImmutableMap; 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 1df79fc6881fe..d04a425307777 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 @@ -41,6 +41,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; @@ -87,7 +88,6 @@ 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.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java index 12593f5cfd23f..9771240137076 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java @@ -34,8 +34,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; public abstract class DefaultTraversalVisitor extends AstVisitor { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java index 7edfd9538e213..6506921ea9884 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java @@ -27,11 +27,16 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -40,20 +45,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; public class ExpressionRewriter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java index de9427a7e4711..bcbe3f530360e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java @@ -28,11 +28,17 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataTypeParameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -41,24 +47,18 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TypeParameter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java index 64a61c4d2675f..46c1494f5ec50 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java @@ -40,7 +40,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; public class GapFillStartAndEndTimeExtractVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java index b62e49a675a4d..a3b8ec485dd9d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.node_commons.plan.expression.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; @@ -38,6 +37,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java index 36ab8923f58c7..a69fc60cd2193 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java @@ -19,21 +19,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.relational.planner.NoOpSymbolResolver; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java index e8281c3e4643c..65e9376163689 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java index 05f507126104c..aff114c7ea926 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java @@ -23,15 +23,18 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; @@ -40,10 +43,7 @@ import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java index f2504a4b1c6d4..a2cca3c07370b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java @@ -29,13 +29,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java index df0e8bf08b087..dfdf91929e7f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java @@ -29,10 +29,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java index 57ac120e8b965..0fee749fb87e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java @@ -27,9 +27,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java index 2ac7db35e454f..e43afc1b609ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java @@ -21,10 +21,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java index d356987b5aebb..6b5647159d256 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java @@ -21,11 +21,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; @@ -41,7 +41,7 @@ import java.util.concurrent.atomic.AtomicReference; import static com.google.common.collect.Iterables.getOnlyElement; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; /** * This rule prepares cartesian product of partitions from all inputs of table function. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java index 7ee37c186afee..f96aa5741cb25 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java @@ -21,8 +21,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java index 83ca9663f5d40..eed7cf2d414e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java index f7dcfbca4fd34..fac70eea82c4c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java @@ -29,10 +29,10 @@ import com.google.common.collect.ImmutableSet; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch.ONE; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictChildOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.PatternRecognition.rowsPerMatch; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.patternRecognition; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch.ONE; /** * This rule restricts the inputs to PatternRecognitionNode based on which symbols are used by the diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java index 4492a11f98abe..bdd8f1e06a534 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java index f5bbb71860849..d5983ac2a4902 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java index 2b289673950de..157c20c2f7c67 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java @@ -27,6 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; @@ -42,7 +43,6 @@ import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.utils.constant.SqlConstant; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java index 62732d4af05b1..fd2409116f241 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.relational.planner.LiteralEncoder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java index 4f2fc0a1e985d..578bf290bb905 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java @@ -24,11 +24,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java index 308d049a4f8c0..b792610ece053 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java index 1bb25ae9a4720..3d40d67fd2d74 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java @@ -24,12 +24,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java index 750b9fb34d0d3..8a61487f6b52d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java @@ -24,12 +24,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java index 702e2e7aaea69..ec06d7c36958e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java @@ -24,11 +24,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java index 68408395fe5c8..f2808d333bdaf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java index 909230d171b71..8fe8d2b356f5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index ded0c1dc99abb..21e712beb88a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -23,20 +23,20 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; @@ -50,13 +50,13 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanNodeSearcher.searchFrom; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.LongType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java index 816f5a973058d..22b3b695569da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java index f896c676cb163..268d212544e5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java index 202344a504fb5..2739ea811f02c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java @@ -27,9 +27,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.utils.cte.CteDataStore; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java index a5fa5cd8bd1ab..0a210a46269f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; @@ -40,6 +41,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java index 676100e466127..988bebe8d6e3a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java index 59b330d98c6bd..f50bde336d234 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; @@ -36,7 +37,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; import java.util.List; 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 0cf9b91296540..c439f6df96ede 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 @@ -27,8 +27,10 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; @@ -53,7 +55,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.ConvertPredicateToTimeFilterVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicateCombineIntoTableScanChecker; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoMetadataChecker; @@ -65,7 +66,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ReplaceSymbolInExpression; @@ -108,6 +108,9 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ATTRIBUTE; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.FULL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; @@ -118,9 +121,6 @@ import static org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet.SCHEMA_FETCHER; import static org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeVisitor.getTimePartitionSlotList; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.DESC_NULLS_LAST; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor.extractUnique; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.extractGlobalTimeFilter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java index f8afb1dfb30d9..b0e14bd14f207 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; @@ -42,7 +43,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java index c96dfd56e8e10..32e0fcd0302bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; @@ -35,13 +36,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.SimplePlanRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; 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 a622b014c7ab2..e42a9aedc3d1c 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 @@ -27,6 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -62,7 +63,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java index 7761b742dbf05..0f7fdf35a3ae5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java @@ -17,9 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.rowpattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAlternation; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAnchor; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAnchor.Type; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrConcatenation; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrEmpty; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrExclusion; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrPermutation; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantified; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.Range; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AnchorPattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java index 0323f4ef1769e..2a47302011d15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultTraversalVisitor; -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.ImmutableMap; 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 eb03d4e09faeb..ecd4bef96a726 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 @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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 0c0f56f01dfb3..0d7e4c97497ad 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 @@ -22,6 +22,7 @@ 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.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java index 63bbc7d46255a..0a8930490cdd3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java @@ -19,9 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java index b6c7a8d14a2ec..2e4b93b35377e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java index dd11d60a5c0a2..ff1c3f5885e6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java @@ -19,10 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java index 237a855ff4e58..d4c4b2970651f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java index a50cafd47f071..881741ee0986b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java index ce3e0fa0889a7..dcccb6df04e9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; 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 7c780556ffd02..bb2c56bcc33fe 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 @@ -19,7 +19,6 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; public abstract class AstVisitor extends CommonQueryAstVisitor { @@ -88,10 +87,6 @@ protected R visitFill(Fill node, C context) { return visitNode(node, context); } - protected R visitOrderBy(OrderBy node, C context) { - return visitNode(node, context); - } - protected R visitOffset(Offset node, C context) { return visitNode(node, context); } @@ -100,10 +95,6 @@ protected R visitLimit(Limit node, C context) { return visitNode(node, context); } - protected R visitAllRows(AllRows node, C context) { - return visitExpression(node, context); - } - protected R visitQuerySpecification(QuerySpecification node, C context) { return visitQueryBody(node, context); } @@ -124,62 +115,18 @@ protected R visitExcept(Except node, C context) { return visitSetOperation(node, context); } - protected R visitWhenClause(WhenClause node, C context) { - return visitExpression(node, context); - } - protected R visitProcessingMode(ProcessingMode node, C context) { return visitNode(node, context); } - protected R visitInListExpression(InListExpression node, C context) { - return visitExpression(node, context); - } - - protected R visitIdentifier(Identifier node, C context) { - return visitExpression(node, context); - } - - protected R visitDereferenceExpression(DereferenceExpression node, C context) { - return visitExpression(node, context); - } - protected R visitWindowDefinition(WindowDefinition node, C context) { return visitNode(node, context); } - protected R visitWindowReference(WindowReference node, C context) { - return visitNode(node, context); - } - - protected R visitWindowSpecification(WindowSpecification node, C context) { - return visitNode(node, context); - } - - protected R visitSelectItem(SelectItem node, C context) { - return visitNode(node, context); - } - protected R visitSingleColumn(SingleColumn node, C context) { return visitSelectItem(node, context); } - protected R visitAllColumns(AllColumns node, C context) { - return visitSelectItem(node, context); - } - - protected R visitParameter(Parameter node, C context) { - return visitExpression(node, context); - } - - protected R visitSubqueryExpression(SubqueryExpression node, C context) { - throw new SemanticException("Only TableSubquery is supported now"); - } - - protected R visitSortItem(SortItem node, C context) { - return visitNode(node, context); - } - protected R visitTable(Table node, C context) { return visitQueryBody(node, context); } @@ -200,14 +147,6 @@ protected R visitJoin(Join node, C context) { return visitRelation(node, context); } - protected R visitExists(ExistsPredicate node, C context) { - return visitExpression(node, context); - } - - protected R visitFieldReference(FieldReference node, C context) { - return visitExpression(node, context); - } - protected R visitColumnDefinition(ColumnDefinition node, C context) { return visitNode(node, context); } @@ -396,38 +335,6 @@ protected R visitUpdateAssignment(UpdateAssignment node, C context) { return visitNode(node, context); } - protected R visitGroupBy(GroupBy node, C context) { - return visitNode(node, context); - } - - protected R visitGroupingElement(GroupingElement node, C context) { - return visitNode(node, context); - } - - protected R visitGroupingSets(GroupingSets node, C context) { - return visitGroupingElement(node, context); - } - - protected R visitSimpleGroupBy(SimpleGroupBy node, C context) { - return visitGroupingElement(node, context); - } - - protected R visitQuantifiedComparisonExpression(QuantifiedComparisonExpression node, C context) { - return visitExpression(node, context); - } - - protected R visitDataTypeParameter(DataTypeParameter node, C context) { - return visitNode(node, context); - } - - protected R visitNumericTypeParameter(NumericParameter node, C context) { - return visitDataTypeParameter(node, context); - } - - protected R visitTypeParameter(TypeParameter node, C context) { - return visitDataTypeParameter(node, context); - } - protected R visitShowFunctions(ShowFunctions node, C context) { return visitStatement(node, context); } @@ -608,10 +515,6 @@ protected R visitRemoveRegion(RemoveRegion node, C context) { return visitStatement(node, context); } - protected R visitColumns(Columns node, C context) { - return visitExpression(node, context); - } - protected R visitSetSqlDialect(SetSqlDialect 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/ClearCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java index 18ac8abb805b1..7627812ea3a47 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.schema.cache.CacheClearOptions; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java index 25da5affc1ca2..7222e8494cdbd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java @@ -20,9 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java index c8bacb7fe922e..42a9c30d0fe32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java index 5ae24c9711983..b4770de97ff6c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java index 712a77c9161f5..58ae4c847b1db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java index c1e2c32bfcfe1..d6d33db8a586e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java index 449a004c98b95..def3908cb13da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java @@ -19,9 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java index f082461d9c855..ba5763f160a29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java index 2599770de94c0..f52ed5ad8614c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java index af88f3d0728f3..00d976dfe9496 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java index dd7e8966a873c..f2aa93feb8b29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java index c55c753309a0a..9f9e1e0c22a28 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java @@ -19,9 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java index 43c4d2ac93eb3..9e21dcc61cdfa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java index 0b6021778f762..ed8e6fe0cd924 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java index 84da5662ecc26..599435079d31c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java @@ -20,9 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java index 00c9b8a17b0c6..74b01e7d2ac5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java index 7dc361affe48b..611937ae2d734 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java index 127178e97c8b4..6cdaddb9bf93b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; + /** When walking Expressions, don't traverse into SubqueryExpressions */ public abstract class DefaultExpressionTraversalVisitor extends DefaultTraversalVisitor { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java index c52addca99dcc..01276a9112724 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java @@ -19,16 +19,23 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -37,10 +44,17 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; public abstract class DefaultTraversalVisitor extends AstVisitor { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java index 57cbfde4850f6..dd39c7e088fe2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; 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 5befa0987a08e..45deb5b94fb27 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 @@ -24,12 +24,11 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceBlackListConstructor; @@ -38,9 +37,10 @@ import org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeUtils; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; 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.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.rescon.MemSchemaRegionStatistics; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.storageengine.dataregion.modification.ModEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java index 8eb5a7b50b305..5a70ca95b335f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java @@ -19,9 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java index 715cd5b7ae287..07768d80f12ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java @@ -19,9 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java index 1274a84e4c8ee..daba3a5494b2c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java index 1c0517ae7b4af..493ffffc5b78a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java index 34944cdb775da..e0262d42846b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java index 2da5f5eec8cb4..3b3f8c4aa1487 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java @@ -19,9 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java index 7490a195700c2..98932ea309e93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java index 2ed092f7055e0..9f3c4e466f584 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java index 14d4e8b61f3a8..12eff1c1cfe29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java index 338e401692504..7ecc0019eb44f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java index ce32dca6cd781..06d59f72d42a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java @@ -19,9 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java index b714e40202239..285421d8bed9a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java index 5f722913ab830..34e4fbf0f6cde 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java index fe91668020b7f..278b50b2f87ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java index 8fea448bfc1ad..5bf356f0ed09d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java index ca4804513ca2b..f1647bb741825 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java index cc78bc12bb126..1b22e728dd3b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java index 8a2298d2e635b..ec4abce3f2601 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java index 3f3a1ffc2547a..ab413356af830 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java index 418badeeb66bd..1ba6993101178 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java index 588530279f892..3956d6386f3b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java index ec0e74e904390..9d3686f7087f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java index a30bc09f81943..4850a1add8ced 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java @@ -20,8 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.LongType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java index e140260249a94..d81813f3c5d6b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java index 23dd3e4990e7d..b1656832c6376 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java index 097353843043f..ae2aad9128d16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java index 021301187a680..06b25ce92f786 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; 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 index e42e28e631ea1..0e3f68b671d88 100644 --- 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java index 57f1195d63cf9..65addf5c4ead9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java @@ -19,11 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllRows; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java index 9b54c882b5670..99fb1d739f275 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java index e827226a38808..482417ef16997 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java index fffd801230e83..a8f640d575df3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java @@ -19,8 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java index d1dce0ee121d5..3edf5887cd9bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java index 67aefccafb44f..05ae2b9cb5293 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java @@ -19,11 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java index 2796d11010a01..57b3bd52ff997 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java index a212893bca35b..237c1bf7b0e4d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java index e3a83bcf0fbb7..3466e3d42545b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java index c63a0f96cd6cb..90901c9f7e333 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java index 66ee566312ed7..259904fffbed2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java @@ -19,10 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java index be1597fc95299..16ca5a93fd306 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java index d97e5d9da3086..f90d3137be8d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java index 2002d3c4b56cd..1ca9a088a7450 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java index 68a480ab866ec..0f1784c087b41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java index 9dc31502de199..3d1996a916267 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java @@ -19,8 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java index 5f46277e405cf..4c863497f7d48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java index 976f621e411c2..bd0cdafff8770 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java @@ -19,9 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.utils.cte.CteDataStore; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java index d91f2b7e88f73..e11fe35e88aeb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java @@ -19,10 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java index 035cd678eb857..ce73d6fdd94b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java index 52e0411f28390..ab3f08aa8182c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java index 842002c501a9f..1b6ad273637bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.utils.AuthUtils; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.db.auth.AuthorityChecker; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java index 2c83f0085be58..f9f80cc326f52 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java index 4955f4b25798e..0f3417e575767 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java index 8ad2dabe70ad1..467d8da30087c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java index c108f9e11fdb1..83d1c6213923d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java index 68bf883f82bda..9245744fb3eb8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java @@ -20,9 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java index 460cd021e9224..a0513c321598e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java @@ -20,9 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java index 54d6f7e3b9c3f..8d643d61826d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java @@ -19,9 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java index 9861bc265e02a..5cef04303f08d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java @@ -19,9 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java index 4b1aaf82a86b2..01cc47b33af2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java @@ -19,9 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java index 5e25de19134eb..0d14ab30fec8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java index 7b62628d48a85..b36e10a4d39f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java @@ -19,9 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java index 8a6f77edce9eb..aef6e97843c34 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java index 79f1b43c3ffbf..10620d72ed6f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java index 3742aa54de44c..19c8bfa0fb08f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java index 27487d2a4f47e..31e64edc2dbda 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java index eba2397f5accc..2f922692317bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java index 7c49ae201184e..17a2b1aa2f0a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java index 2e22cfacdc3a2..e494af3156874 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java index 8505044d4ff7d..63c2a59d37d92 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java index 342958953bbdf..4e9b62d5e1089 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java index 0527aa7ffa2b9..22b3d3965facd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java index b59d745d17d52..1beef13f01a8a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java index 59cf7f202c167..a418282a8fc4f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; 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 7956610522779..ea7bf10ebf56e 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 @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java index b8762fc2867d5..0cee6ce66389f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java index 7a2dd4084ed71..b013f0c052426 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java index 82979deeafeeb..06e3161e9b348 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java @@ -19,9 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java index 878c8fd843e1d..e6909ec5d28a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java index 18795a97985ee..84a892620928a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java index 1d9c456f1261b..3155af37d4be1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java index 1d3ea3fb9061e..905f59a9ba410 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java index 6f19b37f3bc2a..78dfc6e6dfee2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java index 20bb339b12f5e..1d85bafc0403a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; 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 index 30e2a5980bcb1..890d26803e014 100644 --- 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 @@ -19,10 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java index f22489c374d9c..34a8c35e8b389 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java index 27c8e4b5c3e99..a1779fb6c45a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java index 7e75a5509ead1..32f83e9cb8447 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java index 5a080b3a7768f..a7782f0a68331 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java index c1787e118a959..1df4804300f0a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java index bc29707118436..da393d9dfe205 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java @@ -19,10 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java index 6f4ad9cd9970a..be44c5e61a838 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java index fbac4afabd513..c4ec97630b4f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java index 73a542ec7ff60..03990061ebb36 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java index b6567062d8ae2..a3e25673b4237 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java index dc1764f26c75c..2f3236436b395 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java index 4a88598123696..8a5ad1c75ac96 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java index 36ef865bfffdf..51d492795f8a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java @@ -19,9 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java index 67b4eff50eb1b..25f4b1a05b8c2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java @@ -19,8 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java index 6045e3c7f8e4b..433936dd6799a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java @@ -19,9 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java index 1080c2a36ac63..fd88e7495b07f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java @@ -19,10 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -33,7 +35,7 @@ import java.util.stream.Collectors; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.ExpressionFormatter.formatSortItems; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter.formatSortItems; public class TableFunctionTableArgument extends Node { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java index 7b10cad2e20b9..b322a0cd35514 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java index c5c410d6fc7a2..31991cf79f8f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java index a121a60bcb748..74c23aaca92e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java index d3dc492a48217..5054e062098e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java index 48dabe19b669b..9fafb5243717d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java index 2a73b2a58a779..d5d6f52d75894 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java index 5b00d5b201ded..bdd1f249e5f40 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java index 21f5bb5c494c1..c5837963f24a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java index a5a6ea558d736..2be9e0f759fae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java @@ -19,8 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java index b1397805be829..772b5ae7321ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java index 379839780f978..4adadc82afd9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java @@ -19,9 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java index 6abaf10d81eae..1682de9bb33c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java index 63601e78a6a18..312b758b672a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java @@ -19,7 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java index 8404d7f74ecaf..113905c8a3b55 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java index 7671f33cd261b..e14915b874369 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; 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 e56350cd4f8f5..d5e23cd700c6b 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 @@ -34,6 +34,8 @@ import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllRows; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; @@ -41,18 +43,27 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Columns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataTypeParameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -65,19 +76,31 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Window; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterColumnDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; @@ -85,7 +108,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ClearCache; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ColumnDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Columns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CopyTo; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountStatement; @@ -99,11 +121,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTopic; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTraining; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateView; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataTypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Deallocate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DescribeTable; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB; @@ -120,17 +140,11 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExcludedPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Execute; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExecuteImmediate; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExtendRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Flush; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingElement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; @@ -146,11 +160,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MigrateRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OneOrMoreQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternAlternation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternConcatenation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternPermutation; @@ -161,8 +172,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Prepare; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QueryBody; @@ -179,7 +188,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetColumnComment; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetConfiguration; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetProperties; @@ -215,23 +223,19 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTopics; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVariables; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVersion; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SimpleGroupBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StartPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StartRepairData; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopRepairData; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionArgument; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TypeParameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UnloadModel; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; @@ -240,11 +244,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Values; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ViewFieldDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Window; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowReference; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowSpecification; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ZeroOrMoreQuantifier; @@ -313,6 +313,10 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets.Type.CUBE; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets.Type.EXPLICIT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets.Type.ROLLUP; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName.mapIdentifier; import static org.apache.iotdb.db.queryengine.plan.execution.config.TableConfigTaskVisitor.DATABASE_NOT_SPECIFIED; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.SERVICE_MANAGEMENT_NOT_SUPPORTED; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.parseDateTimeFormat; @@ -322,16 +326,12 @@ import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_END; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_START; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn.constructAsofJoinOn; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets.Type.CUBE; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets.Type.EXPLICIT; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupingSets.Type.ROLLUP; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_OMIT_EMPTY; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_SHOW_EMPTY; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_WITH_UNMATCHED; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode.Mode.FINAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode.Mode.RUNNING; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName.mapIdentifier; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.skipPastLastRow; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.skipToFirst; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.skipToLast; 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 index 9ec0259779d4d..16c3546bc8626 100644 --- 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 @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; 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.AllColumns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountStatement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -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.Select; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowExternalService; 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 index 32539fd6d224c..ee8fd1fad6b56 100644 --- 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite; +import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; 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.Parameter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java index b564204cc78b4..1427e650045b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java @@ -22,12 +22,12 @@ import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import com.google.common.graph.SuccessorsFunction; import com.google.common.graph.Traverser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java index c57fa1d879b5b..e598c716d21b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java @@ -21,31 +21,31 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.GroupBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QueryBody; 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.Select; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowDefinition; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java index cf4aaa5b86b9c..41ae4dd125f35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java index 22fd95a883baf..3d2dd14ca9d85 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AnchorPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.EmptyPattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java index 28529fe701758..da435e3b4b28e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java @@ -19,12 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; @@ -50,7 +55,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join; @@ -61,10 +65,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; 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; @@ -73,7 +75,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetColumnComment; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetProperties; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetTableComment; @@ -121,8 +122,8 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.joining; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.ExpressionFormatter.formatGroupBy; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.ExpressionFormatter.formatOrderBy; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter.formatGroupBy; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter.formatOrderBy; import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.RowPatternFormatter.formatPattern; public final class SqlFormatter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/NamedTypeSignature.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/NamedTypeSignature.java index b0b8e76edc68f..0c65cca60639c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/NamedTypeSignature.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/NamedTypeSignature.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.type; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; + import com.google.errorprone.annotations.Immutable; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeCoercion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeCoercion.java index 8f243ef4b0fce..938aa9978c3c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeCoercion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeCoercion.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.type; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; + import org.apache.tsfile.read.common.type.Type; import java.util.function.Function; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeManager.java index a39947aa4d3c8..89a6a9395c4f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeManager.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.type; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; + import org.apache.tsfile.read.common.type.Type; public interface TypeManager { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeNotFoundException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeNotFoundException.java index 99df1101bda46..40fd2c9e50d71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeNotFoundException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeNotFoundException.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.type; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.rpc.TSStatusCode.TYPE_NOT_FOUND; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureParameter.java index 9f12515e874a2..f7475c544a59b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureParameter.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.type; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; + import com.google.errorprone.annotations.Immutable; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java index b7518d2411517..5febbd33fecfa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.utils; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java index 8f4620d64c752..2049b6d5dfa8c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; public abstract class GroupByComponent extends StatementNode { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java index 9d1e5f27fe209..9d441c7c89110 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; public class GroupByConditionComponent extends GroupByComponent { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java index 5b8b6360337b8..e6fcb88d98981 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; /** This class maintains information of {@code HAVING} clause. */ diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java index 69aacd46905a3..878b95515e617 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java index 2e54f22346918..4bee56ea22022 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java index 6e9436c6c2bff..f6daf263e0be8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java index 5539cf79b9fdf..0e20be2b33925 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java index 9fe3f346369d9..c45c1f97e5d5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java index d97032d2c0662..d581a6df2cc3d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; /** This class maintains information of {@code WHERE} clause. */ diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java index b0e83a5eb7153..101055a8ad998 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java @@ -28,11 +28,11 @@ import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.schemaengine.schemaregion.attribute.update.UpdateDetailContainer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java index 554ae1b273fa6..92ad2c33ae839 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java @@ -21,13 +21,13 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.CountTimeAggregationAmountVisitor; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType; import org.apache.iotdb.db.queryengine.execution.operator.window.ainode.InferenceWindow; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CountTimeAggregationAmountVisitor; import org.apache.iotdb.db.queryengine.plan.statement.AuthorityInformationStatement; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java index 2f44a61e98316..716f062dd62ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.metadata.view; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.IConfigStatement; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java index 0fce97ee402aa..dbb5461d61282 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.exception.metadata.view.UnsupportedViewException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.analyze.SelectIntoUtils; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java index 6c8bb616d6c79..b92a4c035a065 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.transformation.dag.builder; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.IntermediateLayerVisitor; -import org.apache.iotdb.db.queryengine.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.IntermediateLayerVisitor; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.input.QueryDataSetInputLayer; import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.IntermediateLayer; -import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/binary/factory/factory/HmacStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/binary/factory/factory/HmacStrategiesFactory.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/binary/factory/factory/HmacStrategiesFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/binary/factory/factory/HmacStrategiesFactory.java index 27db408707181..2fe9d6527b5a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/binary/factory/factory/HmacStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/binary/factory/factory/HmacStrategiesFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/AbstractCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/AbstractCaseWhenThenColumnTransformer.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/AbstractCaseWhenThenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/AbstractCaseWhenThenColumnTransformer.java index 387ebf55f8478..24f7963f7c660 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/AbstractCaseWhenThenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/AbstractCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ColumnCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnCache.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ColumnCache.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnCache.java index ed4ef91325712..5b23084ac132b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ColumnCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnCache.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnTransformer.java index 564bbda585b2a..c3137e9628f7a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.NullColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.NullColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/FailFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/FailFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/FailFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/FailFunctionColumnTransformer.java index 907595bebeeee..8ff4c7f5b036b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/FailFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/FailFunctionColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/TableCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TableCaseWhenThenColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/TableCaseWhenThenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TableCaseWhenThenColumnTransformer.java index 2381cd3db4471..d99bb54ffdf4d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/TableCaseWhenThenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TableCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/TreeCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TreeCaseWhenThenColumnTransformer.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/TreeCaseWhenThenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TreeCaseWhenThenColumnTransformer.java index d82503be22625..40f02fca4244b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/TreeCaseWhenThenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TreeCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java index d4a0388d94cf8..2cbab868b84cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java index a84efd6034194..2c3f65842d834 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java index fd940d1ef6124..d25e1417a37ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticModuloColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticModuloColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticModuloColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticModuloColumnTransformer.java index 9014604689199..1854fcd1655ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticModuloColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticModuloColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java index 467f12c0f09e7..9223368d5cf9b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java index 5beb8f666de8a..06f7a9f0896ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/BinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/BinaryColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/BinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/BinaryColumnTransformer.java index 10933ee7f25ee..722965c34230e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/BinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/BinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareBinaryColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareBinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareBinaryColumnTransformer.java index 9f00dfccdd9f3..2fc5f47a20b96 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareBinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareEqualToColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareEqualToColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareEqualToColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareEqualToColumnTransformer.java index 23dbea307ab99..bd4b3f99f59f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareEqualToColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareEqualToColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java index b9e957f1e198a..effaea54d6d72 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareGreaterThanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterThanColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareGreaterThanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterThanColumnTransformer.java index 9a1e385edbd9a..cdd5092b03ef3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareGreaterThanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterThanColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareLessEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessEqualColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareLessEqualColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessEqualColumnTransformer.java index 46b26242a07b9..53964b6e8ccc4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareLessEqualColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareLessThanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessThanColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareLessThanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessThanColumnTransformer.java index 61cb14254a9b3..ee0aea5207457 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareLessThanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessThanColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareNonEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareNonEqualColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareNonEqualColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareNonEqualColumnTransformer.java index 7864eb4aacb30..5414fa9a6cdd2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/CompareNonEqualColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareNonEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/HmacColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/HmacColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/HmacColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/HmacColumnTransformer.java index 2982407ab3d3b..ad4eacdc8ed7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/HmacColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/HmacColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class HmacColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/Like2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/Like2ColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/Like2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/Like2ColumnTransformer.java index b5457714bb083..ea60f1159c520 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/Like2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/Like2ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicAndColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicAndColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicAndColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicAndColumnTransformer.java index 2592b5348ff72..4b93435024f75 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicAndColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicAndColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicBinaryColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicBinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicBinaryColumnTransformer.java index 6f7ef4538a362..5bf73f07ed444 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicBinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicOrColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicOrColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicOrColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicOrColumnTransformer.java index c4a2e6b313a1a..fe4b6156ccf1c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/LogicOrColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicOrColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/strategies/HmacStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/strategies/HmacStrategy.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/strategies/HmacStrategy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/strategies/HmacStrategy.java index 35f6d575f3c25..237004e818fa5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/binary/strategies/HmacStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/strategies/HmacStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies; @FunctionalInterface public interface HmacStrategy { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/ConstantColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/ConstantColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/ConstantColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/ConstantColumnTransformer.java index 8c1f3bc2ce1e0..14207917ac3b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/ConstantColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/ConstantColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/IdentityColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/IdentityColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/IdentityColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/IdentityColumnTransformer.java index 51cddb5a62a3c..5a7b27f51632d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/IdentityColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/IdentityColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/LeafColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/LeafColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/LeafColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/LeafColumnTransformer.java index 6b00fe6fe5874..4cfe57c571e4a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/LeafColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/LeafColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/NullColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/NullColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/NullColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/NullColumnTransformer.java index 19073532bbe36..04add40c52825 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/NullColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/NullColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf; import org.apache.tsfile.read.common.block.column.NullColumn; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/TimeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/TimeColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/TimeColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/TimeColumnTransformer.java index 3d1fa1a5ae2ec..e20aa79652ea6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/leaf/TimeColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/TimeColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java index 288c2bb5c7827..a835c8d0a697d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BinaryGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryGreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BinaryGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryGreatestColumnTransformer.java index 259099081fe07..7557522e36120 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BinaryGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BinaryLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryLeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BinaryLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryLeastColumnTransformer.java index c21df790bdc1e..028322d39856f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BinaryLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BooleanGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanGreatestColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BooleanGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanGreatestColumnTransformer.java index e4dd34cfc1579..6d2e18117f75a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BooleanGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BooleanLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanLeastColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BooleanLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanLeastColumnTransformer.java index e7f770f9b992b..f72506711a9f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/BooleanLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/CoalesceColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/CoalesceColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/CoalesceColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/CoalesceColumnTransformer.java index 4c7c3e8cd4533..298f7d1b5b13c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/CoalesceColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/CoalesceColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/DoubleGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleGreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/DoubleGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleGreatestColumnTransformer.java index dbcdadc4f4d21..114346fe77930 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/DoubleGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/DoubleLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleLeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/DoubleLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleLeastColumnTransformer.java index 039c76d895bcc..d4d2bfea2e956 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/DoubleLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/FloatGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatGreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/FloatGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatGreatestColumnTransformer.java index 6940611c3995f..bcd236b33d734 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/FloatGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/FloatLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatLeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/FloatLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatLeastColumnTransformer.java index bb5515e30fd5a..9d6dc10247f0e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/FloatLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InBinaryMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBinaryMultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InBinaryMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBinaryMultiColumnTransformer.java index 5a2083d96da91..9dbe1ac39e63e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InBinaryMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBinaryMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InBooleanMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBooleanMultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InBooleanMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBooleanMultiColumnTransformer.java index 0e09bafe23aec..6669fbe9817a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InBooleanMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBooleanMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InDoubleMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InDoubleMultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InDoubleMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InDoubleMultiColumnTransformer.java index 5a559458e8c16..66b071382717b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InDoubleMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InDoubleMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InFloatMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InFloatMultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InFloatMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InFloatMultiColumnTransformer.java index cd6ecd318dd44..e99a64e8fa273 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InFloatMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InFloatMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InInt32MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt32MultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InInt32MultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt32MultiColumnTransformer.java index 087df32674a75..65bcd9253793f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InInt32MultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt32MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InInt64MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt64MultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InInt64MultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt64MultiColumnTransformer.java index ae3cc145508b7..c1a818dcd7ebc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InInt64MultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt64MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InMultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InMultiColumnTransformer.java index 7a18fb1f0bf05..f389a433cb012 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/InMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int32GreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32GreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int32GreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32GreatestColumnTransformer.java index 358a3c2200a53..f303b6d0a2ebc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int32GreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32GreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int32LeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32LeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int32LeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32LeastColumnTransformer.java index c49db761e2da9..4e46c78c9e254 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int32LeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32LeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int64GreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64GreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int64GreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64GreatestColumnTransformer.java index 0e83e65e9c801..0d40289835236 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int64GreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64GreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int64LeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64LeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int64LeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64LeastColumnTransformer.java index 9f9a9b9e0e79a..9e3060ed318be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/Int64LeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64LeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalAndMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalAndMultiColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalAndMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalAndMultiColumnTransformer.java index 52513c97ffe24..55bf38c4be1e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalAndMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalAndMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalMultiColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalMultiColumnTransformer.java index cc45b6351366c..5814a0e8781bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalOrMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalOrMultiColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalOrMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalOrMultiColumnTransformer.java index 2b839ab5fba4a..72f34436500a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/LogicalOrMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalOrMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/MappableUDFColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MappableUDFColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/MappableUDFColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MappableUDFColumnTransformer.java index f1a58bb5fa689..67417bf6ac982 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/MappableUDFColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MappableUDFColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MultiColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/MultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MultiColumnTransformer.java index 61605791b5172..4ddaf76dd4eed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/multi/MultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/BetweenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/BetweenColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/BetweenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/BetweenColumnTransformer.java index 8c380ff0433af..9fd0cb569bb66 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/BetweenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/BetweenColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/CompareTernaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/CompareTernaryColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/CompareTernaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/CompareTernaryColumnTransformer.java index e6d57aa23d5e9..2a2da54697c66 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/CompareTernaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/CompareTernaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/Like3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/Like3ColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/Like3ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/Like3ColumnTransformer.java index 7946319df4e90..d61870d85e79b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/Like3ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/Like3ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -27,7 +27,7 @@ import org.apache.tsfile.common.regexp.LikePattern; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; public class Like3ColumnTransformer extends TernaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/LpadColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/LpadColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/LpadColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/LpadColumnTransformer.java index a101677093126..c9ef147a9cc10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/LpadColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/LpadColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.utils.BytePaddingUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.utils.BytePaddingUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/RpadColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/RpadColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/RpadColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/RpadColumnTransformer.java index 5f351611ae0b3..134fe7e657f1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/RpadColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/RpadColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.utils.BytePaddingUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.utils.BytePaddingUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/TernaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/TernaryColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/TernaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/TernaryColumnTransformer.java index 48f9e903e245a..98005aee17108 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/TernaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/TernaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/utils/BytePaddingUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/utils/BytePaddingUtils.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/utils/BytePaddingUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/utils/BytePaddingUtils.java index 1a87de4f949ef..b57307eb50510 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/ternary/utils/BytePaddingUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/utils/BytePaddingUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.utils; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.utils; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/udf/UserDefineScalarFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/udf/UserDefineScalarFunctionTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/udf/UserDefineScalarFunctionTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/udf/UserDefineScalarFunctionTransformer.java index b019cd9130228..163014031b399 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/udf/UserDefineScalarFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/udf/UserDefineScalarFunctionTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.udf; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.udf; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.MultiColumnTransformer; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.RecordIterator; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MultiColumnTransformer; import org.apache.iotdb.udf.api.relational.ScalarFunction; import org.apache.iotdb.udf.api.relational.access.Record; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/ArithmeticNegationColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/ArithmeticNegationColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/ArithmeticNegationColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/ArithmeticNegationColumnTransformer.java index 721b5130b864e..4029e31ff5fb0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/ArithmeticNegationColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/ArithmeticNegationColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/InColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/InColumnTransformer.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/InColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/InColumnTransformer.java index 6fadb56a0536b..26fc7d817e116 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/InColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/InColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/IsNullColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/IsNullColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/IsNullColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/IsNullColumnTransformer.java index 81b5aa91f27a1..2472226060618 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/IsNullColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/IsNullColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/LikeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LikeColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/LikeColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LikeColumnTransformer.java index fb861e213adc4..f6de680e4d32e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/LikeColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LikeColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/LogicNotColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LogicNotColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/LogicNotColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LogicNotColumnTransformer.java index 2a0cdc2fcec47..80d20ab35b574 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/LogicNotColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LogicNotColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/RegularColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/RegularColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/RegularColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/RegularColumnTransformer.java index dccaab9bc6e44..071f2017b8b9d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/RegularColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/RegularColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/UnaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/UnaryColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/UnaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/UnaryColumnTransformer.java index 32da3585c57ba..6d521b67ddbce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/UnaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/UnaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbsColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbsColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbsColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbsColumnTransformer.java index dde8d6b594812..75e42784f88d4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbsColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbsColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java index 148f1adf4d36f..bde7582a152bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java index 1c4a4eac7a65d..567d952a7614c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java index 7fbc86f3aa1fa..3a49b4761ed7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.CastFunctionHelper; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; @@ -38,7 +38,7 @@ import java.time.ZoneId; import java.time.format.DateTimeParseException; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.CastFunctionHelper.ERROR_MSG; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper.ERROR_MSG; import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE; public abstract class AbstractCastFunctionColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java index 477f36201dcb6..6a83ce6dd229e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AcosColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AcosColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AcosColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AcosColumnTransformer.java index cf7211f0539da..533647dc6ac4b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AcosColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AcosColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AsinColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AsinColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AsinColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AsinColumnTransformer.java index 9980154122ea7..6928059f6a267 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AsinColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AsinColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AtanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AtanColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AtanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AtanColumnTransformer.java index 20b317fe94b63..ca8b88828d33d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/AtanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AtanColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java index f486d6e233223..d636838a202ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitCountColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCountColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitCountColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCountColumnTransformer.java index 42356a19969f6..d0c7986cf0186 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitCountColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCountColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java index fc6cedb13e31e..8af9b52436ab5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java index 38a2036f54543..3b50ab74027cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java index 73dd8d98cc68c..3daf805def12f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java index 37a5da983f4f7..b69b51758a6f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java index 0a00923dfec03..20663508281a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java index c81dbda70aa41..d6746237a5bbe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java index 57b4388c40f46..f7b6589d6da98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java index 8ebef63879c08..e9745711e966d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java index 791da7d953855..5386f7ec96057 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java index 67bd43067d7cf..93ff7b741e3d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java index 19af0cc339613..7537eb6f6d90d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java index 8e1b693eb3f0b..5b94895a9afa0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java index a3257c394b1c4..2658f1783908a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java index bd5ea1916447f..85baad1698898 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java index 5a716b0a6d14c..a2f92613f5969 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToDoubleColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java index 949ddf3ef9ec7..0ebd19280ae2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToFloatColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java index 9b6a62a8aeb63..dea22a1eec0d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToIntColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java index 5fcb2592ea6ba..7fc65f096b087 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; /** A transformer that converts byte array representations to long values */ public class BytesToLongColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CRC32Transformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CRC32Transformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CRC32Transformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CRC32Transformer.java index f132116d9fbd4..8dec0fe907242 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CRC32Transformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CRC32Transformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java index fd71f14898b77..3f30934fc4beb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CeilColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CeilColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CeilColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CeilColumnTransformer.java index b6be8d360b653..a95dc3f772cff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CeilColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CeilColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Concat2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Concat2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Concat2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Concat2ColumnTransformer.java index fe45df5853768..9009ae40b2bc7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Concat2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Concat2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.ConcatColumnTransformer.concat; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ConcatColumnTransformer.concat; public class Concat2ColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ConcatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ConcatColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatColumnTransformer.java index 0439de8c6bc41..3ab02e6991c16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ConcatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java index 896f40cb4d9da..25a8f0a5a6cc6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.MultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MultiColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CosColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CosColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CosColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CosColumnTransformer.java index 01e69a022aa5a..bc1fcf6feae06 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CosColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CosColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CoshColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CoshColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CoshColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CoshColumnTransformer.java index b44a051d98f17..f5a5c14d0bc41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/CoshColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CoshColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java index 9cbe00db84bd4..73db1eb447cb4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DegreesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DegreesColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DegreesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DegreesColumnTransformer.java index 850911d43fc69..0bb1f1e75673c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DegreesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DegreesColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DiffColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DiffColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffColumnTransformer.java index cc4fcca4d82f6..d79315a723ed1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DiffColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java index 3557d8d8c1764..b96271436650c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java index aab1e288c42f2..6bac4d89b43b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java index 82876428d4545..58e2f0530fa41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class EndsWith2ColumnTransformer extends BinaryColumnTransformer { public EndsWith2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/EndsWithColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWithColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/EndsWithColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWithColumnTransformer.java index 698499aa6fbe1..7eaf34bfdda32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/EndsWithColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWithColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class EndsWithColumnTransformer extends UnaryColumnTransformer { private final byte[] suffix; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ExpColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExpColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ExpColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExpColumnTransformer.java index 6b3ef95a7d9fd..631942d453e80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ExpColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExpColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ExtractTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExtractTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ExtractTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExtractTransformer.java index 43bb2ffc45e01..2159f3d641bd2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ExtractTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExtractTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java index 569cecd77b575..afba004f32f90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FloorColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloorColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FloorColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloorColumnTransformer.java index 76be2157f9fd9..11281d82d844f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FloorColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloorColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FormatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FormatColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FormatColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FormatColumnTransformer.java index 911626847357e..febab08b9166b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/FormatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FormatColumnTransformer.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.multi.MultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MultiColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java index c010396585e00..7c7b5785940a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.inteface.CodecStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.inteface.CodecStrategy; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; /** * A generic, reusable column converter for handling all codec-based encoding/decoding functions. It diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java index 0c49f6d9bd250..722c684076ec2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java index fec35d5466c84..8187aba714f8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java index 0e16a2b19b084..6b38e558b31f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LTrimColumnTransformer.ltrim; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LTrimColumnTransformer.ltrim; public class LTrim2ColumnTransformer extends BinaryColumnTransformer { public LTrim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LTrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrimColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LTrimColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrimColumnTransformer.java index d2a6a2d1e485e..6104702e74e2d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LTrimColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrimColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.TrimColumnTransformer.isContain; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TrimColumnTransformer.isContain; public class LTrimColumnTransformer extends UnaryColumnTransformer { private final byte[] character; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LengthColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LengthColumnTransformer.java index 17ec5582b451c..ace8caa2b03ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LnColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LnColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LnColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LnColumnTransformer.java index 69d95fd84b0c3..4c66df684e4be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LnColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LnColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Log10ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Log10ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Log10ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Log10ColumnTransformer.java index 36253314a131c..f35c64c93f9c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Log10ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Log10ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java index baeeff00b71b2..fd2d0b2114719 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LowerColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LowerColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LowerColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LowerColumnTransformer.java index 036815bdf886e..1c7111a05efad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/LowerColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LowerColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java index b30a641c0d99c..4810bd15a2cd7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.iotdb.db.utils.ObjectTypeUtils; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java index ea05fbcef43d0..0e918ec352cc2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.RTrimColumnTransformer.rtrim; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RTrimColumnTransformer.rtrim; public class RTrim2ColumnTransformer extends BinaryColumnTransformer { public RTrim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RTrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrimColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RTrimColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrimColumnTransformer.java index 255af6ef242f6..2903344bca7ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RTrimColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrimColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.TrimColumnTransformer.isContain; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TrimColumnTransformer.isContain; public class RTrimColumnTransformer extends UnaryColumnTransformer { private final byte[] character; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RadiansColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RadiansColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RadiansColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RadiansColumnTransformer.java index 7443d9b1d3372..d3c3d853765cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RadiansColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RadiansColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java index 7d989ca050ca1..ab9c938ed9c2d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java index a4b938c430c93..f3409481b9e6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Replace2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Replace2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace2ColumnTransformer.java index 3f3552e7e7c34..ccdbde2b1d3c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Replace2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Replace3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace3ColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Replace3ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace3ColumnTransformer.java index e37d841a2f30f..cbd7ee7985c32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Replace3ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace3ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.TernaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java index 564a4bee86445..e62ad0ce31304 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RoundColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RoundColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundColumnTransformer.java index e5936b95e112f..a503faec08636 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RoundColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java index 1c6998584bff0..e8ae02293369a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SignColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SignColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SignColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SignColumnTransformer.java index 4f22546aa12ca..f30dd1cc74290 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SignColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SignColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SinColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SinColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinColumnTransformer.java index 50f509e79f10a..073e6fddba4b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SinColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SinhColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinhColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SinhColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinhColumnTransformer.java index 4423a530d8d4f..8284d2d2cd39f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SinhColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinhColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SqrtColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SqrtColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SqrtColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SqrtColumnTransformer.java index bce279d096f62..ea9957a28b36b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SqrtColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SqrtColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java index c319409cf8db8..0710614210910 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class StartsWith2ColumnTransformer extends BinaryColumnTransformer { public StartsWith2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StartsWithColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWithColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StartsWithColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWithColumnTransformer.java index fcb6620308537..2b7195ec9e7a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StartsWithColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWithColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java index 172e44677aa3f..56b2df010486e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StrcmpColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrcmpColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StrcmpColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrcmpColumnTransformer.java index 2017bf1157924..9b08c9709c8a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StrcmpColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrcmpColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java index b4ed3442f58d2..5fff4a71db8bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StrposColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrposColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StrposColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrposColumnTransformer.java index 0e2e15a45fd76..78edf7ee3d36c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/StrposColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrposColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubString2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubString2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString2ColumnTransformer.java index 7b0305880fd87..b68a2c242f1b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubString2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString2ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubString3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString3ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubString3ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString3ColumnTransformer.java index 5becf2673085b..28eb7ab4b8f2b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubString3ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString3ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.TernaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -29,7 +29,7 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.BytesUtils; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; public class SubString3ColumnTransformer extends TernaryColumnTransformer { public SubString3ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubStringColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubStringColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubStringColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubStringColumnTransformer.java index 8c486fa328c19..761d28c9746b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/SubStringColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubStringColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanColumnTransformer.java index 634c3f458a688..5a5497c1011a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TanhColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanhColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TanhColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanhColumnTransformer.java index cbe5544d40dda..655f3f3239ba4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TanhColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanhColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Trim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Trim2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Trim2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Trim2ColumnTransformer.java index 0919e0c16db0c..e65ae830de878 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/Trim2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Trim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.TrimColumnTransformer.trim; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TrimColumnTransformer.trim; public class Trim2ColumnTransformer extends BinaryColumnTransformer { public Trim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TrimColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TrimColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TrimColumnTransformer.java index 65ae78eb2b9c5..89dad44fb8784 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TrimColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TrimColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java index 846a4e5b0b927..107eb430cc6b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/UpperColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/UpperColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/UpperColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/UpperColumnTransformer.java index b5a07a1ed1180..161a4a08d8b29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/UpperColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/UpperColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java index 9f9787327610b..941303d541d6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.inteface.CodecStrategy; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.HexUtils; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util.SpookyHashV2Utils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.inteface.CodecStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.HexUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.SpookyHashV2Utils; import com.google.common.hash.Hashing; import com.google.common.io.BaseEncoding; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java index c700080622b4c..7996a650390f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/inteface/CodecStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/inteface/CodecStrategy.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/inteface/CodecStrategy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/inteface/CodecStrategy.java index f8c71c1f89567..cc83fbda982b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/inteface/CodecStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/inteface/CodecStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.inteface; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.inteface; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/HexUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/HexUtils.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/HexUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/HexUtils.java index e1480984da50a..1545ea651616c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/HexUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/HexUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java index bb235dba9b979..c734c70f8c8b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/TransformerDebugUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/TransformerDebugUtils.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/TransformerDebugUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/TransformerDebugUtils.java index af96644abc622..9a3d0bc15e9b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/transformation/dag/column/column/unary/scalar/util/TransformerDebugUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/TransformerDebugUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.util; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/LayerMemoryAssigner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/memory/LayerMemoryAssigner.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/LayerMemoryAssigner.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/memory/LayerMemoryAssigner.java index 721016f99ecf2..5f17a2e890d05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/LayerMemoryAssigner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/memory/LayerMemoryAssigner.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.memory; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.memory; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import java.util.HashMap; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/util/BitwiseUtils.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/util/BitwiseUtils.java index 97038b20e0e73..e82d215e08dfc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/util/BitwiseUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.util; +package org.apache.iotdb.db.queryengine.transformation.dag.dag.util; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java index 48de9d9232349..e0c8e0ebe522d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.input; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.utils.CommonUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java index f66f51b5bb48b..ca960343c7ce6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.dag.input.ConstantInputReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java index f13b1b79adf59..f5843b87feffd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.udf.api.customizer.strategy.AccessStrategy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java index c4b3e66ecd033..21b3d0d7a3274 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java index ad8a4e118d313..41073a7e9c2bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java index 1d918ea94e03b..e9bcd2ba0dd2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java index 0d7d08b45804f..ee785aca5b3a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.helper.CastFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.UnaryTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java index 7bff92efbc257..8883d6861a681 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java index 2882d40710cf7..b0e5cd041dd86 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java @@ -30,7 +30,7 @@ import org.apache.tsfile.utils.BytesUtils; import org.apache.tsfile.write.UnSupportedDataTypeException; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; public class SubStringFunctionTransformer extends UnaryTransformer { private int beginPosition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java index acb3b9980d8ff..6676897a7902d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.service.TemporaryQueryDataFileService; import java.time.ZoneId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java index 9c409dc3c7e56..a9cbf7a75b55c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.datastructure.util.ValueRecorder; import org.apache.iotdb.db.utils.CommonUtils; 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 f7334e84e26d3..3463cba1aeed4 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 @@ -43,11 +43,10 @@ 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.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceAttributeUpdater; @@ -58,7 +57,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateTimeSeriesNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceSchemaCache; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableId; @@ -72,6 +70,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableNodeLocationAddNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.metric.ISchemaRegionMetric; import org.apache.iotdb.db.schemaengine.metric.SchemaRegionMemMetric; import org.apache.iotdb.db.schemaengine.rescon.DataNodeSchemaQuotaManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java index b1e916672c0b3..8c7be23ef6b1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java @@ -26,13 +26,13 @@ import org.apache.iotdb.commons.schema.tree.SchemaIterator; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.CompleteMeasurementSchemaVisitor; -import org.apache.iotdb.db.queryengine.common.NodeRef; +import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ClusterSchemaFetcher; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CompleteMeasurementSchemaVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ITimeSeriesSchemaInfo; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.reader.ISchemaReader; import org.apache.iotdb.db.schemaengine.schemaregion.utils.filter.FilterContainsVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java index 25258231642f5..e1d1d03978549 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.metadata.view.UnsupportedViewException; import org.apache.iotdb.db.exception.metadata.view.ViewContainsAggregationException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.CollectAggregationExpressionsVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CollectAggregationExpressionsVisitor; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java index 024b138a9d12d..5aae306dfdadb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java @@ -55,32 +55,32 @@ import org.apache.iotdb.commons.schema.view.viewExpression.unary.RegularViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.unary.UnaryViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.visitor.ViewExpressionVisitor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.DivisionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ModuloExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.InExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TableDeletionEntry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TableDeletionEntry.java index 61ec2e0d67854..c7d4f4b57cf20 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TableDeletionEntry.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TableDeletionEntry.java @@ -20,7 +20,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.IDPredicateType; import org.apache.iotdb.db.utils.ModificationUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TreeDeletionEntry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TreeDeletionEntry.java index eefe86e78b322..c449dc8fcc331 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TreeDeletionEntry.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TreeDeletionEntry.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.path.PathPatternUtil; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; import org.apache.iotdb.db.storageengine.dataregion.modification.v1.Deletion; import org.apache.iotdb.db.utils.ModificationUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java index b9505032c9de5..f13a712fc3e9d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java @@ -22,14 +22,14 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java index 02ac04aa30fd4..6851ccb0190a9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.common.schematree; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.common.NodeRef; +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; import org.apache.tsfile.enums.TSDataType; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java index d1b4a8d2d7b72..ee97192fde021 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -42,7 +43,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java index 68bf828c69a62..ac1b27b4e41ef 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -38,7 +39,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesAggregationScanOperator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java index 2be569433ecc9..092857bc9bdc7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -37,7 +38,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java index 43f3e8185f82c..8172a2b1b1942 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -36,7 +37,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java index 4390c01113606..007cd5123d8d8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.ColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java index ace1aad41cd92..3c8a8562dd524 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; 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 0394d03adf75e..63484090e2fa8 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 @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -47,7 +48,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MultiColumnMergerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MultiColumnMergerTest.java index 72cb1f34fce43..b36d429acca44 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MultiColumnMergerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MultiColumnMergerTest.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MultiColumnMerger; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonOverlappedMultiColumnMergerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonOverlappedMultiColumnMergerTest.java index 4d82021131035..09cfba8b43d2d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonOverlappedMultiColumnMergerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonOverlappedMultiColumnMergerTest.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.NonOverlappedMultiColumnMerger; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java index 109d1e48b5de9..f39c0a57a7860 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -36,7 +37,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index d598c38630d70..ea18ca34ae1f9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -26,13 +26,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.TimeColumnTransformer; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -82,11 +76,17 @@ import org.apache.iotdb.db.queryengine.execution.operator.window.TimeWindowParameter; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowParameter; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.TimeColumnTransformer; import com.google.common.collect.Sets; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java index 93e3fbce9525c..1aa48077f1145 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -47,7 +48,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.window.WindowParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleColumnMergerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleColumnMergerTest.java index 7f87e3f0a2fd0..66a75608b8ea1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleColumnMergerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleColumnMergerTest.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java index 012361b80ab04..30f71a0c82e94 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java index 96150dd727a0d..1ef09d1c95dac 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -38,7 +39,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesAggregationScanOperator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java index a5ddd820b9000..53810e08ff8cc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java @@ -22,11 +22,10 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; -import org.apache.iotdb.db.queryengine.common.NodeRef; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; @@ -34,7 +33,8 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.process.TransformOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.input.QueryDataSetInputLayer; import org.apache.iotdb.db.queryengine.transformation.dag.input.TsBlockInputDataSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java index e10ebcdd06333..adf360090ac0e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -38,7 +39,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.ColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java index e3fa166ee3e11..f211d9ec22414 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -36,7 +37,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java index 9632664eaf3f6..1bbb85a17b2af 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java index 192d3e31798be..2ea092cb819bb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java index 85c9f6d330714..bddfd690cacb9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java index 9f9c7472bdc72..9d76d8a392182 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java index e0b8148bb5d02..2f3ebbccc70b5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; +import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.InputLocation; import com.google.common.util.concurrent.ListenableFuture; import io.airlift.units.Duration; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java index a6677411139bc..1e92a413fbb47 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java index 91a60124cbdfe..4c0cd05acda44 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate; import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java index fe8a5edb7fb59..dd6fcc56eb1a7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java index c0427030c2c54..20c513b4959fb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.expression.predicate; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.utils.TimestampPrecisionUtils; @@ -36,22 +36,22 @@ import java.util.LinkedHashSet; import java.util.TimeZone; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.between; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.eq; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.groupByTime; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gte; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.in; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.lt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.lte; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.neq; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.not; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.notBetween; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.notIn; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.or; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.between; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.eq; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.groupByTime; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gte; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.in; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.lt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.lte; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.neq; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.not; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.notBetween; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.notIn; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.or; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.time; import static org.apache.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG; public class ConvertPredicateToTimeFilterTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicatePushIntoScanTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicatePushIntoScanTest.java index e82f6036afcbf..13dfd81e6f7f0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicatePushIntoScanTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicatePushIntoScanTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.expression.predicate; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.junit.Assert; import org.junit.Test; @@ -30,22 +30,22 @@ import java.util.Arrays; import java.util.LinkedHashSet; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.add; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.between; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.eq; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gte; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.in; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.isNotNull; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.isNull; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.like; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.lt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.not; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.notRegex; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.sin; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.time; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.add; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.between; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.eq; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gte; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.in; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.isNotNull; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.isNull; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.like; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.lt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.not; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.notRegex; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.sin; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; public class PredicatePushIntoScanTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateRemoveNotTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateRemoveNotTest.java index cf1f54c56a1f4..49bd6baf48f8d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateRemoveNotTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateRemoveNotTest.java @@ -25,23 +25,23 @@ import java.util.Arrays; import java.util.LinkedHashSet; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.between; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.eq; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gte; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.in; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.lt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.lte; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.neq; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.not; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.notBetween; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.notIn; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.or; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.time; import static org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils.predicateRemoveNot; import static org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils.reversePredicate; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.between; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.eq; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gte; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.in; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.lt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.lte; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.neq; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.not; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.notBetween; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.notIn; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.or; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.time; public class PredicateRemoveNotTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateUtilsTest.java index b9bc917766d9b..ab22745764fdb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateUtilsTest.java @@ -24,11 +24,11 @@ import org.junit.Assert; import org.junit.Test; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.add; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.add; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.schemaMap; public class PredicateUtilsTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/TreePredicateConversionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/TreePredicateConversionTest.java index ddcf7cbf2ad78..59c05477d15d3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/TreePredicateConversionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/TreePredicateConversionTest.java @@ -21,17 +21,17 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/serde/CaseWhenThenExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/serde/CaseWhenThenExpressionTest.java index 2ff5ce0445a1d..e760fe8bc622e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/serde/CaseWhenThenExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/serde/CaseWhenThenExpressionTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.expression.serde; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; import org.junit.Test; @@ -30,12 +30,12 @@ import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.eq; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.lt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.whenThen; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.eq; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.lt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.whenThen; import static org.junit.Assert.assertEquals; public class CaseWhenThenExpressionTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AggregationDescriptorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AggregationDescriptorTest.java index fd41d5f072d68..1766a8fc67556 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AggregationDescriptorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AggregationDescriptorTest.java @@ -23,7 +23,7 @@ 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.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.CrossSeriesAggregationDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java index 10a8ad78c4066..7578ce72b405a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java @@ -29,7 +29,7 @@ import java.time.ZonedDateTime; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.visitor.CountTimeAggregationAmountVisitor.COUNT_TIME_ONLY_SUPPORT_ONE_WILDCARD; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CountTimeAggregationAmountVisitor.COUNT_TIME_ONLY_SUPPORT_ONE_WILDCARD; import static org.apache.iotdb.db.queryengine.plan.statement.component.IntoComponent.DEVICE_ALIGNMENT_INCONSISTENT_ERROR_MSG; import static org.apache.iotdb.db.queryengine.plan.statement.component.IntoComponent.DEVICE_NUM_MISMATCH_ERROR_MSG; import static org.apache.iotdb.db.queryengine.plan.statement.component.IntoComponent.DUPLICATE_TARGET_PATH_ERROR_MSG; 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 67c2f8d63e4bd..4f65a42517220 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 @@ -24,26 +24,26 @@ 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.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.DivisionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.ModuloExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; 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.DatasetHeader; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; @@ -67,12 +67,12 @@ import java.util.Map; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.DEVICE; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.groupByTime; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gte; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.groupByTime; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gte; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.time; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzerTest.java index f1b94e8e09cba..a85e06bd842d7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzerTest.java @@ -22,22 +22,22 @@ 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.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.junit.Test; import java.util.Arrays; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.count; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.path; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.count; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.path; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; import static org.junit.Assert.assertEquals; public class ExpressionAnalyzerTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java index 17cf91ead5b76..c0dacffd29a5d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; @@ -34,9 +34,9 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.getAggregationDescriptor; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.schemaMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java index a70d7d4a8912c..016dd4049258e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java index d2bf0dbe3a070..c9558cdc5d5a6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java @@ -21,7 +21,6 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -30,6 +29,7 @@ import org.apache.iotdb.db.queryengine.plan.analyze.Analyzer; import org.apache.iotdb.db.queryengine.plan.analyze.FakePartitionFetcherImpl; import org.apache.iotdb.db.queryengine.plan.analyze.FakeSchemaFetcherImpl; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; @@ -51,11 +51,11 @@ import java.util.LinkedHashMap; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.add; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.function; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.add; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.function; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.schemaMap; /** Use optimize rule: LimitOffsetPushDown and OrderByExpressionWithLimitChangeToTopK */ diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java index 22d1fe4a2a225..896a9d548e3e8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java @@ -24,7 +24,6 @@ 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.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -32,6 +31,7 @@ import org.apache.iotdb.db.queryengine.plan.analyze.Analyzer; import org.apache.iotdb.db.queryengine.plan.analyze.FakePartitionFetcherImpl; import org.apache.iotdb.db.queryengine.plan.analyze.FakeSchemaFetcherImpl; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.LogicalPlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java index 0675771affeba..22bf90dcce3dc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java @@ -30,13 +30,13 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.add; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.or; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.sin; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.add; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.or; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.sin; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.schemaMap; public class PredicatePushDownTest { 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 4fc9645d45a5a..029c6da785dda 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 @@ -22,9 +22,9 @@ 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.db.node_commons.plan.expression.expression.Expression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ColumnInjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java index 8f77f5bb4422d..4a5c018ab3892 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java @@ -27,14 +27,14 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java index 552a771e9b4cd..81da6ae628ff0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.common.NodeRef; +import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.tsfile.enums.TSDataType; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java index d4d96f364c29c..56f4132d33ea1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java @@ -30,12 +30,12 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.TreeModelTimePredicate; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java index 6889e3401e420..b28f8a6ad61d2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java @@ -26,7 +26,6 @@ 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.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -42,6 +41,7 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.ExchangeOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.memory.ConsumeAllChildrenPipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.ConsumeChildrenOneByOnePipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java index f7bec14b3db13..b3065d8a65465 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java @@ -24,13 +24,13 @@ 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.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java index 07618c44fc27e..032128587fdfb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java @@ -36,8 +36,6 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; @@ -51,6 +49,8 @@ import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaComputationWithAutoCreation; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.LogicalPlanner; import org.apache.iotdb.db.queryengine.plan.statement.Statement; 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 270f074cad485..0ba8a81d6bbd1 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 @@ -23,13 +23,13 @@ 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.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.QueryId; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java index 4ff271ce71241..f5304f2da0437 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java @@ -25,9 +25,9 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilterType; import org.apache.iotdb.commons.schema.filter.impl.PathContainsFilter; import org.apache.iotdb.commons.schema.filter.impl.TagFilter; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java index 3aab784c52984..55b5ac5d7b070 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java @@ -23,8 +23,8 @@ 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.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; @@ -44,8 +44,8 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.in; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.in; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; import static org.junit.Assert.assertEquals; public class AggregationNodeSerdeTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java index 0227368208c1c..65b657cdbe605 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java @@ -20,11 +20,11 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.expression.expression.Expression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java index 568998373017a..fd36467375401 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java @@ -22,8 +22,8 @@ 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.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; @@ -44,9 +44,9 @@ import java.util.Arrays; import java.util.Collections; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.time; import static org.junit.Assert.assertEquals; public class GroupByLevelNodeSerdeTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java index b811c1f5d3c02..c050516d3789b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.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.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.node_commons.plan.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByTagNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; @@ -50,9 +50,9 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.time; public class GroupByTagNodeSerdeTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java index 81717d2c3f271..67c3b0d322500 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java @@ -29,14 +29,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java index 8608cc4fb7fc8..dfce2a4150339 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; @@ -41,9 +41,9 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.node_commons.plan.expression.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.time; import static org.junit.Assert.assertEquals; public class SeriesAggregationScanNodeSerdeTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java index 0a0866de6c6c6..6df8d88d57861 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -57,11 +57,11 @@ import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.SUM; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.DEFAULT_GROUP_NUMBER; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; 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.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java index 46c5364fecf1a..c10d7ccce10aa 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java index 6305379123d09..a278bb3b15a5d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java @@ -32,6 +32,9 @@ import com.google.common.collect.ImmutableSet; import org.junit.Test; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.assertAnalyzeSemanticException; 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.equiJoinClause; @@ -44,9 +47,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.LAST; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; public class AsofJoinTest { @Test diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java index d0153169e17aa..9785e7441e9c2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java @@ -29,6 +29,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; @@ -45,7 +46,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.mpp.rpc.thrift.TRegionRouteReq; import org.apache.iotdb.udf.api.relational.TableFunction; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java index 1b6ae15dd754e..548522a21f391 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java @@ -25,10 +25,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java index 890162c254579..8aab081b9ccf2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java @@ -39,6 +39,10 @@ import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_INTERVAL; import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_START_TIME; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.FIRST; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AnalyzerTest.analyzeSQL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.QUERY_CONTEXT; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.TEST_MATADATA; @@ -57,10 +61,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableFunctionProcessor; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.topK; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.FIRST; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.LAST; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; import static org.apache.iotdb.udf.api.type.Type.DOUBLE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index a65516fc64a30..81ba53d00a1ac 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -36,6 +36,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; @@ -57,7 +58,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.db.schemaengine.table.InformationSchemaUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java index 2e6b4b4fd5dac..0e67699cab072 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java @@ -59,6 +59,8 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; @@ -71,8 +73,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.LAST; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.when; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java index 51b9b38e927dd..6cf1546d5ae6c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java @@ -38,6 +38,9 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; 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.any; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.anyTree; @@ -51,9 +54,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.LAST; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; public class ExampleTest { @Test diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java index a6f25f4fbe71c..59fb2d5c72938 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java @@ -24,9 +24,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; @@ -34,12 +37,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SkipToPosition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java index a06a00152f2b2..90af4f89d1d69 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java index c73e6c430b3e3..77e16c3430527 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java @@ -27,12 +27,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; @@ -46,10 +48,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WhenClause; import java.util.List; import java.util.Optional; 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 4f2c16ba92155..ba12682d3aa9d 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; @@ -48,9 +49,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AlignedAggregationTreeDeviceViewScanNode; @@ -63,7 +64,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeAlignedDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeNonAlignedDeviceViewScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import com.google.common.collect.ImmutableList; @@ -86,18 +86,18 @@ import static com.google.common.collect.ImmutableMap.toImmutableMap; import static java.util.Collections.nCopies; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder.DESC_NULLS_LAST; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.FIRST; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.UNDEFINED; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; 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; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.StrictAssignedSymbolsMatcher.actualAssignments; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.StrictSymbolsMatcher.actualOutputs; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.FIRST; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.UNDEFINED; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; public final class PlanMatchPattern { private final List matchers = new ArrayList<>(); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java index ea0411dad81b6..9babb64d4ef2a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java @@ -21,7 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java index 41462ad3d3841..9eb7fc99ff51e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticDivisionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticModuloColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticMultiplicationColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.ArithmeticSubtractionColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticDivisionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticModuloColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticMultiplicationColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticSubtractionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java index 5491f956ddc32..913e3ba4b1eb4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.LogicAndColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.LogicOrColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.LogicAndColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.LogicOrColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java index 747e4ef07e7c6..55038be287f75 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java index 7dbe69fabb4ac..cd6ab907a4e66 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java index 51558fe05d08e..d592423037553 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java index a1d57f0444892..04aa77c74932a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java index f52d85dc09f8f..334c5c1ea3aae 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.LpadColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.LpadColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java index 048633b3d1e66..c9c5d275fd1b4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ternary.RpadColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.RpadColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java index 566db78200d25..361d70137afdf 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.ArithmeticNegationColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.InColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LikeColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.RegularColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.ArithmeticNegationColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.InColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LikeColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.RegularColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java index af074c2a17d50..176cf0e6ba436 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BlobLengthColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BlobLengthColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java index 613a36a415567..9b8c6d5a2c3bf 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java @@ -27,7 +27,7 @@ import java.time.ZoneId; import java.util.TimeZone; -import static org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; import static org.junit.Assert.assertEquals; public class DateBinFunctionTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java index 75a8c6ff65839..35c25d624a5d5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java index a5f7683ce1ddf..15ca564ecb92e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java index c13a4228e4a09..8173a6d10add3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToFloatColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToFloatColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java index 1c699188861b0..8758e620b812f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToDoubleColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToDoubleColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java index cfefcd157b049..1cff936d37306 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java index bc8bcd53e0066..cb1c143890476 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java index 5d0aed4646dae..6bf5da1db8204 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java index 408b9cf4fddd8..a22ba205bba15 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.LongColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java index dc5718bf4abc5..714b3a09b1bf0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.FloatToBytesColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.FloatToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.FloatColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java index db6eb2a3808f9..0ebcc4b96d484 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.DoubleToBytesColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DoubleToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.DoubleColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java index 56c200488cc16..87ee09da34da7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java index 24c2212ae34e8..822e3db9bf495 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.LongColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java index d0850a41feebe..d09ab4ea4238f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java index 4c86b9f5482e1..93f750b45a266 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java @@ -22,9 +22,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java index e4304465c45f7..b0b3e64d11bd1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java index bcb21af06e117..9c37358729278 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java index 09deb09fbdf62..82bd9cf7ebe5d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base32Encoding; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java index 58c172955849a..a5be655cfa92f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java index dacc619095869..b7bfbee9f7f90 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java index f9332ab958c28..6ec4b61be326f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java @@ -21,8 +21,8 @@ // Note: The actual package may vary, adjust if CRC32Transformer is in a different location. package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.CRC32Transformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CRC32Transformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java index 9c5bc9dc0eae8..6109cef488d11 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java index b9efba7760cef..1828a89db9328 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java index f115041a32b2e..bc513de6101e5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java index 484c766ba195c..8836c1539d33e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java index b021ecdc871ce..416c81c071fbb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java index 024ab9750e4a3..d6d25b1e3e5b5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java @@ -19,9 +19,9 @@ * under the License. */ -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java index 1e3367e6552ec..6ebabefd05808 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java @@ -19,9 +19,9 @@ * under the License. */ -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java index df042524e9a0a..20f73a5b7032f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import net.jpountz.xxhash.XXHash64; import net.jpountz.xxhash.XXHashFactory; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java index 6072f6ed94ae8..eea73d53e343b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.string; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hexEncoding; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java index 1fa7665972108..154b75aafb738 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hexEncoding; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.node_commons.transformation.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java index 04a611f07c40c..f3611505c630d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java @@ -20,18 +20,19 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.junit.Assert; import org.junit.Test; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitCountCheck; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseAndTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseLeftShiftTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseNotTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseOrTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseRightShiftArithmeticTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseRightShiftTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseXorTransform; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitCountCheck; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitwiseAndTransform; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitwiseLeftShiftTransform; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitwiseNotTransform; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitwiseOrTransform; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitwiseRightShiftArithmeticTransform; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitwiseRightShiftTransform; +import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitwiseXorTransform; public class BitwiseUtilsTest { @Test From f89e868a3f8545ec673e1adbf98176b10f3f5935 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Tue, 14 Apr 2026 16:22:44 +0800 Subject: [PATCH 13/45] move some ast nodes --- .../metadata/FunctionNullability.java | 2 +- .../relational/metadata/ResolvedFunction.java | 1 - .../rowpattern/AggregationValuePointer.java | 14 -------- .../relational/sql/ast/AliasedRelation.java | 10 ++---- .../sql/ast/CommonQueryAstVisitor.java | 36 +++++++++++++++++++ .../plan/relational/sql/ast/Join.java | 9 ++--- .../plan/relational/sql/ast/JoinCriteria.java | 4 +-- .../plan/relational/sql/ast/Query.java | 13 ++++--- .../plan/relational/sql/ast/QueryBody.java | 7 ++-- .../plan/relational/sql/ast/Relation.java | 8 ++--- .../plan/relational/sql/ast/SingleColumn.java | 12 ++----- .../plan/relational/sql/ast/Statement.java | 8 ++--- .../sql/ast/SubqueryExpression.java | 2 -- .../relational/sql/ast/TableSubquery.java | 9 ++--- .../plan/relational/sql/ast/Values.java | 10 ++---- .../relational/type/InternalTypeManager.java | 4 --- .../plan/relational/type/TypeId.java | 2 +- .../plan/relational/type/TypeManager.java | 7 ++-- .../type/TypeNotFoundException.java | 3 +- .../thrift/IoTDBDataNodeReceiver.java | 10 +++--- ...PipeStatementTablePatternParseVisitor.java | 2 +- .../session/PreparedStatementInfo.java | 2 +- .../thrift/impl/ClientRPCServiceImpl.java | 16 ++++----- .../thrift/impl/NativeStatementRequest.java | 2 +- .../queryengine/common/MPPQueryContext.java | 2 +- .../relational/ColumnTransformerBuilder.java | 2 +- .../db/queryengine/plan/Coordinator.java | 20 +++++------ .../config/TableConfigTaskVisitor.java | 4 +-- .../execution/config/session/PrepareTask.java | 2 +- .../session/PreparedStatementHelper.java | 2 +- .../plan/relational/analyzer/Analysis.java | 8 ++--- .../plan/relational/analyzer/Analyzer.java | 2 +- .../analyzer/ExpressionAnalyzer.java | 4 +-- .../analyzer/StatementAnalyzer.java | 28 +++++++-------- .../analyzer/StatementAnalyzerFactory.java | 2 +- .../tablefunction/TableArgumentAnalysis.java | 2 +- .../plan/relational/metadata/Metadata.java | 2 +- .../metadata/TableMetadataImpl.java | 4 +-- .../relational/planner/CteMaterializer.java | 2 +- .../relational/planner/PlannerContext.java | 2 +- .../plan/relational/planner/QueryPlanner.java | 4 +-- .../relational/planner/RelationPlanner.java | 26 +++++++------- .../relational/planner/SubqueryPlanner.java | 2 +- .../planner/TableLogicalPlanner.java | 4 +-- .../relational/planner/TableModelPlanner.java | 4 +-- .../TableDistributedPlanGenerator.java | 2 +- .../TableModelQueryFragmentPlanner.java | 2 +- ...correlatedScalarSubqueryReconstructor.java | 2 +- .../rule/SetOperationNodeTranslator.java | 2 +- .../rule/SimplifyCountOverConstant.java | 2 +- .../optimizations/PlanNodeDecorrelator.java | 2 +- .../planner/optimizations/Util.java | 2 +- .../relational/sql/ParameterExtractor.java | 2 +- .../sql/ast/AbstractTraverseDevice.java | 1 + .../plan/relational/sql/ast/AddColumn.java | 1 + .../sql/ast/AlterColumnDataType.java | 1 + .../plan/relational/sql/ast/AsofJoinOn.java | 1 + .../plan/relational/sql/ast/AstVisitor.java | 36 ------------------- .../plan/relational/sql/ast/ClearCache.java | 1 + .../plan/relational/sql/ast/CopyTo.java | 1 + .../relational/sql/ast/CountStatement.java | 1 + .../sql/ast/CreateExternalService.java | 1 + .../relational/sql/ast/CreateFunction.java | 1 + .../plan/relational/sql/ast/CreateIndex.java | 1 + .../plan/relational/sql/ast/CreateModel.java | 1 + .../sql/ast/CreateOrUpdateDevice.java | 1 + .../plan/relational/sql/ast/CreateTable.java | 1 + .../relational/sql/ast/CreateTraining.java | 1 + .../relational/sql/ast/DatabaseStatement.java | 1 + .../plan/relational/sql/ast/Deallocate.java | 1 + .../sql/ast/DefaultTraversalVisitor.java | 7 ++++ .../plan/relational/sql/ast/Delete.java | 1 + .../relational/sql/ast/DescribeTable.java | 1 + .../plan/relational/sql/ast/DropColumn.java | 1 + .../plan/relational/sql/ast/DropDB.java | 1 + .../sql/ast/DropExternalService.java | 1 + .../plan/relational/sql/ast/DropFunction.java | 1 + .../plan/relational/sql/ast/DropIndex.java | 1 + .../plan/relational/sql/ast/DropModel.java | 1 + .../plan/relational/sql/ast/DropTable.java | 1 + .../plan/relational/sql/ast/Except.java | 1 + .../plan/relational/sql/ast/Execute.java | 1 + .../relational/sql/ast/ExecuteImmediate.java | 1 + .../plan/relational/sql/ast/Explain.java | 1 + .../relational/sql/ast/ExplainAnalyze.java | 1 + .../plan/relational/sql/ast/ExtendRegion.java | 1 + .../plan/relational/sql/ast/FetchDevice.java | 1 + .../plan/relational/sql/ast/Insert.java | 2 ++ .../plan/relational/sql/ast/Intersect.java | 1 + .../plan/relational/sql/ast/JoinOn.java | 1 + .../plan/relational/sql/ast/JoinUsing.java | 1 + .../plan/relational/sql/ast/KillQuery.java | 1 + .../plan/relational/sql/ast/LoadModel.java | 1 + .../plan/relational/sql/ast/LoadTsFile.java | 1 + .../relational/sql/ast/MigrateRegion.java | 1 + .../plan/relational/sql/ast/NaturalJoin.java | 1 + .../sql/ast/PatternRecognitionRelation.java | 1 + .../plan/relational/sql/ast/PipeEnriched.java | 1 + .../relational/sql/ast/PipeStatement.java | 1 + .../plan/relational/sql/ast/Prepare.java | 1 + .../sql/ast/QuerySpecification.java | 2 ++ .../relational/sql/ast/ReconstructRegion.java | 1 + .../sql/ast/RelationalAuthorStatement.java | 1 + .../plan/relational/sql/ast/RemoveAINode.java | 1 + .../relational/sql/ast/RemoveConfigNode.java | 1 + .../relational/sql/ast/RemoveDataNode.java | 1 + .../plan/relational/sql/ast/RemoveRegion.java | 1 + .../plan/relational/sql/ast/RenameColumn.java | 1 + .../plan/relational/sql/ast/RenameTable.java | 1 + .../relational/sql/ast/SetColumnComment.java | 1 + .../plan/relational/sql/ast/SetOperation.java | 2 ++ .../relational/sql/ast/SetProperties.java | 1 + .../relational/sql/ast/SetSqlDialect.java | 1 + .../relational/sql/ast/SetTableComment.java | 1 + .../relational/sql/ast/ShowAIDevices.java | 1 + .../plan/relational/sql/ast/ShowAINodes.java | 1 + .../relational/sql/ast/ShowAvailableUrls.java | 1 + .../plan/relational/sql/ast/ShowCluster.java | 1 + .../relational/sql/ast/ShowClusterId.java | 1 + .../relational/sql/ast/ShowConfigNodes.java | 1 + .../sql/ast/ShowCurrentDatabase.java | 1 + .../sql/ast/ShowCurrentSqlDialect.java | 1 + .../sql/ast/ShowCurrentTimestamp.java | 1 + .../relational/sql/ast/ShowCurrentUser.java | 1 + .../plan/relational/sql/ast/ShowDB.java | 1 + .../relational/sql/ast/ShowDataNodes.java | 1 + .../relational/sql/ast/ShowFunctions.java | 1 + .../plan/relational/sql/ast/ShowIndex.java | 1 + .../relational/sql/ast/ShowLoadedModels.java | 1 + .../plan/relational/sql/ast/ShowModels.java | 1 + .../plan/relational/sql/ast/ShowRegions.java | 1 + .../relational/sql/ast/ShowStatement.java | 1 + .../plan/relational/sql/ast/ShowTables.java | 1 + .../relational/sql/ast/ShowVariables.java | 1 + .../plan/relational/sql/ast/ShowVersion.java | 1 + .../sql/ast/StartExternalService.java | 1 + .../sql/ast/StopExternalService.java | 1 + .../sql/ast/SubscriptionStatement.java | 1 + .../plan/relational/sql/ast/Table.java | 1 + .../sql/ast/TableFunctionInvocation.java | 1 + .../sql/ast/TableFunctionTableArgument.java | 1 + .../plan/relational/sql/ast/Union.java | 1 + .../plan/relational/sql/ast/UnloadModel.java | 1 + .../plan/relational/sql/ast/Use.java | 1 + .../plan/relational/sql/ast/WithQuery.java | 1 + .../relational/sql/ast/WrappedStatement.java | 1 + .../relational/sql/parser/AstBuilder.java | 20 +++++------ .../plan/relational/sql/parser/SqlParser.java | 2 +- .../relational/sql/rewrite/ShowRewrite.java | 6 ++-- .../sql/rewrite/StatementRewrite.java | 2 +- .../plan/relational/sql/util/QueryUtil.java | 12 +++---- .../relational/sql/util/SqlFormatter.java | 16 ++++----- .../queryengine/plan/statement/Statement.java | 2 +- .../statement/crud/InsertRowStatement.java | 2 +- .../statement/crud/InsertRowsStatement.java | 2 +- .../statement/crud/InsertTabletStatement.java | 2 +- .../statement/crud/LoadTsFileStatement.java | 2 +- .../statement/pipe/PipeEnrichedStatement.java | 2 +- .../node/process/WindowNodeSerdeTest.java | 2 +- .../relational/analyzer/AnalyzerTest.java | 2 +- .../plan/relational/analyzer/AuthTest.java | 2 +- .../analyzer/RowPatternRecognitionTest.java | 2 +- .../relational/analyzer/TSBSMetadata.java | 4 +-- .../relational/analyzer/TestMetadata.java | 4 +-- .../plan/relational/analyzer/TestUtils.java | 2 +- .../plan/relational/planner/PlanTester.java | 2 +- .../sql/AstMemoryEstimatorTest.java | 2 +- .../sql/parser/AuthorStatementTest.java | 2 +- 168 files changed, 301 insertions(+), 267 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/metadata/FunctionNullability.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/AliasedRelation.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Join.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/JoinCriteria.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Query.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/QueryBody.java (78%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Relation.java (73%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/SingleColumn.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Statement.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/TableSubquery.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Values.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/type/TypeId.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/type/TypeManager.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/type/TypeNotFoundException.java (91%) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/FunctionNullability.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/FunctionNullability.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/FunctionNullability.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/FunctionNullability.java index 5d847e074f1f5..9044739129ac0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/FunctionNullability.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/FunctionNullability.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.metadata; +package org.apache.iotdb.db.node_commons.plan.relational.metadata; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java index b1a053fa56ac5..3d95026146c58 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java @@ -23,7 +23,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java index adfc8a3955e28..29372a802fe9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java @@ -22,18 +22,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.Optional; -import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; public final class AggregationValuePointer implements ValuePointer { @@ -76,17 +73,6 @@ public Optional getMatchNumberSymbol() { return matchNumberSymbol; } - public List getInputSymbols() { - return arguments.stream() - .map(SymbolsExtractor::extractAll) - .flatMap(Collection::stream) - .filter( - symbol -> - (!classifierSymbol.isPresent() || !classifierSymbol.get().equals(symbol)) - && (!matchNumberSymbol.isPresent() || !matchNumberSymbol.get().equals(symbol))) - .collect(toImmutableList()); - } - @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AliasedRelation.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AliasedRelation.java index 2e4b93b35377e..2f1942204477a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AliasedRelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AliasedRelation.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -71,7 +65,7 @@ public List getColumnNames() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitAliasedRelation(this, context); + return ((CommonQueryAstVisitor) visitor).visitAliasedRelation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java index 7b616d53adda2..6aa949096dc13 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java @@ -32,6 +32,14 @@ protected R visitNode(Node node, C context) { return null; } + protected R visitStatement(Statement node, C context) { + return visitNode(node, context); + } + + protected R visitQuery(Query node, C context) { + return visitStatement(node, context); + } + protected R visitExpression(Expression node, C context) { return visitNode(node, context); } @@ -283,4 +291,32 @@ protected R visitWindowSpecification(WindowSpecification node, C context) { protected R visitTypeParameter(TypeParameter node, C context) { return visitDataTypeParameter(node, context); } + + protected R visitValues(Values node, C context) { + return visitQueryBody(node, context); + } + + protected R visitQueryBody(QueryBody node, C context) { + return visitRelation(node, context); + } + + protected R visitTableSubquery(TableSubquery node, C context) { + return visitQueryBody(node, context); + } + + protected R visitRelation(Relation node, C context) { + return visitNode(node, context); + } + + protected R visitAliasedRelation(AliasedRelation node, C context) { + return visitRelation(node, context); + } + + protected R visitJoin(Join node, C context) { + return visitRelation(node, context); + } + + protected R visitSingleColumn(SingleColumn node, C context) { + return visitSelectItem(node, context); + } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Join.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Join.java index b1656832c6376..6fe95fc2b1118 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Join.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Join.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -117,7 +112,7 @@ public Optional getCriteria() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitJoin(this, context); + return ((CommonQueryAstVisitor) visitor).visitJoin(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinCriteria.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinCriteria.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinCriteria.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinCriteria.java index d5f103c4553a8..5b306fbab96f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinCriteria.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinCriteria.java @@ -17,9 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Query.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Query.java index bd0cdafff8770..b37568135a6eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Query.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Query.java @@ -17,13 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Limit; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; import org.apache.iotdb.db.utils.cte.CteDataStore; import com.google.common.collect.ImmutableList; @@ -145,7 +144,7 @@ public CteDataStore getCteDataStore() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitQuery(this, context); + return ((CommonQueryAstVisitor) visitor).visitQuery(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QueryBody.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QueryBody.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QueryBody.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QueryBody.java index f860ad08dbb38..a6e8c91729b5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QueryBody.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QueryBody.java @@ -17,10 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import javax.annotation.Nullable; @@ -32,6 +29,6 @@ protected QueryBody(@Nullable NodeLocation location) { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitQueryBody(this, context); + return ((CommonQueryAstVisitor) visitor).visitQueryBody(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Relation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Relation.java similarity index 73% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Relation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Relation.java index deef466130cd9..44c7b8c759eb0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Relation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Relation.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; public abstract class Relation extends Node { @@ -31,6 +27,6 @@ protected Relation(NodeLocation location) { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitRelation(this, context); + return ((CommonQueryAstVisitor) visitor).visitRelation(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SingleColumn.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SingleColumn.java index da393d9dfe205..22cec904abb41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SingleColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SingleColumn.java @@ -17,15 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -128,7 +120,7 @@ public String toString() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitSingleColumn(this, context); + return ((CommonQueryAstVisitor) visitor).visitSingleColumn(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Statement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Statement.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Statement.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Statement.java index cb37fefafa890..17574273e1519 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Statement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Statement.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import javax.annotation.Nullable; @@ -37,7 +33,7 @@ protected Statement(final @Nullable NodeLocation location) { @Override public R accept(final IAstVisitor visitor, final C context) { - return ((AstVisitor) visitor).visitStatement(this, context); + return ((CommonQueryAstVisitor) visitor).visitStatement(this, context); } /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubqueryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubqueryExpression.java index 13b6e6e99d224..992327968c108 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubqueryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubqueryExpression.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableSubquery.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableSubquery.java index b322a0cd35514..b1c939dc89342 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableSubquery.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -56,7 +51,7 @@ public Query getQuery() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitTableSubquery(this, context); + return ((CommonQueryAstVisitor) visitor).visitTableSubquery(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Values.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Values.java index c5837963f24a1..ea1312604c557 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Values.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Values.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; @@ -55,7 +49,7 @@ public List getRows() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitValues(this, context); + return ((CommonQueryAstVisitor) visitor).visitValues(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/InternalTypeManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/InternalTypeManager.java index 029d84c7d0c7b..31fc49e862709 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/InternalTypeManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/InternalTypeManager.java @@ -19,10 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.type; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeId; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; - import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeId.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeId.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeId.java index 9f445377fbbe5..ed92d7ec81815 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeId.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.type; +package org.apache.iotdb.db.node_commons.plan.relational.type; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeManager.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeManager.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeManager.java index 89a6a9395c4f9..4f7147a522c4b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeManager.java @@ -17,9 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.type; - -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; +package org.apache.iotdb.db.node_commons.plan.relational.type; import org.apache.tsfile.read.common.type.Type; @@ -27,7 +25,8 @@ public interface TypeManager { /** * Gets the type with the specified signature. * - * @throws TypeNotFoundException if not found + * @throws org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException if not + * found */ Type getType(TypeSignature signature); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeNotFoundException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeNotFoundException.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeNotFoundException.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeNotFoundException.java index 40fd2c9e50d71..e118433972b17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeNotFoundException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeNotFoundException.java @@ -17,10 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.type; +package org.apache.iotdb.db.node_commons.plan.relational.type; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.rpc.TSStatusCode.TYPE_NOT_FOUND; 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 254928e91910d..9ef6d29602322 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 @@ -647,9 +647,9 @@ private TSStatus loadSchemaSnapShot( .flatMap(parsedStatement -> batchVisitor.process(parsedStatement, null)) .ifPresent(statement -> results.add(executeStatementAndClassifyExceptions(statement))); } else if (treeOrTableStatement - instanceof org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement) { - final org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement originalStatement = - (org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement) + instanceof org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement) { + final org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement originalStatement = + (org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement) treeOrTableStatement; if (!executionTypes.contains(StatementType.AUTO_CREATE_DEVICE_MNODE)) { @@ -700,7 +700,7 @@ private TPipeTransferResp handleTransferSchemaPlan(final PipeTransferPlanNodeReq ? new TPipeTransferResp(executeStatementAndClassifyExceptions((Statement) statement)) : new TPipeTransferResp( executeStatementForTableModelWithPermissionCheck( - (org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement) statement, + (org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement) statement, null)); } @@ -1059,7 +1059,7 @@ private TSStatus executeStatementForTreeModel(final Statement statement) { } private TSStatus executeStatementForTableModelWithPermissionCheck( - final org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement statement, + final org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statement, final String databaseName) { try { final TSStatus status = loginIfNecessary(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java index 7f4752c596460..dc7b40877ee0f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.pipe.receiver.visitor; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateOrUpdateDevice; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/PreparedStatementInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/PreparedStatementInfo.java index 0bfc750c4ba07..02fa32d57830c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/PreparedStatementInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/PreparedStatementInfo.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.protocol.session; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import java.util.Objects; 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 c883cb526a02f..e1e6bb06390e9 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 @@ -416,7 +416,7 @@ private TSExecuteStatementResp executeStatementInternal( } } } else { - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement s = + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement s = request.getTableStatement(relationSqlParser, clientSession.getZoneId(), clientSession); if (s instanceof Use) { @@ -605,7 +605,7 @@ public Statement getTreeStatement(ZoneId zoneId) { } @Override - public org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement getTableStatement( + public org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement getTableStatement( SqlParser parser, ZoneId zoneId, IClientSession clientSession) { return parser.createStatement(req.getStatement(), zoneId, clientSession); } @@ -649,7 +649,7 @@ public Statement getTreeStatement(ZoneId zoneId) { } @Override - public org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement getTableStatement( + public org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement getTableStatement( SqlParser parser, ZoneId zoneId, IClientSession clientSession) { ensureParsed(); return executeStatement; @@ -1689,7 +1689,7 @@ public TSPrepareResp prepareStatement(TSPrepareReq req) { String sql = req.getSql(); String statementName = req.getStatementName(); - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement statement = + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statement = relationSqlParser.createStatement(sql, clientSession.getZoneId(), clientSession); if (statement == null) { @@ -2172,7 +2172,7 @@ public TSStatus executeBatchStatement(TSExecuteBatchStatementReq req) { } } else { - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement s = + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement s = relationSqlParser.createStatement( statement, clientSession.getZoneId(), clientSession); @@ -3624,7 +3624,7 @@ private ExecutionResult executeBatchStatement( * @return the execution result */ private ExecutionResult executeBatchTableStatement( - final org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement statement, + final org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statement, final SqlParser relationSqlParser, final IClientSession clientSession, final long queryId, @@ -3635,7 +3635,7 @@ private ExecutionResult executeBatchTableStatement( final boolean userQuery) { ExecutionResult result = null; - List + List subStatements = statement.getSubStatements(); int totalSubStatements = subStatements.size(); LOGGER.info( @@ -3644,7 +3644,7 @@ private ExecutionResult executeBatchTableStatement( queryId); for (int i = 0; i < totalSubStatements; i++) { - final org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement subStatement = + final org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement subStatement = subStatements.get(i); LOGGER.info( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/NativeStatementRequest.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/NativeStatementRequest.java index 3045b3d0d5d86..9ddd03471ca6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/NativeStatementRequest.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/NativeStatementRequest.java @@ -74,7 +74,7 @@ public interface NativeStatementRequest extends Supplier { * @param clientSession the client session * @return the parsed Table model Statement, or null if not supported */ - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement getTableStatement( + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement getTableStatement( SqlParser parser, ZoneId zoneId, IClientSession clientSession); /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java index 6f62675efacc1..973aaa6e95602 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java @@ -28,6 +28,7 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.lock.SchemaLockType; import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.plan.planner.memory.NotThreadSafeMemoryReservationManager; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.statistics.QueryPlanStatistics; import org.apache.iotdb.db.utils.cte.CteDataStore; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java index c6349b42526b2..8850b343a2a9e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java @@ -68,11 +68,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticColumnTransformerApi; import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory; 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 4f78a5a3d7bea..345ce6c491dfc 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 @@ -41,7 +41,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.PreparedStatementInfo; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; @@ -101,7 +103,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MigrateRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeStatement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Prepare; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ReconstructRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RelationalAuthorStatement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RemoveAINode; @@ -148,7 +149,6 @@ 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.TypeManager; import org.apache.iotdb.db.queryengine.plan.statement.IConfigStatement; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.utils.SetThreadName; @@ -432,7 +432,7 @@ private IQueryExecution createQueryExecutionForTreeModel( * along with CTE query dataset. */ public ExecutionResult executeForTableModel( - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement statement, + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statement, SqlParser sqlParser, IClientSession clientSession, long queryId, @@ -468,7 +468,7 @@ public ExecutionResult executeForTableModel( } public ExecutionResult executeForTableModel( - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement statement, + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statement, SqlParser sqlParser, IClientSession clientSession, long queryId, @@ -549,7 +549,7 @@ public ExecutionResult executeForTreeModel( /** For compatibility of MQTT and REST, this method should never be called. */ @Deprecated public ExecutionResult executeForTableModel( - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement statement, + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statement, SqlParser sqlParser, IClientSession currSession, Long queryId, @@ -601,7 +601,7 @@ private IQueryExecution createQueryExecutionForTableModel( } private IQueryExecution createQueryExecutionForTableModel( - final org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement statement, + final org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statement, final SqlParser sqlParser, final IClientSession clientSession, final MPPQueryContext queryContext, @@ -688,12 +688,12 @@ private IQueryExecution createQueryExecutionForTableModel( queryContext)); } // Initialize variables for TableModelPlanner - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement statementToUse = statement; + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statementToUse = statement; List parameters = Collections.emptyList(); Map, Expression> parameterLookup = Collections.emptyMap(); // Unwrap Explain/ExplainAnalyze to check for inner Execute/ExecuteImmediate - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement innerStatement = statement; + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement innerStatement = statement; if (statement instanceof Explain) { innerStatement = ((Explain) statement).getStatement(); } else if (statement instanceof ExplainAnalyze) { @@ -710,7 +710,7 @@ private IQueryExecution createQueryExecutionForTableModel( String.format("Prepared statement '%s' does not exist", statementName)); } - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement resolvedSql = + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement resolvedSql = preparedInfo.getSql(); parameterLookup = ParameterExtractor.bindParameters(resolvedSql, executeStatement.getParameters()); @@ -730,7 +730,7 @@ private IQueryExecution createQueryExecutionForTableModel( String sql = executeImmediateStatement.getSqlString(); List literalParameters = executeImmediateStatement.getParameters(); - org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement resolvedSql = + org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement resolvedSql = sqlParser.createStatement(sql, clientSession.getZoneId(), clientSession); if (!literalParameters.isEmpty()) { 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 d74243355a1dd..d5b1d177b3e8e 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 @@ -51,6 +51,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; @@ -234,8 +236,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ViewFieldDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite.StatementRewrite; import org.apache.iotdb.db.queryengine.plan.relational.type.AuthorRType; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; import org.apache.iotdb.db.queryengine.plan.statement.metadata.RemoveAINodeStatement; import org.apache.iotdb.db.queryengine.plan.statement.metadata.RemoveConfigNodeStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PrepareTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PrepareTask.java index c83808f4cecaf..7fe890dd7f913 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PrepareTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PrepareTask.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.session; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; 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.Statement; import org.apache.iotdb.rpc.TSStatusCode; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PreparedStatementHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PreparedStatementHelper.java index cade26c08320d..84d3c30ab800b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PreparedStatementHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PreparedStatementHelper.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.session; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.PreparedStatementInfo; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; /** Helper for prepared statement registration/unregistration. */ public class PreparedStatementHelper { 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 bcb23b2af3eaa..b11b09ed647ba 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 @@ -36,12 +36,16 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -58,15 +62,11 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; -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.RangeQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; 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.SubsetDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; 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 e9eb139c0462b..6178a2434a3ee 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 @@ -23,12 +23,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 5b868c319e532..0a056eb14a723 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -26,6 +26,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; @@ -79,6 +80,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; @@ -91,7 +93,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.NavigationMode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.PatternFunctionAnalysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.ScalarInputDescriptor; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; @@ -101,7 +102,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index 3fff1617d7f1c..bdc23a3c66725 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -28,6 +28,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllRows; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; @@ -53,6 +54,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; @@ -64,21 +67,28 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Window; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -106,7 +116,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AbstractQueryDeviceWithCache; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AbstractTraverseDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn; @@ -143,8 +152,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertTablet; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; -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.Limit; @@ -155,9 +162,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; -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.RenameColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; @@ -172,29 +177,24 @@ 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; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StartPipe; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionArgument; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Values; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WrappedInsertStatement; import org.apache.iotdb.db.queryengine.plan.relational.type.CompatibleResolver; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertBaseStatement; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; @@ -274,6 +274,10 @@ import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction.TIMECOL_PARAMETER_NAME; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression.getQualifiedName; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.FULL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.LEFT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.RIGHT; import static org.apache.iotdb.db.queryengine.execution.warnings.StandardWarningCode.REDUNDANT_ORDER_BY; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AggregationAnalyzer.verifyOrderByAggregations; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AggregationAnalyzer.verifySourceAggregations; @@ -286,10 +290,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.metadata.MetadataUtil.createQualifiedObjectName; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isTimestampType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.FULL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.INNER; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.LEFT; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.RIGHT; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.AstUtil.preOrder; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java index c532731850c61..9e326689c2901 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java index 30818a634d0c8..f3cca8ffd8f25 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.CanIgnoreReturnValue; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java index fd2e9e36411df..1a39aa0e14789 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java @@ -28,13 +28,13 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.tsfile.file.metadata.IDeviceID; 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 89824d6aab463..7ecac03a94769 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 @@ -41,6 +41,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.SubtractionResolver; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -50,8 +52,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.utils.constant.SqlConstant; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java index 823e1e96b83dd..2b26bcb228e96 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java @@ -29,6 +29,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -42,7 +43,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlannerContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlannerContext.java index 094d417a74b3a..2dbf7bfc1ea00 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlannerContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlannerContext.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; /** * A carrier of core, global, non-derived services for planner and analyzer. This is used to ease diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index efe81a56de49b..3eace69bb25f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -51,6 +51,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -66,8 +68,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QueryBody; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; 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 76065b0a24e09..422c4cc96196b 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 @@ -50,16 +50,23 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.MatchNumberValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -99,7 +106,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.rowpattern.RowPatternToIrRewriter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; @@ -108,26 +114,20 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertTablet; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; -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.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; -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.RowPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetOperation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Values; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowsStatement; @@ -163,6 +163,12 @@ import static org.apache.iotdb.commons.schema.table.InformationSchema.INFORMATION_DATABASE; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.CROSS; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.FULL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.IMPLICIT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.INNER; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.LEFT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.RIGHT; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.NavigationAnchor.LAST; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.NavigationMode.RUNNING; import static org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingTranslator.sortItemToSortOrder; @@ -172,12 +178,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.QueryPlanner.extractPatternRecognitionExpressions; import static org.apache.iotdb.db.queryengine.plan.relational.planner.QueryPlanner.pruneInvisibleFields; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractPredicates; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.CROSS; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.FULL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.IMPLICIT; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.INNER; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.LEFT; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join.Type.RIGHT; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.Position.PAST_LAST; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java index 0235983fa113a..f29d3d01a6b59 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java @@ -38,6 +38,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -48,7 +49,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; import org.apache.iotdb.db.queryengine.plan.relational.planner.QueryPlanner.PlanAndMappings; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; 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 1df67793ab87d..34f1ac281c105 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 @@ -35,6 +35,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -81,9 +83,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDevice; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WrappedStatement; 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 c0777ade0bf10..284417b84013e 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 @@ -27,6 +27,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.QueryStateMachine; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; @@ -46,11 +48,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; 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.relational.type.TypeManager; 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; 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 d04a425307777..721a99cc1782b 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 @@ -145,9 +145,9 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED; import static org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind.AGGREGATE; +import static org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PushPredicateIntoTableScan.containsDiffFunction; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.TransformSortToStreamSort.isOrderByAllIdsAndTime; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.split; 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 64726a0192137..d63fca9e1c0c9 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 @@ -22,6 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; @@ -40,7 +41,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDevice; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java index aff114c7ea926..21445b6d01559 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java @@ -33,6 +33,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.protocol.session.SessionManager; @@ -43,7 +44,6 @@ import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java index 157c20c2f7c67..93714a9a98f12 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability; 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.utils.constant.SqlConstant; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java index ca4362107917c..e4a790c36accc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java @@ -45,7 +45,7 @@ import static com.google.common.base.Verify.verify; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind.AGGREGATE; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; +import static org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java index fe1bb93d8a4bb..4ec9455bbcd9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java @@ -34,13 +34,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; 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.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.type.TypeCoercion; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java index 4896179d47b8d..d04cf6925fa0b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java @@ -23,11 +23,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability; 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.node.AggregationTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java index 2a47302011d15..77ab477375435 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java @@ -24,8 +24,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultTraversalVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableMap; 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 0d7e4c97497ad..f33c25900a6c6 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 @@ -27,6 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; 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/AddColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java index 0a8930490cdd3..6702673bb5b3d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java index ff1c3f5885e6a..9ed10a4db5aed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java @@ -26,6 +26,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java index dcccb6df04e9c..0669aa2361e8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; 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 bb2c56bcc33fe..e379797c3b291 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 @@ -23,14 +23,6 @@ public abstract class AstVisitor extends CommonQueryAstVisitor { - protected R visitStatement(Statement node, C context) { - return visitNode(node, context); - } - - protected R visitQuery(Query node, C context) { - return visitStatement(node, context); - } - protected R visitExplain(Explain node, C context) { return visitStatement(node, context); } @@ -75,14 +67,6 @@ protected R visitSelect(Select node, C context) { return visitNode(node, context); } - protected R visitRelation(Relation node, C context) { - return visitNode(node, context); - } - - protected R visitQueryBody(QueryBody node, C context) { - return visitRelation(node, context); - } - protected R visitFill(Fill node, C context) { return visitNode(node, context); } @@ -123,30 +107,10 @@ protected R visitWindowDefinition(WindowDefinition node, C context) { return visitNode(node, context); } - protected R visitSingleColumn(SingleColumn node, C context) { - return visitSelectItem(node, context); - } - protected R visitTable(Table node, C context) { return visitQueryBody(node, context); } - protected R visitValues(Values node, C context) { - return visitQueryBody(node, context); - } - - protected R visitTableSubquery(TableSubquery node, C context) { - return visitQueryBody(node, context); - } - - protected R visitAliasedRelation(AliasedRelation node, C context) { - return visitRelation(node, context); - } - - protected R visitJoin(Join node, C context) { - return visitRelation(node, context); - } - protected R visitColumnDefinition(ColumnDefinition node, C context) { return visitNode(node, context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java index 7627812ea3a47..344667021bf47 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java index 42a9c30d0fe32..9ac066fc0d21f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java index b4770de97ff6c..79daac1b01f04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java index 58ae4c847b1db..238374061d1db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java index d6d33db8a586e..4492146a06f07 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java index def3908cb13da..ce42609865109 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java index ba5763f160a29..e1b739b08294b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java index f52ed5ad8614c..d1645bd80aad8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java index 9f9e1e0c22a28..edcb1ea680c7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java index ed8e6fe0cd924..b60090234186f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java index 74b01e7d2ac5b..406e47e77e594 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java index 611937ae2d734..991fe62c9847a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java index 01276a9112724..1eda04568f288 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; @@ -39,6 +40,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; @@ -46,14 +48,19 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; public abstract class DefaultTraversalVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java index dd39c7e088fe2..a6130a857e5f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.storageengine.dataregion.modification.TableDeletionEntry; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java index 5a70ca95b335f..ac036675c829d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java index 07768d80f12ba..7ba3a90d95de8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java index daba3a5494b2c..ff87f1802d053 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java index 493ffffc5b78a..7d96446e848b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java index e0262d42846b4..66b62e7087797 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java index 3b3f8c4aa1487..49d45e4a6f516 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java index 98932ea309e93..7b38c657a1986 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java index 06d59f72d42a0..001207ecbf7e0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java index 278b50b2f87ec..1e4bfb3c927a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java index f1647bb741825..b4127005d8ba2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java index 1b22e728dd3b8..cfd64df9d1925 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java index ec4abce3f2601..2afd895b118d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java index ab413356af830..89fce236405bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java index 1ba6993101178..4d5622bfa7ed1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java index 3956d6386f3b0..29f113ab6e536 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java index 4850a1add8ced..55459f961a84f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java @@ -25,6 +25,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.LongType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java index d81813f3c5d6b..a79aa412eabf5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java index ae2aad9128d16..0da1a8f5137ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java index 06b25ce92f786..f455c04359c96 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; 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 index 0e3f68b671d88..bd283cbc1ea34 100644 --- 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 @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java index 99fb1d739f275..cdae9e7b03ed3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java index 482417ef16997..e7c34e86c9b29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.db.storageengine.load.config.LoadTsFileConfigurator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java index 3edf5887cd9bb..2bb56fae6d19c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NaturalJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NaturalJoin.java index 8b07b066e2c0c..46551a913d6fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NaturalJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NaturalJoin.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java index 259904fffbed2..3ebc7d922e3e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java index f90d3137be8d1..1fc18179dacee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java index d5826cebb9301..a86577160f705 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java index 1ca9a088a7450..d7f2756449329 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java index e11fe35e88aeb..eedccd3767440 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java @@ -26,6 +26,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java index ab3f08aa8182c..84aec7d01ceb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java index 1b6ad273637bf..5fc634f9c118a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java @@ -28,6 +28,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.relational.type.AuthorRType; import org.apache.iotdb.db.utils.DataNodeAuthUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java index f9f80cc326f52..8ab3f7bf2cbcb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java index 0f3417e575767..3802d1a515a26 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java index 467d8da30087c..9b317e67445fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java index 83d1c6213923d..9817249340db3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java index 9245744fb3eb8..b592aba8e1c18 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java @@ -26,6 +26,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java index a0513c321598e..a15839430973c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java @@ -26,6 +26,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java index 5cef04303f08d..c260ba5ee6b98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java index 19eb9904c5b93..331df91492e98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java @@ -21,6 +21,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java index 01cc47b33af2a..c2e795549a344 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java index 0d14ab30fec8f..b2f0953c60408 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java index b36e10a4d39f8..dabbcde9efedd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java index aef6e97843c34..5d712bf8c14ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java index 10620d72ed6f9..d4ade407492d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java index 19c8bfa0fb08f..23feef103bcbb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java index 31e64edc2dbda..a901bfc26aae7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java index 2f922692317bd..0c8c82935189e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java index 17a2b1aa2f0a5..028324fde3434 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java index e494af3156874..b2a8e50823ffb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java index 63c2a59d37d92..08f1055450dd2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java index 4e9b62d5e1089..2d7e1bcfc3b27 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java index 22b3d3965facd..575455933e1f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java index 1beef13f01a8a..1590a7a52982d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java index a418282a8fc4f..db3b2e6f70041 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java index b013f0c052426..9aaaf96c08225 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java index 06e3161e9b348..b4cf77b2745f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java index e6909ec5d28a2..d78abc55dffb7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java index 84a892620928a..c99be4036cdeb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java index 1d85bafc0403a..8ca97250a7d9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; 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 index 890d26803e014..585ef9b12251c 100644 --- 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 @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java index a1779fb6c45a0..220ac75316969 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java index a7782f0a68331..67dc97440ae02 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java index 1df4804300f0a..23488bdae30ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java index c4ec97630b4f5..bdef65a48828f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java index a3e25673b4237..1c3d3bfcc15fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java index f0d6a4689d8e9..8ebc80a06d989 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java index 51d492795f8a3..0e511e67579d6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java index 433936dd6799a..5f3cac3292035 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java index fd88e7495b07f..01f07c3ddb407 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java index 74c23aaca92e1..ee746365b973b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java index 5054e062098e4..f9cfefaf00017 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java index bdd1f249e5f40..df4fadf95efd6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java index 312b758b672a8..9345e19474b10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java index 544aabdfc3167..633a596e24a14 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import java.util.Collections; 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 d5e23cd700c6b..dbdb9d3a94e60 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 @@ -34,6 +34,7 @@ import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllRows; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; @@ -67,6 +68,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; @@ -81,17 +84,24 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Window; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; @@ -100,7 +110,6 @@ import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterColumnDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; @@ -148,8 +157,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; -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; @@ -173,12 +180,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QueryBody; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ReconstructRegion; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RelationalAuthorStatement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RemoveAINode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RemoveConfigNode; @@ -223,11 +227,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTopics; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVariables; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVersion; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StartPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StartRepairData; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopRepairData; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; @@ -235,13 +237,11 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionArgument; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UnloadModel; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Values; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ViewFieldDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowDefinition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java index 55460da064d60..62633ffbc1dba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java @@ -24,8 +24,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlBaseListener; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlLexer; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlParser; 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 index 16c3546bc8626..614ea7972d150 100644 --- 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 @@ -27,18 +27,18 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; 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.StatementAnalyzerFactory; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountStatement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowExternalService; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowQueriesStatement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowStatement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import java.util.Collections; import java.util.List; 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 index ee8fd1fad6b56..9a44ec77730aa 100644 --- 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 @@ -22,10 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; 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.StatementAnalyzerFactory; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java index e598c716d21b7..e3555bf504719 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; @@ -30,22 +31,21 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QueryBody; 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.Select; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowDefinition; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java index da435e3b4b28e..16ac73ea4a77f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java @@ -19,17 +19,24 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; @@ -57,8 +64,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; -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.Limit; @@ -67,9 +72,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; -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.RelationalAuthorStatement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; @@ -92,18 +95,15 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTopics; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVariables; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVersion; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SingleColumn; 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.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionArgument; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Values; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/Statement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/Statement.java index 0b2ecff6b5bc5..10980da9c8c56 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/Statement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/Statement.java @@ -61,7 +61,7 @@ public boolean isQuery() { public abstract List getPaths(); - public org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement toRelationalStatement( + public org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement toRelationalStatement( final MPPQueryContext context) { throw new UnsupportedOperationException("Method not implemented yet"); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java index 1cb5abed66ef5..e6f92b3b5d1e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java @@ -29,13 +29,13 @@ import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.IMeasurementSchemaInfo; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRow; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor; import org.apache.iotdb.db.utils.CommonUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java index 0dc884ea110a4..b372068a02a6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.attribute.update.UpdateDetailContainer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java index 4315f84338e2a..1e7e0ec91b6d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java @@ -29,6 +29,7 @@ import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException; import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -39,7 +40,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertTablet; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor; import org.apache.iotdb.db.utils.CommonUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java index e45603a14f92f..c3b2aee0b059e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java @@ -370,7 +370,7 @@ public List getPaths() { @TableModel @Override - public org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement toRelationalStatement( + public org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement toRelationalStatement( MPPQueryContext context) { final Map loadAttributes = new HashMap<>(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/pipe/PipeEnrichedStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/pipe/PipeEnrichedStatement.java index c9c125a981efa..a9d3b5ca1163f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/pipe/PipeEnrichedStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/pipe/PipeEnrichedStatement.java @@ -77,7 +77,7 @@ public List getPaths() { @TableModel @Override - public org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement toRelationalStatement( + public org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement toRelationalStatement( final MPPQueryContext context) { final PipeEnriched pipeEnriched = new PipeEnriched(innerStatement.toRelationalStatement(context)); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java index 67c3b0d322500..67f2211bf88f4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java @@ -26,6 +26,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; @@ -36,7 +37,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import com.google.common.collect.ImmutableList; 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 efa9407726a3c..1687ce936a34b 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 @@ -43,6 +43,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; @@ -71,7 +72,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; 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.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; 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 6df308c7dd306..9c9f212964845 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.security.ITableAuthChecker; import org.apache.iotdb.db.queryengine.plan.relational.security.TableModelPrivilege; import org.apache.iotdb.db.queryengine.plan.relational.security.TreeAccessCheckVisitor; -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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java index 7304d00233fc6..3774d51958dc5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java @@ -14,6 +14,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -21,7 +22,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; 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.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite.StatementRewriteFactory; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java index 9785e7441e9c2..6daeefbef7f58 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java @@ -29,6 +29,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -44,8 +46,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.mpp.rpc.thrift.TRegionRouteReq; import org.apache.iotdb.udf.api.relational.TableFunction; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index 81ba53d00a1ac..a30c160678390 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -36,6 +36,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.SessionInfo; @@ -56,8 +58,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TreeDeviceViewSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeManager; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.db.schemaengine.table.InformationSchemaUtils; 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 c3ef0b43c4a3e..c59afe2abfacc 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 @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; 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.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; 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 4d4deddf91d7e..29674d8e36970 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 @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -44,7 +45,6 @@ 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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/AstMemoryEstimatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/AstMemoryEstimatorTest.java index 62a5d3886a87a..c1ebeb5f331d1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/AstMemoryEstimatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/AstMemoryEstimatorTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import org.junit.Before; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java index 70b657653e39d..8d1795373bd86 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.auth.entity.PrivilegeModelType; import org.apache.iotdb.commons.auth.entity.PrivilegeType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RelationalAuthorStatement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.type.AuthorRType; import org.junit.Test; From 82fe2eccac358b2d0bb5b15830168f650fad0056 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Tue, 14 Apr 2026 17:18:47 +0800 Subject: [PATCH 14/45] add IPlanNodeDeserializer --- .../v1/handler/ExecuteStatementHandler.java | 4 +- .../table/v1/handler/QueryDataSetHandler.java | 4 +- .../table/v1/impl/RestApiServiceImpl.java | 2 +- .../statemachine/BaseStateMachine.java | 2 +- .../IoTConsensusDataRegionStateMachine.java | 2 +- .../plan/node/CommonPlanNodeDeserializer.java | 145 ++++++++ .../plan/node/IPlanNodeDeserializer.java | 33 ++ .../plan/planner/plan/node/PlanNode.java | 6 +- .../plan/planner/plan/node/PlanNodeType.java | 260 ++++++++++++++ .../planner/node/AggregationNode.java | 2 +- .../planner/node/AssignUniqueId.java | 2 +- .../relational/planner/node/CollectNode.java | 2 +- .../planner/node/EnforceSingleRowNode.java | 2 +- .../relational/planner/node/FilterNode.java | 2 +- .../relational/planner/node/GapFillNode.java | 2 +- .../relational/planner/node/GroupNode.java | 2 +- .../relational/planner/node/JoinNode.java | 2 +- .../relational/planner/node/LimitNode.java | 2 +- .../planner/node/LinearFillNode.java | 2 +- .../planner/node/MarkDistinctNode.java | 2 +- .../planner/node/MergeSortNode.java | 2 +- .../relational/planner/node/OffsetNode.java | 2 +- .../relational/planner/node/OutputNode.java | 2 +- .../planner/node/PatternRecognitionNode.java | 2 +- .../planner/node/PreviousFillNode.java | 2 +- .../relational/planner/node/ProjectNode.java | 2 +- .../planner/node/RowNumberNode.java | 2 +- .../relational/planner/node/SemiJoinNode.java | 2 +- .../relational/planner/node/SortNode.java | 2 +- .../planner/node/StreamSortNode.java | 2 +- .../planner/node/TableFunctionNode.java | 2 +- .../node/TableFunctionProcessorNode.java | 2 +- .../relational/planner/node/TopKNode.java | 2 +- .../planner/node/TopKRankingNode.java | 2 +- .../relational/planner/node/UnionNode.java | 2 +- .../planner/node/ValueFillNode.java | 2 +- .../relational/planner/node/ValuesNode.java | 2 +- .../relational/planner/node/WindowNode.java | 2 +- .../task/subtask/sink/PipeSinkSubtask.java | 2 +- .../deletion/PipeDeleteDataNodeEvent.java | 2 +- .../schema/PipeSchemaRegionSnapshotEvent.java | 2 +- .../PipeSchemaRegionWritePlanEvent.java | 2 +- .../request/PipeTransferPlanNodeReq.java | 2 +- .../request/IoTConsensusV2DeleteNodeReq.java | 2 +- .../IoTConsensusV2TabletInsertNodeReq.java | 2 +- .../schemaregion/IoTDBSchemaRegionSource.java | 2 +- .../SchemaRegionListeningFilter.java | 2 +- .../impl/DataNodeInternalRPCServiceImpl.java | 2 +- .../plan/planner/plan/PlanFragment.java | 2 +- ...java => DataNodePlanNodeDeserializer.java} | 334 ++---------------- .../plan/node/load/LoadTsFilePieceNode.java | 2 +- .../metadata/read/CountSchemaMergeNode.java | 2 +- .../read/DeviceSchemaFetchScanNode.java | 2 +- .../node/metadata/read/DevicesCountNode.java | 2 +- .../metadata/read/DevicesSchemaScanNode.java | 2 +- .../read/LevelTimeSeriesCountNode.java | 2 +- .../read/LogicalViewSchemaScanNode.java | 2 +- .../read/NodeManagementMemoryMergeNode.java | 2 +- .../metadata/read/NodePathsConvertNode.java | 2 +- .../metadata/read/NodePathsCountNode.java | 2 +- .../read/NodePathsSchemaScanNode.java | 2 +- .../read/PathsUsingTemplateScanNode.java | 2 +- .../metadata/read/SchemaFetchMergeNode.java | 2 +- .../metadata/read/SchemaQueryMergeNode.java | 2 +- .../read/SchemaQueryOrderByHeatNode.java | 2 +- .../read/SeriesSchemaFetchScanNode.java | 2 +- .../metadata/read/TimeSeriesCountNode.java | 2 +- .../read/TimeSeriesSchemaScanNode.java | 2 +- .../metadata/write/ActivateTemplateNode.java | 2 +- .../write/AlterEncodingCompressorNode.java | 2 +- .../metadata/write/AlterTimeSeriesNode.java | 2 +- .../write/BatchActivateTemplateNode.java | 2 +- .../write/ConstructSchemaBlackListNode.java | 2 +- .../write/CreateAlignedTimeSeriesNode.java | 2 +- .../write/CreateMultiTimeSeriesNode.java | 2 +- .../metadata/write/CreateTimeSeriesNode.java | 2 +- .../write/DeactivateTemplateNode.java | 2 +- .../metadata/write/DeleteTimeSeriesNode.java | 2 +- .../InternalBatchActivateTemplateNode.java | 2 +- .../InternalCreateMultiTimeSeriesNode.java | 2 +- .../write/InternalCreateTimeSeriesNode.java | 2 +- .../write/PreDeactivateTemplateNode.java | 2 +- .../RollbackPreDeactivateTemplateNode.java | 2 +- .../write/RollbackSchemaBlackListNode.java | 2 +- .../write/view/AlterLogicalViewNode.java | 2 +- .../ConstructLogicalViewBlackListNode.java | 2 +- .../write/view/CreateLogicalViewNode.java | 2 +- .../write/view/DeleteLogicalViewNode.java | 2 +- .../RollbackLogicalViewBlackListNode.java | 2 +- .../node/pipe/PipeEnrichedDeleteDataNode.java | 2 +- .../node/pipe/PipeEnrichedInsertNode.java | 2 +- .../pipe/PipeEnrichedNonWritePlanNode.java | 2 +- .../node/pipe/PipeEnrichedWritePlanNode.java | 2 +- .../node/pipe/PipeOperateSchemaQueueNode.java | 2 +- .../plan/node/process/AI/InferenceNode.java | 2 +- .../process/ActiveRegionScanMergeNode.java | 2 +- .../process/AggregationMergeSortNode.java | 2 +- .../plan/node/process/AggregationNode.java | 2 +- .../plan/node/process/CollectNode.java | 2 +- .../plan/node/process/ColumnInjectNode.java | 2 +- .../plan/node/process/DeviceMergeNode.java | 2 +- .../plan/node/process/DeviceViewIntoNode.java | 2 +- .../plan/node/process/DeviceViewNode.java | 2 +- .../plan/node/process/ExchangeNode.java | 2 +- .../planner/plan/node/process/FillNode.java | 2 +- .../planner/plan/node/process/FilterNode.java | 2 +- .../plan/node/process/GroupByLevelNode.java | 2 +- .../plan/node/process/GroupByTagNode.java | 2 +- .../node/process/HorizontallyConcatNode.java | 2 +- .../planner/plan/node/process/IntoNode.java | 2 +- .../planner/plan/node/process/LimitNode.java | 2 +- .../plan/node/process/MergeSortNode.java | 2 +- .../planner/plan/node/process/OffsetNode.java | 2 +- .../plan/node/process/ProjectNode.java | 2 +- .../node/process/RawDataAggregationNode.java | 2 +- .../node/process/SingleDeviceViewNode.java | 2 +- .../process/SlidingWindowAggregationNode.java | 2 +- .../planner/plan/node/process/SortNode.java | 2 +- .../planner/plan/node/process/TopKNode.java | 2 +- .../plan/node/process/TransformNode.java | 2 +- .../process/join/FullOuterTimeJoinNode.java | 2 +- .../node/process/join/InnerTimeJoinNode.java | 2 +- .../process/join/LeftOuterTimeJoinNode.java | 2 +- .../process/last/LastQueryCollectNode.java | 2 +- .../node/process/last/LastQueryMergeNode.java | 2 +- .../plan/node/process/last/LastQueryNode.java | 2 +- .../process/last/LastQueryTransformNode.java | 2 +- .../plan/node/sink/IdentitySinkNode.java | 2 +- .../plan/node/sink/ShuffleSinkNode.java | 2 +- .../AlignedSeriesAggregationScanNode.java | 2 +- .../node/source/AlignedSeriesScanNode.java | 2 +- .../node/source/DeviceRegionScanNode.java | 2 +- .../plan/node/source/LastQueryScanNode.java | 2 +- .../source/SeriesAggregationScanNode.java | 2 +- .../plan/node/source/SeriesScanNode.java | 2 +- .../plan/node/source/ShowDiskUsageNode.java | 2 +- .../plan/node/source/ShowQueriesNode.java | 2 +- .../node/source/TimeseriesRegionScanNode.java | 2 +- ...ontinuousSameSearchIndexSeparatorNode.java | 2 +- .../plan/node/write/DeleteDataNode.java | 2 +- .../node/write/InsertMultiTabletsNode.java | 2 +- .../plan/node/write/InsertRowNode.java | 2 +- .../plan/node/write/InsertRowsNode.java | 2 +- .../node/write/InsertRowsOfOneDeviceNode.java | 2 +- .../plan/node/write/InsertTabletNode.java | 2 +- .../planner/plan/node/write/ObjectNode.java | 2 +- .../node/write/RelationalDeleteDataNode.java | 2 +- .../node/write/RelationalInsertRowNode.java | 2 +- .../node/write/RelationalInsertRowsNode.java | 2 +- .../write/RelationalInsertTabletNode.java | 2 +- .../node/AggregationTableScanNode.java | 2 +- .../AggregationTreeDeviceViewScanNode.java | 2 +- ...gnedAggregationTreeDeviceViewScanNode.java | 2 +- .../planner/node/DeviceTableScanNode.java | 2 +- .../relational/planner/node/ExchangeNode.java | 2 +- .../node/InformationSchemaTableScanNode.java | 2 +- .../relational/planner/node/IntoNode.java | 2 +- ...gnedAggregationTreeDeviceViewScanNode.java | 2 +- ...skUsageInformationSchemaTableScanNode.java | 2 +- .../node/TreeAlignedDeviceViewScanNode.java | 2 +- .../TreeNonAlignedDeviceViewScanNode.java | 2 +- .../ConstructTableDevicesBlackListNode.java | 2 +- .../schema/CreateOrUpdateTableDeviceNode.java | 2 +- .../node/schema/DeleteTableDeviceNode.java | 2 +- .../DeleteTableDevicesInBlackListNode.java | 2 +- .../RollbackTableDevicesBlackListNode.java | 2 +- .../schema/TableAttributeColumnDropNode.java | 2 +- .../TableDeviceAttributeCommitUpdateNode.java | 2 +- .../TableDeviceAttributeUpdateNode.java | 2 +- .../node/schema/TableDeviceFetchNode.java | 2 +- .../schema/TableDeviceQueryCountNode.java | 2 +- .../node/schema/TableDeviceQueryScanNode.java | 2 +- .../node/schema/TableNodeLocationAddNode.java | 2 +- .../load/LoadTsFileDispatcherImpl.java | 2 +- .../visitor/SchemaRegionPlanDeserializer.java | 2 +- .../dataregion/wal/buffer/WALEntry.java | 2 +- .../dataregion/wal/node/WALNode.java | 2 +- ...an.planner.plan.node.IPlanNodeDeserializer | 1 + .../logical/RegionScanLogicalPlannerTest.java | 2 +- .../SchemaQueryLogicalPlannerTest.java | 2 +- .../node/PlanNodeDeserializeHelper.java | 2 +- .../read/DeviceSchemaFetchScanNodeTest.java | 2 +- .../read/PathsUsingTemplateScanNodeTest.java | 2 +- .../read/SchemaFetchMergeNodeTest.java | 2 +- .../read/SeriesSchemaFetchScanNodeTest.java | 2 +- .../write/MetadataWriteNodeSerDeTest.java | 2 +- .../PipeEnrichedDeleteDataNodeSerdeTest.java | 2 +- .../pipe/PipeEnrichedInsertNodeSerdeTest.java | 2 +- ...PipeEnrichedNonWritePlanNodeSerdeTest.java | 2 +- .../PipeEnrichedWritePlanNodeSerdeTest.java | 2 +- ...SameSearchIndexSeparatorNodeSerDeTest.java | 2 +- .../node/write/DeleteDataNodeSerdeTest.java | 2 +- .../InsertMultiTabletsNodeSerdeTest.java | 2 +- .../node/write/InsertRowNodeSerdeTest.java | 2 +- .../node/write/InsertRowsNodeSerdeTest.java | 2 +- .../InsertRowsOfOneDeviceNodeSerdeTest.java | 2 +- .../node/write/InsertTabletNodeSerdeTest.java | 2 +- .../write/RelationalDeleteDataNodeTest.java | 2 +- 198 files changed, 655 insertions(+), 512 deletions(-) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeType.java rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/{PlanNodeType.java => DataNodePlanNodeDeserializer.java} (66%) create mode 100644 iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializer diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExecuteStatementHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExecuteStatementHandler.java index 4fa749dd567be..646f5759c8baa 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExecuteStatementHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExecuteStatementHandler.java @@ -17,11 +17,12 @@ package org.apache.iotdb.rest.protocol.table.v1.handler; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DescribeTable; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RelationalAuthorStatement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowAIDevices; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowAINodes; @@ -49,7 +50,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTopics; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVariables; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVersion; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.type.AuthorRType; import java.util.HashSet; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/QueryDataSetHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/QueryDataSetHandler.java index ec22f478b8b70..1b3ea44b245a1 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/QueryDataSetHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/QueryDataSetHandler.java @@ -18,10 +18,10 @@ package org.apache.iotdb.rest.protocol.table.v1.handler; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.rest.protocol.model.ExecutionStatus; import org.apache.iotdb.rest.protocol.table.v1.model.QueryDataSet; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java index b35e9d27f595c..215f4d948d31a 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.protocol.thrift.OperationType; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; -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.crud.InsertTabletStatement; import org.apache.iotdb.db.utils.CommonUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java index 369cb4c72bed8..68fe546d8add7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java @@ -23,8 +23,8 @@ import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest; import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java index 7bff200b7d73c..267c03b7ded64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java @@ -29,7 +29,7 @@ import org.apache.iotdb.consensus.common.request.IndexedConsensusRequest; import org.apache.iotdb.consensus.common.request.IoTConsensusRequest; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntry; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java new file mode 100644 index 0000000000000..3b5081678513e --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java @@ -0,0 +1,145 @@ +/* + * 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.node_commons.plan.planner.plan.node; + +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; + +import java.io.DataInputStream; +import java.io.IOException; +import java.nio.ByteBuffer; + +public class CommonPlanNodeDeserializer implements IPlanNodeDeserializer { + @Override + public PlanNode deserializeFromWAL(DataInputStream stream) throws IOException { + throw new UnsupportedOperationException("Not supported for CommonPlanNodeDeserializer"); + } + + @Override + public PlanNode deserializeFromWAL(ByteBuffer buffer) { + throw new UnsupportedOperationException("Not supported for CommonPlanNodeDeserializer"); + } + + @Override + public PlanNode deserialize(ByteBuffer buffer) { + short nodeType = buffer.getShort(); + return deserialize(buffer, nodeType); + } + + @Override + public PlanNode deserialize(ByteBuffer buffer, short nodeType) { + switch (nodeType) { + case 1001: + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode.deserialize( + buffer); + case 1002: + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode + .deserialize(buffer); + case 1003: + return OutputNode.deserialize(buffer); + case 1004: + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode.deserialize( + buffer); + case 1005: + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode.deserialize( + buffer); + case 1006: + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode.deserialize( + buffer); + case 1007: + return MergeSortNode.deserialize(buffer); + case 1008: + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode.deserialize( + buffer); + case 1009: + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode + .deserialize(buffer); + case 1010: + return StreamSortNode.deserialize(buffer); + case 1011: + return JoinNode.deserialize(buffer); + case 1012: + return PreviousFillNode.deserialize(buffer); + case 1013: + return LinearFillNode.deserialize(buffer); + case 1014: + return ValueFillNode.deserialize(buffer); + case 1015: + return org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode + .deserialize(buffer); + case 1017: + return GapFillNode.deserialize(buffer); + case 1020: + return EnforceSingleRowNode.deserialize(buffer); + case 1025: + return SemiJoinNode.deserialize(buffer); + case 1026: + return MarkDistinctNode.deserialize(buffer); + case 1027: + return AssignUniqueId.deserialize(buffer); + case 1028: + return TableFunctionNode.deserialize(buffer); + case 1029: + return TableFunctionProcessorNode.deserialize(buffer); + case 1030: + return GroupNode.deserialize(buffer); + case 1031: + return PatternRecognitionNode.deserialize(buffer); + case 1032: + return WindowNode.deserialize(buffer); + case 1034: + return UnionNode.deserialize(buffer); + case 1035: + return IntersectNode.deserialize(buffer); + case 1036: + return ExceptNode.deserialize(buffer); + case 1037: + return TopKRankingNode.deserialize(buffer); + case 1038: + return RowNumberNode.deserialize(buffer); + case 1039: + return ValuesNode.deserialize(buffer); + default: + throw new IllegalArgumentException("Invalid node type: " + nodeType); + } + } + + @Override + public PlanNode deserializeWithTemplate(ByteBuffer buffer, TypeProvider typeProvider) { + throw new UnsupportedOperationException("Not supported for CommonPlanNodeDeserializer"); + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java new file mode 100644 index 0000000000000..9b90244b496be --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java @@ -0,0 +1,33 @@ +/* + * 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.node_commons.plan.planner.plan.node; + +import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; + +import java.io.DataInputStream; +import java.io.IOException; +import java.nio.ByteBuffer; + +public interface IPlanNodeDeserializer { + PlanNode deserializeFromWAL(DataInputStream stream) throws IOException; + + PlanNode deserializeFromWAL(ByteBuffer buffer); + + PlanNode deserialize(ByteBuffer buffer); + + PlanNode deserialize(ByteBuffer buffer, short nodeType); + + PlanNode deserializeWithTemplate(ByteBuffer buffer, TypeProvider typeProvider); +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java index 16cbb65fbdaa2..caa22a9848a39 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java @@ -23,7 +23,6 @@ import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.PublicBAOS; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -174,10 +173,7 @@ public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvi } } - /** - * Deserialize via {@link - * org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType#deserialize(ByteBuffer)} - */ + /** Deserialize via {@link PlanNodeType#deserialize(ByteBuffer)} */ @Override public ByteBuffer serializeToByteBuffer() { try (PublicBAOS byteArrayOutputStream = new PublicBAOS(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeType.java new file mode 100644 index 0000000000000..02291197f4c93 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeType.java @@ -0,0 +1,260 @@ +/* + * 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.node_commons.plan.planner.plan.node; + +import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; + +import org.apache.tsfile.utils.ReadWriteIOUtils; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ServiceLoader; + +public enum PlanNodeType { + AGGREGATE((short) 0), + DEVICE_VIEW((short) 1), + FILL((short) 2), + FILTER((short) 3), + FILTER_NULL((short) 4), + GROUP_BY_LEVEL((short) 5), + LIMIT((short) 6), + OFFSET((short) 7), + SORT((short) 8), + FULL_OUTER_TIME_JOIN((short) 9), + FRAGMENT_SINK((short) 10), + SERIES_SCAN((short) 11), + SERIES_AGGREGATE_SCAN((short) 12), + INSERT_TABLET((short) 13), + INSERT_ROW((short) 14), + INSERT_ROWS((short) 15), + INSERT_ROWS_OF_ONE_DEVICE((short) 16), + INSERT_MULTI_TABLET((short) 17), + DEVICES_SCHEMA_SCAN((short) 18), + CREATE_TIME_SERIES((short) 19), + EXCHANGE((short) 20), + ALTER_TIME_SERIES((short) 21), + CREATE_ALIGNED_TIME_SERIES((short) 22), + TIME_SERIES_SCHEMA_SCAN((short) 23), + SERIES_SCHEMA_FETCH_SCAN((short) 24), + SCHEMA_QUERY_MERGE((short) 25), + SCHEMA_QUERY_ORDER_BY_HEAT((short) 26), + DEVICES_COUNT((short) 27), + TIME_SERIES_COUNT((short) 28), + LEVEL_TIME_SERIES_COUNT((short) 29), + COUNT_MERGE((short) 30), + SLIDING_WINDOW_AGGREGATION((short) 31), + PROJECT((short) 32), + ALIGNED_SERIES_SCAN((short) 33), + ALIGNED_SERIES_AGGREGATE_SCAN((short) 34), + DEVICE_MERGE((short) 35), + SCHEMA_FETCH_MERGE((short) 36), + TRANSFORM((short) 37), + CREATE_MULTI_TIME_SERIES((short) 39), + NODE_PATHS_SCAN((short) 40), + NODE_PATHS_CONVERT((short) 41), + NODE_MANAGEMENT_MEMORY_MERGE((short) 42), + DELETE_DATA((short) 44), + DELETE_TIME_SERIES((short) 45), + @Deprecated + DEPRECATED_LAST_QUERY_SCAN((short) 46), + @Deprecated + DEPRECATED_ALIGNED_LAST_QUERY_SCAN((short) 47), + LAST_QUERY((short) 48), + LAST_QUERY_MERGE((short) 49), + LAST_QUERY_COLLECT((short) 50), + NODE_PATHS_COUNT((short) 51), + INTERNAL_CREATE_TIME_SERIES((short) 52), + ACTIVATE_TEMPLATE((short) 53), + PATHS_USING_TEMPLATE_SCAN((short) 54), + LOAD_TSFILE((short) 55), + CONSTRUCT_SCHEMA_BLACK_LIST_NODE((short) 56), + ROLLBACK_SCHEMA_BLACK_LIST_NODE((short) 57), + GROUP_BY_TAG((short) 58), + PRE_DEACTIVATE_TEMPLATE_NODE((short) 59), + ROLLBACK_PRE_DEACTIVATE_TEMPLATE_NODE((short) 60), + DEACTIVATE_TEMPLATE_NODE((short) 61), + INTO((short) 62), + DEVICE_VIEW_INTO((short) 63), + VERTICALLY_CONCAT((short) 64), + SINGLE_DEVICE_VIEW((short) 65), + MERGE_SORT((short) 66), + SHOW_QUERIES((short) 67), + INTERNAL_BATCH_ACTIVATE_TEMPLATE((short) 68), + INTERNAL_CREATE_MULTI_TIMESERIES((short) 69), + IDENTITY_SINK((short) 70), + SHUFFLE_SINK((short) 71), + BATCH_ACTIVATE_TEMPLATE((short) 72), + CREATE_LOGICAL_VIEW((short) 73), + CONSTRUCT_LOGICAL_VIEW_BLACK_LIST((short) 74), + ROLLBACK_LOGICAL_VIEW_BLACK_LIST((short) 75), + DELETE_LOGICAL_VIEW((short) 76), + LOGICAL_VIEW_SCHEMA_SCAN((short) 77), + ALTER_LOGICAL_VIEW((short) 78), + PIPE_ENRICHED_INSERT_DATA((short) 79), + INFERENCE((short) 80), + LAST_QUERY_TRANSFORM((short) 81), + TOP_K((short) 82), + COLUMN_INJECT((short) 83), + + PIPE_ENRICHED_DELETE_DATA((short) 84), + PIPE_ENRICHED_WRITE((short) 85), + PIPE_ENRICHED_NON_WRITE((short) 86), + + INNER_TIME_JOIN((short) 87), + LEFT_OUTER_TIME_JOIN((short) 88), + AGG_MERGE_SORT((short) 89), + + EXPLAIN_ANALYZE((short) 90), + + PIPE_OPERATE_SCHEMA_QUEUE_REFERENCE((short) 91), + + RAW_DATA_AGGREGATION((short) 92), + + DEVICE_REGION_SCAN((short) 93), + TIMESERIES_REGION_SCAN((short) 94), + REGION_MERGE((short) 95), + DEVICE_SCHEMA_FETCH_SCAN((short) 96), + + CONTINUOUS_SAME_SEARCH_INDEX_SEPARATOR((short) 97), + + LAST_QUERY_SCAN((short) 98), + ALTER_ENCODING_COMPRESSOR((short) 99), + // 100 - 106 are occupied + SHOW_DISK_USAGE((short) 107), + TREE_COLLECT((short) 108), + LOAD_TSFILE_OBJECT_PIECE((short) 109), + + CREATE_OR_UPDATE_TABLE_DEVICE((short) 902), + TABLE_DEVICE_QUERY_SCAN((short) 903), + TABLE_DEVICE_FETCH((short) 904), + DELETE_TABLE_DEVICE((short) 905), + TABLE_DEVICE_QUERY_COUNT((short) 906), + TABLE_DEVICE_ATTRIBUTE_UPDATE((short) 907), + TABLE_DEVICE_ATTRIBUTE_COMMIT((short) 908), + TABLE_DEVICE_LOCATION_ADD((short) 909), + CONSTRUCT_TABLE_DEVICES_BLACK_LIST((short) 910), + ROLLBACK_TABLE_DEVICES_BLACK_LIST((short) 911), + DELETE_TABLE_DEVICES_IN_BLACK_LIST((short) 912), + TABLE_ATTRIBUTE_COLUMN_DROP((short) 913), + + DEVICE_TABLE_SCAN_NODE((short) 1000), + TABLE_FILTER_NODE((short) 1001), + TABLE_PROJECT_NODE((short) 1002), + TABLE_OUTPUT_NODE((short) 1003), + TABLE_LIMIT_NODE((short) 1004), + TABLE_OFFSET_NODE((short) 1005), + TABLE_SORT_NODE((short) 1006), + TABLE_MERGESORT_NODE((short) 1007), + TABLE_TOPK_NODE((short) 1008), + TABLE_COLLECT_NODE((short) 1009), + TABLE_STREAM_SORT_NODE((short) 1010), + TABLE_JOIN_NODE((short) 1011), + TABLE_PREVIOUS_FILL_NODE((short) 1012), + TABLE_LINEAR_FILL_NODE((short) 1013), + TABLE_VALUE_FILL_NODE((short) 1014), + TABLE_AGGREGATION_NODE((short) 1015), + TABLE_AGGREGATION_TABLE_SCAN_NODE((short) 1016), + TABLE_GAP_FILL_NODE((short) 1017), + 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), + @Deprecated + AGGREGATION_TREE_DEVICE_VIEW_SCAN_NODE((short) 1022), + TREE_ALIGNED_DEVICE_VIEW_SCAN_NODE((short) 1023), + TREE_NONALIGNED_DEVICE_VIEW_SCAN_NODE((short) 1024), + TABLE_SEMI_JOIN_NODE((short) 1025), + MARK_DISTINCT_NODE((short) 1026), + TABLE_ASSIGN_UNIQUE_ID((short) 1027), + TABLE_FUNCTION_NODE((short) 1028), + TABLE_FUNCTION_PROCESSOR_NODE((short) 1029), + TABLE_GROUP_NODE((short) 1030), + TABLE_PATTERN_RECOGNITION_NODE((short) 1031), + TABLE_WINDOW_FUNCTION((short) 1032), + TABLE_INTO_NODE((short) 1033), + TABLE_UNION_NODE((short) 1034), + TABLE_INTERSECT_NODE((short) 1035), + TABLE_EXCEPT_NODE((short) 1036), + TABLE_TOPK_RANKING_NODE((short) 1037), + TABLE_ROW_NUMBER_NODE((short) 1038), + TABLE_VALUES_NODE((short) 1039), + TABLE_DISK_USAGE_INFORMATION_SCHEMA_TABLE_SCAN_NODE((short) 1040), + ALIGNED_AGGREGATION_TREE_DEVICE_VIEW_SCAN_NODE((short) 1041), + NON_ALIGNED_AGGREGATION_TREE_DEVICE_VIEW_SCAN_NODE((short) 1042), + + RELATIONAL_INSERT_TABLET((short) 2000), + RELATIONAL_INSERT_ROW((short) 2001), + RELATIONAL_INSERT_ROWS((short) 2002), + RELATIONAL_DELETE_DATA((short) 2003), + OBJECT_FILE_NODE((short) 2004), + ; + + private static IPlanNodeDeserializer deserializer; + + static { + ServiceLoader loader = ServiceLoader.load(IPlanNodeDeserializer.class); + for (IPlanNodeDeserializer element : loader) { + deserializer = element; + } + deserializer = deserializer == null ? new CommonPlanNodeDeserializer() : deserializer; + } + + public static final int BYTES = Short.BYTES; + + private final short nodeType; + + PlanNodeType(short nodeType) { + this.nodeType = nodeType; + } + + public short getNodeType() { + return nodeType; + } + + public void serialize(ByteBuffer buffer) { + ReadWriteIOUtils.write(nodeType, buffer); + } + + public void serialize(DataOutputStream stream) throws IOException { + ReadWriteIOUtils.write(nodeType, stream); + } + + public static PlanNode deserializeFromWAL(DataInputStream stream) throws IOException { + return deserializer.deserializeFromWAL(stream); + } + + public static PlanNode deserializeFromWAL(ByteBuffer buffer) { + return deserializer.deserializeFromWAL(buffer); + } + + public static PlanNode deserialize(ByteBuffer buffer) { + return deserializer.deserialize(buffer); + } + + public static PlanNode deserialize(ByteBuffer buffer, short nodeType) { + return deserializer.deserialize(buffer, nodeType); + } + + public static PlanNode deserializeWithTemplate(ByteBuffer buffer, TypeProvider typeProvider) { + return deserializer.deserializeWithTemplate(buffer, typeProvider); + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java index 3fa61cff53a30..f91d592615d37 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.SessionInfo; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java index daa9cfca66dda..e6f66718266cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java index 67ec71d4d07d1..78f579480e46e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java index 2988b159ec887..9f8daa8938af9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java index 83dc90458abf4..94b4ec837788c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java index a36152c5d11c9..0576a27d2e8a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java index e0eec1a78a375..1984891fb9656 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java @@ -23,8 +23,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java index 2f50412b54732..35aeb18230a11 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java @@ -23,12 +23,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java index a702b9fdd4bb4..9369b7b62dc09 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java index 952e67c7c607b..09d58da9528d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java @@ -23,8 +23,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java index 0e5bfd7993bc9..592aaae37451c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java index bd38710f2f986..18c4ad16a59b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java index 9bbe0194b5b72..93295bc919541 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java index aeb7a867349ee..1896b87ad68bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java index 76c57dab6be64..18a55c38938f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java @@ -23,13 +23,13 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java index 0c9765ffc0d86..bc56fcb5bba7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java @@ -23,8 +23,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java index e1e0bf1af4f77..00413bd7bf461 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java @@ -23,11 +23,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java index 607cac039409e..f02b86641388a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java index 957b5e293f756..9585da45e778c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java index b50fc2dce342b..c539f5b8c2d98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java index b580a05b87ae5..99b76592ccc87 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java @@ -23,8 +23,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java index 7cbe614c69fae..f8f79f56c846b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java index c84da9d560521..2f6c2009d5122 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java index 5b78f4226fcd9..7b4966550eb17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java index 0eef249565f10..5edc569da7eb9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java index fb04d6a9c64a4..7ef9cd11d5680 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java @@ -23,8 +23,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java index 547b2b590f424..29cc5b301039e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java index 4b7099b778ae3..0614061bdfbd8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java @@ -24,11 +24,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java index 39e527caa5f32..be58e21d8ca21 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java index c6ab294600567..dc6a1efc4df6e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.sink.protocol.IoTDBSink; import org.apache.iotdb.commons.utils.ErrorHandlingCommonUtils; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.UserDefinedEnrichedEvent; import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.pipe.metric.sink.PipeDataRegionSinkMetrics; import org.apache.iotdb.db.pipe.sink.protocol.thrift.async.IoTDBDataRegionAsyncSink; import org.apache.iotdb.db.pipe.sink.protocol.thrift.sync.IoTDBDataRegionSyncSink; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.metrics.type.Histogram; import org.apache.iotdb.pipe.api.PipeConnector; import org.apache.iotdb.pipe.api.event.Event; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/deletion/PipeDeleteDataNodeEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/deletion/PipeDeleteDataNodeEvent.java index f49f2b8bc8344..cfb8b65af367a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/deletion/PipeDeleteDataNodeEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/deletion/PipeDeleteDataNodeEvent.java @@ -28,8 +28,8 @@ import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.SerializableEvent; import org.apache.iotdb.db.auth.AuthorityChecker; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.AbstractDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java index 711b473a0869f..c521be63bb4bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java @@ -26,9 +26,9 @@ import org.apache.iotdb.commons.pipe.event.PipeSnapshotEvent; import org.apache.iotdb.commons.pipe.resource.ref.PipePhantomReferenceManager.PipeEventResource; import org.apache.iotdb.commons.pipe.resource.snapshot.PipeSnapshotResourceManager; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.pipe.event.ReferenceTrackableEvent; import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java index 7ea1ad1938d8e..cc777b73ca617 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.PipeWritePlanEvent; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java index ce5af01a8de20..0a1334d5047d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion; import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq; import org.apache.tsfile.utils.BytesUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2DeleteNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2DeleteNodeReq.java index e1785a9269695..c2fbd583d5805 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2DeleteNodeReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2DeleteNodeReq.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestVersion; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TCommitId; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TIoTConsensusV2TransferReq; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.AbstractDeleteDataNode; import org.apache.tsfile.utils.PublicBAOS; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletInsertNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletInsertNodeReq.java index 714be88fca1d3..7484c46a47110 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletInsertNodeReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletInsertNodeReq.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestVersion; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TCommitId; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TIoTConsensusV2TransferReq; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.tsfile.utils.PublicBAOS; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java index a139811b602dc..bbcfe44ff42aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java @@ -38,6 +38,7 @@ import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionSnapshotEvent; @@ -48,7 +49,6 @@ import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeOperateSchemaQueueNode; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java index b8492f3d7f2b6..e40d18045a7bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java @@ -26,7 +26,7 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; import org.apache.iotdb.db.schemaengine.SchemaEngine; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java index 9f4ab5fbef49a..e8e145b970553 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -107,6 +107,7 @@ import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.partition.DataPartitionTableGenerator; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.protocol.client.ConfigNodeInfo; @@ -151,7 +152,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePieceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; 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 fd68db64083ed..48a251050ee31 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 @@ -25,11 +25,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPartitionRelatedNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.SubPlanTypeExtractor; import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesAggregationScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.VirtualSourceNode; 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/DataNodePlanNodeDeserializer.java similarity index 66% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializer.java index b330e09e554c7..35be4b564804e 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/DataNodePlanNodeDeserializer.java @@ -1,48 +1,21 @@ /* - * 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 + * 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. + * 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.planner.plan.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.CommonPlanNodeDeserializer; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePieceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; @@ -162,213 +135,14 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceQueryScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableNodeLocationAddNode; -import org.apache.tsfile.utils.ReadWriteIOUtils; - import java.io.DataInputStream; -import java.io.DataOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -public enum PlanNodeType { - AGGREGATE((short) 0), - DEVICE_VIEW((short) 1), - FILL((short) 2), - FILTER((short) 3), - FILTER_NULL((short) 4), - GROUP_BY_LEVEL((short) 5), - LIMIT((short) 6), - OFFSET((short) 7), - SORT((short) 8), - FULL_OUTER_TIME_JOIN((short) 9), - FRAGMENT_SINK((short) 10), - SERIES_SCAN((short) 11), - SERIES_AGGREGATE_SCAN((short) 12), - INSERT_TABLET((short) 13), - INSERT_ROW((short) 14), - INSERT_ROWS((short) 15), - INSERT_ROWS_OF_ONE_DEVICE((short) 16), - INSERT_MULTI_TABLET((short) 17), - DEVICES_SCHEMA_SCAN((short) 18), - CREATE_TIME_SERIES((short) 19), - EXCHANGE((short) 20), - ALTER_TIME_SERIES((short) 21), - CREATE_ALIGNED_TIME_SERIES((short) 22), - TIME_SERIES_SCHEMA_SCAN((short) 23), - SERIES_SCHEMA_FETCH_SCAN((short) 24), - SCHEMA_QUERY_MERGE((short) 25), - SCHEMA_QUERY_ORDER_BY_HEAT((short) 26), - DEVICES_COUNT((short) 27), - TIME_SERIES_COUNT((short) 28), - LEVEL_TIME_SERIES_COUNT((short) 29), - COUNT_MERGE((short) 30), - SLIDING_WINDOW_AGGREGATION((short) 31), - PROJECT((short) 32), - ALIGNED_SERIES_SCAN((short) 33), - ALIGNED_SERIES_AGGREGATE_SCAN((short) 34), - DEVICE_MERGE((short) 35), - SCHEMA_FETCH_MERGE((short) 36), - TRANSFORM((short) 37), - CREATE_MULTI_TIME_SERIES((short) 39), - NODE_PATHS_SCAN((short) 40), - NODE_PATHS_CONVERT((short) 41), - NODE_MANAGEMENT_MEMORY_MERGE((short) 42), - DELETE_DATA((short) 44), - DELETE_TIME_SERIES((short) 45), - @Deprecated - DEPRECATED_LAST_QUERY_SCAN((short) 46), - @Deprecated - DEPRECATED_ALIGNED_LAST_QUERY_SCAN((short) 47), - LAST_QUERY((short) 48), - LAST_QUERY_MERGE((short) 49), - LAST_QUERY_COLLECT((short) 50), - NODE_PATHS_COUNT((short) 51), - INTERNAL_CREATE_TIME_SERIES((short) 52), - ACTIVATE_TEMPLATE((short) 53), - PATHS_USING_TEMPLATE_SCAN((short) 54), - LOAD_TSFILE((short) 55), - CONSTRUCT_SCHEMA_BLACK_LIST_NODE((short) 56), - ROLLBACK_SCHEMA_BLACK_LIST_NODE((short) 57), - GROUP_BY_TAG((short) 58), - PRE_DEACTIVATE_TEMPLATE_NODE((short) 59), - ROLLBACK_PRE_DEACTIVATE_TEMPLATE_NODE((short) 60), - DEACTIVATE_TEMPLATE_NODE((short) 61), - INTO((short) 62), - DEVICE_VIEW_INTO((short) 63), - VERTICALLY_CONCAT((short) 64), - SINGLE_DEVICE_VIEW((short) 65), - MERGE_SORT((short) 66), - SHOW_QUERIES((short) 67), - INTERNAL_BATCH_ACTIVATE_TEMPLATE((short) 68), - INTERNAL_CREATE_MULTI_TIMESERIES((short) 69), - IDENTITY_SINK((short) 70), - SHUFFLE_SINK((short) 71), - BATCH_ACTIVATE_TEMPLATE((short) 72), - CREATE_LOGICAL_VIEW((short) 73), - CONSTRUCT_LOGICAL_VIEW_BLACK_LIST((short) 74), - ROLLBACK_LOGICAL_VIEW_BLACK_LIST((short) 75), - DELETE_LOGICAL_VIEW((short) 76), - LOGICAL_VIEW_SCHEMA_SCAN((short) 77), - ALTER_LOGICAL_VIEW((short) 78), - PIPE_ENRICHED_INSERT_DATA((short) 79), - INFERENCE((short) 80), - LAST_QUERY_TRANSFORM((short) 81), - TOP_K((short) 82), - COLUMN_INJECT((short) 83), - - PIPE_ENRICHED_DELETE_DATA((short) 84), - PIPE_ENRICHED_WRITE((short) 85), - PIPE_ENRICHED_NON_WRITE((short) 86), - - INNER_TIME_JOIN((short) 87), - LEFT_OUTER_TIME_JOIN((short) 88), - AGG_MERGE_SORT((short) 89), - - EXPLAIN_ANALYZE((short) 90), - - PIPE_OPERATE_SCHEMA_QUEUE_REFERENCE((short) 91), - - RAW_DATA_AGGREGATION((short) 92), - - DEVICE_REGION_SCAN((short) 93), - TIMESERIES_REGION_SCAN((short) 94), - REGION_MERGE((short) 95), - DEVICE_SCHEMA_FETCH_SCAN((short) 96), - - CONTINUOUS_SAME_SEARCH_INDEX_SEPARATOR((short) 97), - - LAST_QUERY_SCAN((short) 98), - ALTER_ENCODING_COMPRESSOR((short) 99), - // 100 - 106 are occupied - SHOW_DISK_USAGE((short) 107), - TREE_COLLECT((short) 108), - LOAD_TSFILE_OBJECT_PIECE((short) 109), - - CREATE_OR_UPDATE_TABLE_DEVICE((short) 902), - TABLE_DEVICE_QUERY_SCAN((short) 903), - TABLE_DEVICE_FETCH((short) 904), - DELETE_TABLE_DEVICE((short) 905), - TABLE_DEVICE_QUERY_COUNT((short) 906), - TABLE_DEVICE_ATTRIBUTE_UPDATE((short) 907), - TABLE_DEVICE_ATTRIBUTE_COMMIT((short) 908), - TABLE_DEVICE_LOCATION_ADD((short) 909), - CONSTRUCT_TABLE_DEVICES_BLACK_LIST((short) 910), - ROLLBACK_TABLE_DEVICES_BLACK_LIST((short) 911), - DELETE_TABLE_DEVICES_IN_BLACK_LIST((short) 912), - TABLE_ATTRIBUTE_COLUMN_DROP((short) 913), - - DEVICE_TABLE_SCAN_NODE((short) 1000), - TABLE_FILTER_NODE((short) 1001), - TABLE_PROJECT_NODE((short) 1002), - TABLE_OUTPUT_NODE((short) 1003), - TABLE_LIMIT_NODE((short) 1004), - TABLE_OFFSET_NODE((short) 1005), - TABLE_SORT_NODE((short) 1006), - TABLE_MERGESORT_NODE((short) 1007), - TABLE_TOPK_NODE((short) 1008), - TABLE_COLLECT_NODE((short) 1009), - TABLE_STREAM_SORT_NODE((short) 1010), - TABLE_JOIN_NODE((short) 1011), - TABLE_PREVIOUS_FILL_NODE((short) 1012), - TABLE_LINEAR_FILL_NODE((short) 1013), - TABLE_VALUE_FILL_NODE((short) 1014), - TABLE_AGGREGATION_NODE((short) 1015), - TABLE_AGGREGATION_TABLE_SCAN_NODE((short) 1016), - TABLE_GAP_FILL_NODE((short) 1017), - 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), - @Deprecated - AGGREGATION_TREE_DEVICE_VIEW_SCAN_NODE((short) 1022), - TREE_ALIGNED_DEVICE_VIEW_SCAN_NODE((short) 1023), - TREE_NONALIGNED_DEVICE_VIEW_SCAN_NODE((short) 1024), - TABLE_SEMI_JOIN_NODE((short) 1025), - MARK_DISTINCT_NODE((short) 1026), - TABLE_ASSIGN_UNIQUE_ID((short) 1027), - TABLE_FUNCTION_NODE((short) 1028), - TABLE_FUNCTION_PROCESSOR_NODE((short) 1029), - TABLE_GROUP_NODE((short) 1030), - TABLE_PATTERN_RECOGNITION_NODE((short) 1031), - TABLE_WINDOW_FUNCTION((short) 1032), - TABLE_INTO_NODE((short) 1033), - TABLE_UNION_NODE((short) 1034), - TABLE_INTERSECT_NODE((short) 1035), - TABLE_EXCEPT_NODE((short) 1036), - TABLE_TOPK_RANKING_NODE((short) 1037), - TABLE_ROW_NUMBER_NODE((short) 1038), - TABLE_VALUES_NODE((short) 1039), - TABLE_DISK_USAGE_INFORMATION_SCHEMA_TABLE_SCAN_NODE((short) 1040), - ALIGNED_AGGREGATION_TREE_DEVICE_VIEW_SCAN_NODE((short) 1041), - NON_ALIGNED_AGGREGATION_TREE_DEVICE_VIEW_SCAN_NODE((short) 1042), - - RELATIONAL_INSERT_TABLET((short) 2000), - RELATIONAL_INSERT_ROW((short) 2001), - RELATIONAL_INSERT_ROWS((short) 2002), - RELATIONAL_DELETE_DATA((short) 2003), - OBJECT_FILE_NODE((short) 2004), - ; - - public static final int BYTES = Short.BYTES; - - private final short nodeType; - - PlanNodeType(short nodeType) { - this.nodeType = nodeType; - } +public class DataNodePlanNodeDeserializer extends CommonPlanNodeDeserializer { - public short getNodeType() { - return nodeType; - } - - public void serialize(ByteBuffer buffer) { - ReadWriteIOUtils.write(nodeType, buffer); - } - - public void serialize(DataOutputStream stream) throws IOException { - ReadWriteIOUtils.write(nodeType, stream); - } - - public static PlanNode deserializeFromWAL(DataInputStream stream) throws IOException { + @Override + public PlanNode deserializeFromWAL(DataInputStream stream) throws IOException { short nodeType = stream.readShort(); switch (nodeType) { case 13: @@ -396,7 +170,8 @@ public static PlanNode deserializeFromWAL(DataInputStream stream) throws IOExcep } } - public static PlanNode deserializeFromWAL(ByteBuffer buffer) { + @Override + public PlanNode deserializeFromWAL(ByteBuffer buffer) { short nodeType = buffer.getShort(); switch (nodeType) { case 13: @@ -424,12 +199,14 @@ public static PlanNode deserializeFromWAL(ByteBuffer buffer) { } } - public static PlanNode deserialize(ByteBuffer buffer) { + @Override + public PlanNode deserialize(ByteBuffer buffer) { short nodeType = buffer.getShort(); return deserialize(buffer, nodeType); } - public static PlanNode deserialize(ByteBuffer buffer, short nodeType) { + @Override + public PlanNode deserialize(ByteBuffer buffer, short nodeType) { switch (nodeType) { case 0: return AggregationNode.deserialize(buffer); @@ -656,56 +433,14 @@ public static PlanNode deserialize(ByteBuffer buffer, short nodeType) { case 1000: return org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode .deserialize(buffer); - case 1001: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode.deserialize( - buffer); - case 1002: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode - .deserialize(buffer); - case 1003: - return OutputNode.deserialize(buffer); - case 1004: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode.deserialize( - buffer); - case 1005: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode.deserialize( - buffer); - case 1006: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode.deserialize( - buffer); - case 1007: - return MergeSortNode.deserialize(buffer); - case 1008: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode.deserialize( - buffer); - case 1009: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode - .deserialize(buffer); - case 1010: - return StreamSortNode.deserialize(buffer); - case 1011: - return JoinNode.deserialize(buffer); - case 1012: - return PreviousFillNode.deserialize(buffer); - case 1013: - return LinearFillNode.deserialize(buffer); - case 1014: - return ValueFillNode.deserialize(buffer); - case 1015: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode - .deserialize(buffer); case 1016: return org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode .deserialize(buffer); - case 1017: - return GapFillNode.deserialize(buffer); case 1018: return org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode .deserialize(buffer); case 1019: throw new UnsupportedOperationException("ExplainAnalyzeNode should not be deserialized"); - case 1020: - return EnforceSingleRowNode.deserialize(buffer); case 1021: return InformationSchemaTableScanNode.deserialize(buffer); case 1022: @@ -715,37 +450,9 @@ public static PlanNode deserialize(ByteBuffer buffer, short nodeType) { return TreeAlignedDeviceViewScanNode.deserialize(buffer); case 1024: return TreeNonAlignedDeviceViewScanNode.deserialize(buffer); - case 1025: - return SemiJoinNode.deserialize(buffer); - case 1026: - return MarkDistinctNode.deserialize(buffer); - case 1027: - return AssignUniqueId.deserialize(buffer); - case 1028: - return TableFunctionNode.deserialize(buffer); - case 1029: - return TableFunctionProcessorNode.deserialize(buffer); - case 1030: - return GroupNode.deserialize(buffer); - case 1031: - return PatternRecognitionNode.deserialize(buffer); - case 1032: - return WindowNode.deserialize(buffer); case 1033: return org.apache.iotdb.db.queryengine.plan.relational.planner.node.IntoNode.deserialize( buffer); - case 1034: - return UnionNode.deserialize(buffer); - case 1035: - return IntersectNode.deserialize(buffer); - case 1036: - return ExceptNode.deserialize(buffer); - case 1037: - return TopKRankingNode.deserialize(buffer); - case 1038: - return RowNumberNode.deserialize(buffer); - case 1039: - return ValuesNode.deserialize(buffer); case 1040: return TableDiskUsageInformationSchemaTableScanNode.deserialize(buffer); case 1041: @@ -763,11 +470,12 @@ public static PlanNode deserialize(ByteBuffer buffer, short nodeType) { case 2004: return ObjectNode.deserialize(buffer); default: - throw new IllegalArgumentException("Invalid node type: " + nodeType); + return super.deserialize(buffer, nodeType); } } - public static PlanNode deserializeWithTemplate(ByteBuffer buffer, TypeProvider typeProvider) { + @Override + public PlanNode deserializeWithTemplate(ByteBuffer buffer, TypeProvider typeProvider) { short nodeType = buffer.getShort(); switch (nodeType) { case 1: diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java index 343b695cc91fc..cb2430dad124f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.storageengine.load.splitter.TsFileData; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java index 47a4ce6c5b70d..cac962c35baa3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java index 71c36852200bd..11f6c8357a0aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java @@ -25,7 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/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 ecfba4a979637..12790c12630a9 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 @@ -26,7 +26,7 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 833ff0ca51784..caae24a3f53e2 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 @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 185155bd3fa26..8c88ff8a5344a 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 @@ -28,7 +28,7 @@ import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 3f209f4b91546..264567b108586 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 @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java index 1a1e525b2e335..80b8574859e46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java @@ -24,8 +24,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java index 97b6f8f0a0573..a42b3fe66c064 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java index 9ed4b892febba..b5bcce82dae00 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; 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 7c4ec5f4848fd..b3d735cd6a56b 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 @@ -26,7 +26,7 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import java.io.DataOutputStream; import java.io.IOException; 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 a607d20036461..fc95c6a5a7a19 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 @@ -26,7 +26,7 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java index c3ef17d7cf96f..aed1f45f45b33 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java index d2bf5328fd02b..1c506499dbbd3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; 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 fda19ac654d21..25f0a93c02423 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java index 9ba441a38efe6..8d990294e7ee6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java @@ -26,7 +26,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/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 60b33156cfb7d..052ada6cded1b 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 @@ -29,7 +29,7 @@ import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 22f237b73c8d3..7403e0de493fa 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 @@ -28,7 +28,7 @@ import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java index 3c3348127a515..a7e77e8892ade 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java @@ -25,8 +25,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.IActivateTemplateInClusterPlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java index a74248bf4aa22..699081a028293 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java @@ -24,7 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java index 6aa6163edbb14..e288904226bf5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java @@ -25,8 +25,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.statement.metadata.AlterTimeSeriesStatement.AlterType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java index dc56f5db3bef0..d1b13aa585f80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java @@ -25,8 +25,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java index 72e4d44c69624..d990fa34b3085 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java index 6aee2d3d55ecf..0fafc86735816 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java @@ -25,9 +25,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; -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.WritePlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.ICreateAlignedTimeSeriesPlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java index 33a844badc369..bf4f6cf4a4fe4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java @@ -27,8 +27,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java index 25fc0a202988c..203e4d1c746e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java @@ -25,8 +25,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.ICreateTimeSeriesPlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java index da58716dd1f55..8c2ed09a7c607 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java @@ -24,7 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.IDeactivateTemplatePlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java index a9e83eed5af2a..e9d609b75faaa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java index 272001184dfcb..a805d617dfaf3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java @@ -25,8 +25,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java index 921295abe45b9..c2ab2e477e9e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java @@ -25,8 +25,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java index 237caab414eb6..e88ef4ed06bc0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java @@ -25,8 +25,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java index eaa6f1ab0c0db..1e769a2cc90c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java @@ -24,7 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.IPreDeactivateTemplatePlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java index 847ba6031e765..0da7a95fe2c68 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java @@ -24,7 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.IRollbackPreDeactivateTemplatePlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java index 3dd2b30dc5d82..c65a6d3d1e152 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java index 36ad6ab300425..7be0d3b62896f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java @@ -27,7 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.exception.NotImplementedException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java index 58a3adab366f0..1f15987585723 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java index 567d79c3423e2..b2ff441aca390 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java @@ -28,8 +28,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.GetSourcePathsVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java index 86ed0ffab4467..dbfffb670190e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java index 73054797710c4..03f0fb9166b78 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java index 9d0d589bfd413..340b8d9caa8b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java @@ -25,9 +25,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.AbstractDeleteDataNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java index c6598b66cb524..ba6ab23977e23 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java @@ -27,9 +27,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java index c6ca3638c8fe2..cac5291ebcee9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java @@ -23,8 +23,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; -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.metadata.write.ConstructSchemaBlackListNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.DeactivateTemplateNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java index 7484472b34dab..9bfa4b99437e8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java @@ -24,9 +24,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java index 6f76b3454f7ef..3f728091b911e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningQueue; -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.schemaengine.schemaregion.SchemaRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java index 5efeeefdf9253..b48142ac863df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -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.parameter.model.ModelInferenceDescriptor; 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 29d71c8d46549..768ae31c348dd 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 @@ -24,8 +24,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -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.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java index 5b9dff59f49a0..47ebfdb1d07ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java @@ -22,9 +22,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -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.parameter.OrderByParameter; 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 adf84068fdb8a..33ec8c5f41f81 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 @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -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.SeriesAggregationSourceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java index d80eaa8405e43..6c60c862f5d70 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -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.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java index a6ae7527e57fc..f093e4f6e4ab4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -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.utils.columngenerator.parameter.ColumnGeneratorParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java index 9b0dc2f6da256..2b103caab2368 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -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.parameter.OrderByParameter; 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 8d34269162615..d7b0253354374 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 @@ -24,8 +24,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -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.parameter.DeviceViewIntoPathDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java index b4d18238d088f..464b8cc89b5a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java @@ -22,9 +22,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -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.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java index 5b45ee711a637..25186dc202fdd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; -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.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java index 7296721c3d685..1ec03f937acc7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -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.parameter.FillDescriptor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java index 223163ff4813a..9e6094df3709c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java @@ -22,9 +22,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -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.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java index d365a5c7072ae..6f8b06e21de79 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -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.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.CrossSeriesAggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java index 1df7f3f713364..47d7383c96fea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -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.parameter.CrossSeriesAggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java index 35622b93398d1..9af48bd3200b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; 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 7c4887ecd1906..3b9e19a44d241 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 @@ -24,8 +24,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -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.parameter.IntoPathDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java index 7401a227a7d96..2e351a4b04228 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -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.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java index fd705e247e7c6..ac03355d32c6c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -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.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java index 3f85624773dd7..d7321d4a3b54d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -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.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java index 77ba0fb82d79e..7e00d7564261c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java @@ -22,9 +22,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -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.tsfile.utils.ReadWriteIOUtils; 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 51352a1cc0af5..b94ccd5e87160 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 @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -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.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java index 68140352be45f..40149d06bb23f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -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.tsfile.file.metadata.IDeviceID; 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 fac977482cdeb..db2567a6c208b 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -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.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java index 1240548bb94d2..a2d7a887aa2f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -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.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java index 24f24cd057418..ce740bdbf6b84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -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.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java index 18b33e88985af..c6b90976d50b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java @@ -22,9 +22,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -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.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java index 9c96501969f99..0782a0572566b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -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.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java index 804a79dc197f5..0f04c33fb3c61 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -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.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java index e4eba09f3d911..1a72e17afdfce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -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.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java index 97826f7cfd0b6..f8f4f88196836 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java index d077baed20665..6fa583cba5415 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -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.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java index 2c172660e96bb..0ea4f9f13d932 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; -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.LastQueryScanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java index c6810ff1ce417..919471b294e5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -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.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java index dd261f3faaecf..402e1afd778fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; -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.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java index f710858543d8f..95d50d3d78244 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; -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.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java index 432496b483425..774db7567e354 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java @@ -27,9 +27,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java index bb6ef32e10887..dacad0bac3887 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java @@ -27,9 +27,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; 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 ccbf5e03c7e1d..c9e8d8c2bdf3b 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 @@ -27,8 +27,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.common.DeviceContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/LastQueryScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastQueryScanNode.java index 497829c013c2c..6322f28680b7f 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 @@ -27,7 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/SeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java index af660028678a1..d1ace2f44d3ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java @@ -26,8 +26,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java index 7f37b75264cc5..6b2f0b25d0b19 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java @@ -26,8 +26,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java index 68cc41c7b8195..f903a5909a294 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java @@ -26,8 +26,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; 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 df5c338fa200c..d9590c6febf3c 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 @@ -23,7 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; 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 9d1b9e36573b6..5686576d60ac7 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 @@ -30,8 +30,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java index e90d7741cf457..61aa0a5441fd9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.IWALByteBufferView; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntryValue; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java index e7a5a1d631ff8..2f14d41143073 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java @@ -31,11 +31,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.common.schematree.DeviceSchemaInfo; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.IWALByteBufferView; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java index ef535fa0666e9..6d24c792acb20 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java @@ -26,8 +26,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.storageengine.dataregion.memtable.AbstractMemTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java index 7b2bd40226c6c..0907f468d78e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java @@ -28,8 +28,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java index 90bcd719ba311..86a26fd30719c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java @@ -29,8 +29,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.storageengine.dataregion.memtable.AbstractMemTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java index 2e93affa8aa06..888cac2a87c0e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java @@ -30,9 +30,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; -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.WritePlanNode; import org.apache.iotdb.db.storageengine.dataregion.memtable.AbstractMemTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java index a1c379adacafd..51356ca415299 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java @@ -32,8 +32,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java index bc9aea68d0df3..ef336afd892b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java @@ -26,8 +26,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.storageengine.dataregion.IObjectPath; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java index c802148848dbd..a65c0e428d16d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java @@ -26,8 +26,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java index 00f47ca578082..9340132891af7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java @@ -25,7 +25,7 @@ import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.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.fetcher.cache.TableDeviceSchemaCache; import org.apache.iotdb.db.storageengine.dataregion.memtable.AbstractMemTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java index 8907d9a45bbb6..3cd025fc0370d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java @@ -25,8 +25,8 @@ import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.storageengine.dataregion.memtable.AbstractMemTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java index 32e8edca317f1..e185141589adf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java @@ -29,8 +29,8 @@ import org.apache.iotdb.db.exception.query.OutOfTTLException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceSchemaCache; 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 6c7d0df515744..92ff9b9fcfb0e 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 @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -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.DeviceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java index 6395498b28160..184c7fabe54bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -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.DeviceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java index 58e400df82a4c..b9c28465e1946 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -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.DeviceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java index 40c2a0476246c..93a504d79a87d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -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.AlignedDeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java index 5d22f378fcf3f..a76119f56fbed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; -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.tsfile.utils.ReadWriteIOUtils; 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 index 949486dad637a..0c21c104c96c8 100644 --- 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 @@ -22,9 +22,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java index cfa4397d078a0..a7ad2a52b9561 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java @@ -22,9 +22,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -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.sql.ast.Insert; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java index 5856c3c188568..fdc18882c3979 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -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.DeviceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java index 8a67d14ab0881..47afa6899f0a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java @@ -22,9 +22,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; 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/planner/node/TreeAlignedDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java index 66a7dcf686dd5..989e79299cbb1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -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.DeviceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java index 23f621fe7ee63..6366211387a33 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -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.DeviceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java index 4272c275f3749..18a7bd4c81e54 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java index c40208ad2b983..79efd9d56e8e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java @@ -23,8 +23,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java index e41be3bf7fb26..9e8525cf80dae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java index 30060e7953324..48996ea0dca3a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java index d02019bf228cd..f682b0386a41f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java index 6f53c32dd7e21..d1f5d0b6f24bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java index 0446164273cb2..5c19bf1a863a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; 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 b986b46be54b4..2dd85d153ae81 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 @@ -25,11 +25,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; -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.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; 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 2741d75ed625d..40edaf46057ba 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 @@ -24,7 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.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.metadata.read.TableDeviceSourceNode; import org.apache.iotdb.db.schemaengine.schemaregion.attribute.update.DeviceAttributeCacheUpdater; 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 1b8bac0a8ecc2..460562198662d 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 @@ -25,8 +25,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.nio.ByteBuffer; 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 1d4a5496175dd..d9e2cdd6e0753 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 @@ -25,8 +25,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -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.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java index c79f21e783f41..753e9f409d90b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java index 0cff14c93dbe9..ca3cc660bb7a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java @@ -35,10 +35,10 @@ import org.apache.iotdb.db.exception.load.LoadFileException; import org.apache.iotdb.db.exception.mpp.FragmentInstanceDispatchException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadSingleTsFileNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePieceNode; import org.apache.iotdb.db.queryengine.plan.scheduler.FragInstanceDispatchResult; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java index 163ccb4e59de8..09d33269520dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.ConstructTableDevicesBlackListNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java index 2d79472cd37df..edfbe5325ff35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.buffer; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.ContinuousSameSearchIndexSeparatorNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java index 07dd4d78f6605..94a6acf81b7ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java @@ -27,7 +27,7 @@ import org.apache.iotdb.consensus.common.request.IoTConsensusRequest; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.ContinuousSameSearchIndexSeparatorNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializer b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializer new file mode 100644 index 0000000000000..7c0108023311f --- /dev/null +++ b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializer @@ -0,0 +1 @@ +org.apache.iotdb.db.queryengine.plan.planner.plan.node.DataNodePlanNodeDeserializer \ No newline at end of file diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java index daffb8aed34ec..0f434c4fc3193 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java @@ -28,10 +28,10 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.DeviceRegionScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java index f5304f2da0437..0ef2afa61eb5c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java @@ -26,11 +26,11 @@ import org.apache.iotdb.commons.schema.filter.impl.PathContainsFilter; import org.apache.iotdb.commons.schema.filter.impl.TagFilter; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesSchemaScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodeManagementMemoryMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.NodePathsConvertNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java index 86ee4d7655220..ac11d782225da 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java index 4c37f42f47f03..135fecf532006 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java index 7f60a1a3df3b6..d29ce46914033 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.PathsUsingTemplateScanNode; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java index e388084e61f15..1c4c62a1cd435 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaFetchMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SeriesSchemaFetchScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java index 06d22fa26d8fb..2c2076a49f412 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SeriesSchemaFetchScanNode; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java index 70deff489d0c9..834b15e0856cd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.BatchActivateTemplateNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java index 6cdce2e05185c..d236b4c9e509d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java index d27ee2b4ae75f..d6e56f1eaf39c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedInsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java index 1a15995f30bda..7ed8a9109feda 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.DeleteTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedNonWritePlanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java index 48867b4c94331..1afbf6ef35086 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalBatchActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedWritePlanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java index e6283f3518292..4a96067329135 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.write; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.ContinuousSameSearchIndexSeparatorNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALByteBufferForTest; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java index c07f1db9d037d..6bbe4fcd1f6d8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java index e462cfba31c78..2ecf492d14294 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertMultiTabletsNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java index 4c77ec58e7ee2..6645810eda8cc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALByteBufferForTest; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java index 2c124062c445d..0e6cb54c233c9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertRowNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java index 9056c2164a1c3..66faaf76ae184 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsOfOneDeviceNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java index 665f5f1df4cf8..9ded59cbfd2b9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALByteBufferForTest; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java index 8b1b6cf146517..df33c0f22c5ea 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.consensus.index.impl.IoTProgressIndex; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.storageengine.dataregion.modification.DeletionPredicate; import org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.And; import org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.FullExactMatch; From d19de0b2d594e80f5cbedc2af6a50396e8967d36 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Wed, 15 Apr 2026 15:20:24 +0800 Subject: [PATCH 15/45] fix --- .../ArithmeticBinaryColumnTransformer.ftl | 6 +- .../ArithmeticColumnTransformerApi.ftl | 12 +- .../ArithmeticUnaryColumnTransformer.ftl | 2 +- .../plan/planner/TableOperatorGenerator.java | 8 +- .../expression => }/multi/FunctionType.java | 2 +- .../{function => }/BoundSignature.java | 2 +- .../function/{function => }/FunctionId.java | 2 +- .../function/{function => }/FunctionKind.java | 2 +- .../InterpretedFunctionInvoker.java | 2 +- .../LongVariableConstraint.java | 2 +- .../function/{function => }/OperatorType.java | 2 +- .../ResolvedFunctionCallBuilder.java | 2 +- .../function/{function => }/Signature.java | 2 +- .../TableBuiltinTableFunction.java | 8 +- .../TypeVariableConstraint.java | 2 +- .../arithmetic/AdditionResolver.java | 2 +- .../arithmetic/DivisionResolver.java | 2 +- .../arithmetic/ModulusResolver.java | 2 +- .../arithmetic/MultiplicationResolver.java | 2 +- .../arithmetic/SubtractionResolver.java | 2 +- .../tvf/ClassifyTableFunction.java | 2 +- .../tvf/ForecastTableFunction.java | 6 +- .../tvf/PatternMatchTableFunction.java | 12 +- .../tvf/TableFunctionUtils.java | 2 +- .../{function => }/tvf/match/MatchConfig.java | 2 +- .../tvf/match/QetchAlgorithm.java | 18 +- .../tvf/match/model/MatchState.java | 4 +- .../tvf/match/model/PatternSegment.java | 4 +- .../{function => }/tvf/match/model/Point.java | 2 +- .../tvf/match/model/RegexMatchState.java | 6 +- .../tvf/match/model/Section.java | 2 +- .../relational/metadata/ResolvedFunction.java | 6 +- .../planner/node/AggregationNode.java | 2 +- .../impl/DataNodeInternalRPCServiceImpl.java | 12 +- .../aggregation/AccumulatorFactory.java | 6 +- .../aggregation/UDAFAccumulator.java | 2 +- .../SlidingWindowAggregatorFactory.java | 2 +- .../TableDateBinTimeRangeIterator.java | 2 +- .../process/FilterAndProjectOperator.java | 20 +- .../operator/process/TransformOperator.java | 2 +- .../gapfill/GapFillWGroupWMoOperator.java | 2 +- .../gapfill/GapFillWGroupWoMoOperator.java | 2 +- .../gapfill/GapFillWoGroupWMoOperator.java | 2 +- .../gapfill/GapFillWoGroupWoMoOperator.java | 2 +- .../process/rowpattern/PatternAggregator.java | 2 +- .../schema/source/DeviceAttributeUpdater.java | 4 +- .../source/DeviceBlackListConstructor.java | 4 +- .../schema/source/DevicePredicateFilter.java | 4 +- .../schema/source/DevicePredicateHandler.java | 4 +- .../operator/schema/source/DeviceUpdater.java | 4 +- ...formationSchemaContentSupplierFactory.java | 2 +- .../window/ConditionWindowParameter.java | 2 +- .../relational/ColumnTransformerBuilder.java | 266 +++++++++--------- .../db/queryengine/plan/analyze/Analysis.java | 6 +- .../plan/analyze/AnalyzeVisitor.java | 16 +- .../plan/analyze/ConcatPathRewriter.java | 2 +- .../plan/analyze/ExpressionAnalyzer.java | 52 ++-- .../plan/analyze/ExpressionTypeAnalyzer.java | 40 +-- .../plan/analyze/ExpressionUtils.java | 60 ++-- .../plan/analyze/GroupByLevelHelper.java | 2 +- .../plan/analyze/PredicateUtils.java | 38 +-- .../plan/analyze/SelectIntoUtils.java | 4 +- .../analyze/TemplatedAggregationAnalyze.java | 10 +- .../plan/analyze/TemplatedAnalyze.java | 8 +- .../plan/analyze/TemplatedInfo.java | 6 +- .../plan/analyze/TypeProvider.java | 2 +- .../executor/ClusterConfigTaskExecutor.java | 4 +- .../config/metadata/ShowFunctionsTask.java | 2 +- .../expression => }/Expression.java | 62 ++-- .../expression => }/ExpressionFactory.java | 44 +-- .../expression => }/ExpressionType.java | 2 +- .../UnknownExpressionTypeException.java | 2 +- .../binary/AdditionExpression.java | 8 +- .../binary/ArithmeticBinaryExpression.java | 6 +- .../binary/BinaryExpression.java | 8 +- .../binary/CompareBinaryExpression.java | 16 +- .../binary/DivisionExpression.java | 8 +- .../binary/EqualToExpression.java | 8 +- .../binary/GreaterEqualExpression.java | 8 +- .../binary/GreaterThanExpression.java | 8 +- .../binary/LessEqualExpression.java | 8 +- .../binary/LessThanExpression.java | 8 +- .../binary/LogicAndExpression.java | 8 +- .../binary/LogicBinaryExpression.java | 6 +- .../binary/LogicOrExpression.java | 8 +- .../binary/ModuloExpression.java | 8 +- .../binary/MultiplicationExpression.java | 8 +- .../binary/NonEqualExpression.java | 8 +- .../binary/SubtractionExpression.java | 8 +- .../binary/WhenThenExpression.java | 8 +- .../expression => }/leaf/ConstantOperand.java | 8 +- .../expression => }/leaf/LeafOperand.java | 4 +- .../expression => }/leaf/NullOperand.java | 8 +- .../leaf/TimeSeriesOperand.java | 8 +- .../leaf/TimestampOperand.java | 8 +- .../multi/FunctionExpression.java | 16 +- .../multi/builtin/BuiltInFunctionHelper.java | 2 +- .../builtin/BuiltInScalarFunctionHelper.java | 8 +- .../BuiltInScalarFunctionHelperFactory.java | 12 +- .../builtin/helper/CastFunctionHelper.java | 10 +- .../builtin/helper/DiffFunctionHelper.java | 10 +- .../builtin/helper/ReplaceFunctionHelper.java | 10 +- .../builtin/helper/RoundFunctionHelper.java | 10 +- .../helper/SubStringFunctionHelper.java | 8 +- .../other/CaseWhenThenExpression.java | 14 +- .../other/GroupByTimeExpression.java | 10 +- .../ternary/BetweenExpression.java | 8 +- .../ternary/TernaryExpression.java | 8 +- .../expression => }/unary/InExpression.java | 16 +- .../unary/IsNullExpression.java | 8 +- .../expression => }/unary/LikeExpression.java | 8 +- .../unary/LogicNotExpression.java | 16 +- .../unary/NegationExpression.java | 16 +- .../unary/RegularExpression.java | 8 +- .../unary/UnaryExpression.java | 8 +- .../BindTypeForTimeSeriesOperandVisitor.java | 8 +- .../CollectAggregationExpressionsVisitor.java | 8 +- .../CollectSourceExpressionsVisitor.java | 10 +- .../visitor/CollectVisitor.java | 12 +- .../visitor/ColumnTransformerVisitor.java | 94 +++---- .../CompleteMeasurementSchemaVisitor.java | 14 +- .../visitor/ConcatDeviceVisitor.java | 6 +- .../CountTimeAggregationAmountVisitor.java | 8 +- .../visitor/ExistUnknownTypeInExpression.java | 10 +- .../visitor/ExpressionAnalyzeVisitor.java | 4 +- .../visitor/ExpressionNormalizeVisitor.java | 8 +- .../visitor/ExpressionVisitor.java | 76 ++--- .../GetMeasurementExpressionVisitor.java | 6 +- .../visitor/IntermediateLayerVisitor.java | 36 +-- .../visitor/LowercaseNormalizeVisitor.java | 6 +- .../visitor/ReconstructVisitor.java | 16 +- .../visitor/RemoveRootPrefixVisitor.java | 6 +- .../visitor/ReplaceLogicalViewVisitor.java | 14 +- .../ReplaceRawPathWithGroupedPathVisitor.java | 10 +- .../ReplaceSubTreeWithViewVisitor.java | 6 +- ...catRemoveUnExistentMeasurementVisitor.java | 8 +- .../TransformToViewExpressionVisitor.java | 56 ++-- .../BindSchemaForExpressionVisitor.java | 14 +- .../BindSchemaForPredicateVisitor.java | 20 +- .../cartesian/CartesianProductVisitor.java | 16 +- ...viceAndBindSchemaForExpressionVisitor.java | 14 +- ...atDeviceAndBindSchemaForHavingVisitor.java | 8 +- ...eviceAndBindSchemaForPredicateVisitor.java | 16 +- ...oncatExpressionWithSuffixPathsVisitor.java | 12 +- .../cartesian/QueryContextProvider.java | 2 +- .../visitor/logical/LogicalAndVisitor.java | 16 +- .../visitor/logical/LogicalOrVisitor.java | 16 +- .../PredicateCanPushDownToSourceChecker.java | 6 +- .../logical/TimeFilterExistChecker.java | 6 +- .../ConvertPredicateToFilterVisitor.java | 44 +-- .../ConvertPredicateToTimeFilterVisitor.java | 44 +-- .../PredicatePushIntoScanChecker.java | 40 +-- .../predicate/PredicateSimplifier.java | 48 ++-- .../visitor/predicate/PredicateVisitor.java | 38 +-- .../predicate/ReversePredicateVisitor.java | 39 ++- .../optimization/AggregationPushDown.java | 6 +- .../optimization/LimitOffsetPushDown.java | 2 +- .../plan/optimization/PredicatePushDown.java | 4 +- .../queryengine/plan/parser/ASTVisitor.java | 64 ++--- .../plan/parser/StatementGenerator.java | 14 +- .../DataNodeTableOperatorGenerator.java | 4 +- .../plan/planner/LogicalPlanBuilder.java | 6 +- .../plan/planner/LogicalPlanVisitor.java | 4 +- .../plan/planner/OperatorTreeGenerator.java | 18 +- .../plan/planner/TemplatedLogicalPlan.java | 6 +- .../planner/TemplatedLogicalPlanBuilder.java | 2 +- .../distribution/DistributionPlanContext.java | 2 +- .../SimpleFragmentParallelPlanner.java | 2 +- .../planner/distribution/SourceRewriter.java | 8 +- .../plan/planner/plan/TimePredicate.java | 2 +- .../planner/plan/TreeModelTimePredicate.java | 2 +- .../planner/plan/node/PlanGraphPrinter.java | 2 +- .../process/AggregationMergeSortNode.java | 2 +- .../plan/node/process/AggregationNode.java | 2 +- .../planner/plan/node/process/FilterNode.java | 2 +- .../node/process/RawDataAggregationNode.java | 2 +- .../plan/node/process/TransformNode.java | 2 +- .../AlignedSeriesAggregationScanNode.java | 2 +- .../node/source/AlignedSeriesScanNode.java | 2 +- .../node/source/LastSeriesSourceNode.java | 2 +- .../source/SeriesAggregationScanNode.java | 2 +- .../source/SeriesAggregationSourceNode.java | 2 +- .../plan/node/source/SeriesScanNode.java | 2 +- .../node/source/SeriesScanSourceNode.java | 2 +- .../plan/node/source/SeriesSourceNode.java | 2 +- .../plan/node/source/ShowDiskUsageNode.java | 2 +- .../plan/parameter/AggregationDescriptor.java | 2 +- .../CrossSeriesAggregationDescriptor.java | 2 +- .../parameter/GroupByConditionParameter.java | 2 +- .../analyzer/ExpressionAnalyzer.java | 8 +- .../analyzer/StatementAnalyzer.java | 4 +- .../ConvertPredicateToFilterVisitor.java | 2 +- ...ConvertSchemaPredicateToFilterVisitor.java | 2 +- .../plan/relational/metadata/Metadata.java | 2 +- .../metadata/OperatorNotFoundException.java | 2 +- .../metadata/TableMetadataImpl.java | 16 +- .../planner/IrExpressionInterpreter.java | 8 +- .../relational/planner/IrTypeAnalyzer.java | 2 +- .../relational/planner/PredicateUtils.java | 2 +- .../TableDistributedPlanGenerator.java | 6 +- .../GapFillStartAndEndTimeExtractVisitor.java | 2 +- .../ir/GlobalTimePredicateExtractVisitor.java | 2 +- .../rule/ReplaceWindowWithRowNumber.java | 2 +- .../rule/SetOperationNodeTranslator.java | 6 +- .../rule/SimplifyCountOverConstant.java | 6 +- .../TransformCorrelatedScalarSubquery.java | 2 +- .../planner/iterative/rule/Util.java | 2 +- .../node/AggregationTableScanNode.java | 2 +- .../planner/optimizations/Util.java | 6 +- .../plan/relational/sql/ast/DeleteDevice.java | 4 +- .../statement/component/GroupByComponent.java | 2 +- .../component/GroupByConditionComponent.java | 2 +- .../statement/component/HavingCondition.java | 2 +- .../statement/component/IntoComponent.java | 2 +- .../statement/component/OrderByComponent.java | 2 +- .../statement/component/ResultColumn.java | 2 +- .../statement/component/SelectComponent.java | 2 +- .../plan/statement/component/SortItem.java | 2 +- .../statement/component/WhereCondition.java | 2 +- .../plan/statement/crud/QueryStatement.java | 8 +- .../view/AlterLogicalViewStatement.java | 2 +- .../view/CreateLogicalViewStatement.java | 4 +- .../plan/udf/UDFManagementService.java | 2 +- .../dag/builder/EvaluationDAGBuilder.java | 6 +- ...AbstractCaseWhenThenColumnTransformer.java | 2 +- .../{dag/column => }/column/ColumnCache.java | 2 +- .../column => }/column/ColumnTransformer.java | 4 +- .../column/FailFunctionColumnTransformer.java | 2 +- .../TableCaseWhenThenColumnTransformer.java | 2 +- .../TreeCaseWhenThenColumnTransformer.java | 2 +- .../ArithmeticAdditionColumnTransformer.java | 4 +- .../ArithmeticBinaryColumnTransformer.java | 4 +- .../ArithmeticDivisionColumnTransformer.java | 4 +- .../ArithmeticModuloColumnTransformer.java | 4 +- ...hmeticMultiplicationColumnTransformer.java | 4 +- ...rithmeticSubtractionColumnTransformer.java | 4 +- .../binary/BinaryColumnTransformer.java | 4 +- .../CompareBinaryColumnTransformer.java | 4 +- .../CompareEqualToColumnTransformer.java | 4 +- .../CompareGreaterEqualColumnTransformer.java | 4 +- .../CompareGreaterThanColumnTransformer.java | 4 +- .../CompareLessEqualColumnTransformer.java | 4 +- .../CompareLessThanColumnTransformer.java | 4 +- .../CompareNonEqualColumnTransformer.java | 4 +- .../column/binary/HmacColumnTransformer.java | 8 +- .../column/binary/Like2ColumnTransformer.java | 4 +- .../binary/LogicAndColumnTransformer.java | 4 +- .../binary/LogicBinaryColumnTransformer.java | 4 +- .../binary/LogicOrColumnTransformer.java | 4 +- .../factory/HmacStrategiesFactory.java | 4 +- .../binary/strategies/HmacStrategy.java | 2 +- .../leaf/ConstantColumnTransformer.java | 2 +- .../leaf/IdentityColumnTransformer.java | 2 +- .../column/leaf/LeafColumnTransformer.java | 4 +- .../column/leaf/NullColumnTransformer.java | 2 +- .../column/leaf/TimeColumnTransformer.java | 2 +- ...bstractGreatestLeastColumnTransformer.java | 4 +- .../BinaryGreatestColumnTransformer.java | 4 +- .../multi/BinaryLeastColumnTransformer.java | 4 +- .../BooleanGreatestColumnTransformer.java | 4 +- .../multi/BooleanLeastColumnTransformer.java | 4 +- .../multi/CoalesceColumnTransformer.java | 4 +- .../DoubleGreatestColumnTransformer.java | 4 +- .../multi/DoubleLeastColumnTransformer.java | 4 +- .../multi/FloatGreatestColumnTransformer.java | 4 +- .../multi/FloatLeastColumnTransformer.java | 4 +- .../multi/InBinaryMultiColumnTransformer.java | 4 +- .../InBooleanMultiColumnTransformer.java | 4 +- .../multi/InDoubleMultiColumnTransformer.java | 4 +- .../multi/InFloatMultiColumnTransformer.java | 4 +- .../multi/InInt32MultiColumnTransformer.java | 4 +- .../multi/InInt64MultiColumnTransformer.java | 4 +- .../multi/InMultiColumnTransformer.java | 4 +- .../multi/Int32GreatestColumnTransformer.java | 4 +- .../multi/Int32LeastColumnTransformer.java | 4 +- .../multi/Int64GreatestColumnTransformer.java | 4 +- .../multi/Int64LeastColumnTransformer.java | 4 +- .../LogicalAndMultiColumnTransformer.java | 4 +- .../multi/LogicalMultiColumnTransformer.java | 4 +- .../LogicalOrMultiColumnTransformer.java | 4 +- .../multi/MappableUDFColumnTransformer.java | 4 +- .../column/multi/MultiColumnTransformer.java | 4 +- .../ternary/BetweenColumnTransformer.java | 4 +- .../CompareTernaryColumnTransformer.java | 4 +- .../ternary/Like3ColumnTransformer.java | 6 +- .../column/ternary/LpadColumnTransformer.java | 6 +- .../column/ternary/RpadColumnTransformer.java | 6 +- .../ternary/TernaryColumnTransformer.java | 4 +- .../ternary/utils/BytePaddingUtils.java | 2 +- .../UserDefineScalarFunctionTransformer.java | 6 +- .../ArithmeticNegationColumnTransformer.java | 4 +- .../column/unary/InColumnTransformer.java | 4 +- .../column/unary/IsNullColumnTransformer.java | 4 +- .../column/unary/LikeColumnTransformer.java | 4 +- .../unary/LogicNotColumnTransformer.java | 4 +- .../unary/RegularColumnTransformer.java | 4 +- .../column/unary/UnaryColumnTransformer.java | 4 +- .../unary/scalar/AbsColumnTransformer.java | 6 +- .../AbstractBitwise2ColumnTransformer.java | 6 +- .../AbstractBitwiseColumnTransformer.java | 6 +- ...AbstractCastFunctionColumnTransformer.java | 10 +- .../AbstractLengthColumnTransformer.java | 6 +- .../unary/scalar/AcosColumnTransformer.java | 6 +- .../unary/scalar/AsinColumnTransformer.java | 6 +- .../unary/scalar/AtanColumnTransformer.java | 6 +- .../scalar/BitCount2ColumnTransformer.java | 8 +- .../scalar/BitCountColumnTransformer.java | 8 +- .../scalar/BitwiseAnd2ColumnTransformer.java | 6 +- .../scalar/BitwiseAndColumnTransformer.java | 6 +- .../BitwiseLeftShift2ColumnTransformer.java | 6 +- .../BitwiseLeftShiftColumnTransformer.java | 6 +- .../scalar/BitwiseNotColumnTransformer.java | 8 +- .../scalar/BitwiseOr2ColumnTransformer.java | 6 +- .../scalar/BitwiseOrColumnTransformer.java | 6 +- .../BitwiseRightShift2ColumnTransformer.java | 6 +- ...ightShiftArithmetic2ColumnTransformer.java | 6 +- ...RightShiftArithmeticColumnTransformer.java | 6 +- .../BitwiseRightShiftColumnTransformer.java | 6 +- .../scalar/BitwiseXor2ColumnTransformer.java | 6 +- .../scalar/BitwiseXorColumnTransformer.java | 6 +- .../scalar/BlobLengthColumnTransformer.java | 4 +- .../BytesToDoubleColumnTransformer.java | 10 +- .../scalar/BytesToFloatColumnTransformer.java | 10 +- .../scalar/BytesToIntColumnTransformer.java | 10 +- .../scalar/BytesToLongColumnTransformer.java | 10 +- .../column/unary/scalar/CRC32Transformer.java | 6 +- .../scalar/CastFunctionColumnTransformer.java | 4 +- .../unary/scalar/CeilColumnTransformer.java | 6 +- .../scalar/Concat2ColumnTransformer.java | 8 +- .../unary/scalar/ConcatColumnTransformer.java | 6 +- .../scalar/ConcatMultiColumnTransformer.java | 6 +- .../unary/scalar/CosColumnTransformer.java | 6 +- .../unary/scalar/CoshColumnTransformer.java | 6 +- .../DateBinFunctionColumnTransformer.java | 6 +- .../scalar/DegreesColumnTransformer.java | 6 +- .../unary/scalar/DiffColumnTransformer.java | 6 +- .../scalar/DiffFunctionColumnTransformer.java | 6 +- .../DoubleToBytesColumnTransformer.java | 8 +- .../scalar/EndsWith2ColumnTransformer.java | 8 +- .../scalar/EndsWithColumnTransformer.java | 8 +- .../unary/scalar/ExpColumnTransformer.java | 6 +- .../unary/scalar/ExtractTransformer.java | 6 +- .../scalar/FloatToBytesColumnTransformer.java | 8 +- .../unary/scalar/FloorColumnTransformer.java | 6 +- .../unary/scalar/FormatColumnTransformer.java | 6 +- .../scalar/GenericCodecColumnTransformer.java | 10 +- .../HmacConstantKeyColumnTransformer.java | 8 +- .../scalar/IntToBytesColumnTransformer.java | 8 +- .../unary/scalar/LTrim2ColumnTransformer.java | 8 +- .../unary/scalar/LTrimColumnTransformer.java | 8 +- .../unary/scalar/LengthColumnTransformer.java | 4 +- .../unary/scalar/LnColumnTransformer.java | 6 +- .../unary/scalar/Log10ColumnTransformer.java | 6 +- .../scalar/LongToBytesColumnTransformer.java | 8 +- .../unary/scalar/LowerColumnTransformer.java | 6 +- .../scalar/ObjectLengthColumnTransformer.java | 4 +- .../unary/scalar/RTrim2ColumnTransformer.java | 8 +- .../unary/scalar/RTrimColumnTransformer.java | 8 +- .../scalar/RadiansColumnTransformer.java | 6 +- .../scalar/RegexpLike2ColumnTransformer.java | 6 +- .../scalar/RegexpLikeColumnTransformer.java | 6 +- .../scalar/Replace2ColumnTransformer.java | 6 +- .../scalar/Replace3ColumnTransformer.java | 6 +- .../ReplaceFunctionColumnTransformer.java | 6 +- .../unary/scalar/RoundColumnTransformer.java | 6 +- .../RoundFunctionColumnTransformer.java | 6 +- .../unary/scalar/SignColumnTransformer.java | 6 +- .../unary/scalar/SinColumnTransformer.java | 6 +- .../unary/scalar/SinhColumnTransformer.java | 6 +- .../unary/scalar/SqrtColumnTransformer.java | 6 +- .../scalar/StartsWith2ColumnTransformer.java | 8 +- .../scalar/StartsWithColumnTransformer.java | 6 +- .../scalar/Strcmp2ColumnTransformer.java | 6 +- .../unary/scalar/StrcmpColumnTransformer.java | 6 +- .../scalar/Strpos2ColumnTransformer.java | 6 +- .../unary/scalar/StrposColumnTransformer.java | 6 +- .../scalar/SubString2ColumnTransformer.java | 6 +- .../scalar/SubString3ColumnTransformer.java | 8 +- .../scalar/SubStringColumnTransformer.java | 6 +- .../unary/scalar/TanColumnTransformer.java | 6 +- .../unary/scalar/TanhColumnTransformer.java | 6 +- .../unary/scalar/Trim2ColumnTransformer.java | 8 +- .../unary/scalar/TrimColumnTransformer.java | 6 +- .../TryCastFunctionColumnTransformer.java | 4 +- .../unary/scalar/UpperColumnTransformer.java | 6 +- .../factory/CodecStrategiesFactory.java | 8 +- .../NumericCodecStrategiesFactory.java | 2 +- .../unary/scalar/inteface/CodecStrategy.java | 2 +- .../column/unary/scalar/util/HexUtils.java | 2 +- .../unary/scalar/util/SpookyHashV2Utils.java | 2 +- .../scalar/util/TransformerDebugUtils.java | 2 +- .../dag/input/ConstantInputReader.java | 2 +- .../ConstantIntermediateLayer.java | 2 +- .../dag/intermediate/IntermediateLayer.java | 2 +- .../dag/intermediate/MultiInputLayer.java | 2 +- .../SingleInputMultiReferenceLayer.java | 2 +- .../SingleInputSingleReferenceLayer.java | 2 +- .../{dag => }/memory/LayerMemoryAssigner.java | 8 +- .../unary/scalar/CastFunctionTransformer.java | 2 +- .../SubStringFunctionColumnTransformer.java | 4 +- .../scalar/SubStringFunctionTransformer.java | 2 +- .../transformation/dag/udf/UDTFContext.java | 4 +- .../dag/{dag => }/util/BitwiseUtils.java | 2 +- .../dag/util/TransformUtils.java | 2 +- .../impl/SchemaRegionMemoryImpl.java | 4 +- .../impl/TimeseriesReaderWithViewFetch.java | 4 +- .../schemaregion/view/ViewPaths.java | 6 +- .../visitor/TransformToExpressionVisitor.java | 52 ++-- .../iotdb/db/utils/TypeInferenceUtils.java | 14 +- .../common/schematree/NodeRefTest.java | 4 +- .../operator/OperatorMemoryTest.java | 12 +- .../operator/TransformOperatorTest.java | 4 +- .../ConvertPredicateToTimeFilterTest.java | 34 +-- .../predicate/PredicatePushIntoScanTest.java | 36 +-- .../predicate/PredicateRemoveNotTest.java | 30 +- .../predicate/PredicateUtilsTest.java | 10 +- .../TreePredicateConversionTest.java | 18 +- .../serde/CaseWhenThenExpressionTest.java | 18 +- .../analyze/AggregationDescriptorTest.java | 2 +- .../plan/analyze/AnalyzeFailTest.java | 2 +- .../queryengine/plan/analyze/AnalyzeTest.java | 44 +-- .../plan/analyze/ExpressionAnalyzerTest.java | 14 +- .../optimization/AggregationPushDownTest.java | 8 +- .../ColumnInjectionPushDownTest.java | 2 +- .../optimization/LimitOffsetPushDownTest.java | 12 +- .../optimization/OptimizationTestUtil.java | 2 +- .../optimization/PredicatePushDownTest.java | 14 +- .../plan/optimization/TestPlanBuilder.java | 2 +- .../plan/parser/StatementGeneratorTest.java | 14 +- .../plan/planner/ExpressionTest.java | 6 +- .../planner/FragmentInstanceSerdeTest.java | 2 +- .../plan/planner/PipelineBuilderTest.java | 2 +- .../AggregationDistributionTest.java | 4 +- .../plan/planner/distribution/Util.java | 4 +- .../logical/DataQueryLogicalPlannerTest.java | 10 +- .../SchemaQueryLogicalPlannerTest.java | 4 +- .../process/AggregationNodeSerdeTest.java | 6 +- .../node/process/FilterNodeSerdeTest.java | 8 +- .../process/GroupByLevelNodeSerdeTest.java | 8 +- .../node/process/GroupByTagNodeSerdeTest.java | 10 +- .../node/process/WindowNodeSerdeTest.java | 6 +- .../SeriesAggregationScanNodeSerdeTest.java | 8 +- .../relational/analyzer/AnalyzerTest.java | 2 +- .../relational/analyzer/TSBSMetadata.java | 2 +- .../analyzer/TableFunctionTest.java | 6 +- .../relational/analyzer/TestMetadata.java | 6 +- ...AndCompareBinaryColumnTransformerTest.java | 13 +- .../LogicBinaryColumnTransformerTest.java | 5 +- .../hmac/HmacMd5ColumnTransformerTest.java | 10 +- .../hmac/HmacSha1ColumnTransformerTest.java | 10 +- .../hmac/HmacSha256ColumnTransformerTest.java | 10 +- .../hmac/HmacSha512ColumnTransformerTest.java | 10 +- .../ternary/LpadColumnTransformerTest.java | 3 +- .../ternary/RpadColumnTransformerTest.java | 3 +- .../unary/UnaryColumnTransformerTest.java | 9 +- .../BlobLengthColumnTransformerTest.java | 3 +- .../unary/scalar/DateBinFunctionTest.java | 2 +- .../FromBigEndian32ColumnTransformerTest.java | 6 +- .../FromBigEndian64ColumnTransformerTest.java | 6 +- ...E754_32BigEndianColumnTransformerTest.java | 6 +- ...E754_64BigEndianColumnTransformerTest.java | 6 +- ...omLittleEndian32ColumnTransformerTest.java | 6 +- ...omLittleEndian64ColumnTransformerTest.java | 6 +- .../ToBigEndian32ColumnTransformerTest.java | 6 +- .../ToBigEndian64ColumnTransformerTest.java | 6 +- ...E754_32BigEndianColumnTransformerTest.java | 6 +- ...E754_64BigEndianColumnTransformerTest.java | 6 +- ...ToLittleEndian32ColumnTransformerTest.java | 6 +- ...ToLittleEndian64ColumnTransformerTest.java | 6 +- .../scalar/ReverseColumnTransformerTest.java | 5 +- .../FromBase32ColumnTransformerTest.java | 6 +- .../FromBase64ColumnTransformerTest.java | 6 +- .../FromBase64UrlColumnTransformerTest.java | 6 +- .../ToBase32ColumnTransformerTest.java | 6 +- .../ToBase64ColumnTransformerTest.java | 6 +- .../ToBase64UrlColumnTransformerTest.java | 6 +- .../hashing/Crc32ColumnTransformerTest.java | 4 +- .../hashing/Md5ColumnTransformerTest.java | 6 +- .../hashing/Murmur3ColumnTransformerTest.java | 6 +- .../hashing/Sha1ColumnTransformerTest.java | 6 +- .../hashing/Sha256ColumnTransformerTest.java | 6 +- .../hashing/Sha512ColumnTransformerTest.java | 6 +- .../SpookyHashV2_32ColumnTransformerTest.java | 6 +- .../SpookyHashV2_64ColumnTransformerTest.java | 6 +- .../XxHash64ColumnTransformerTest.java | 6 +- .../FromHexColumnTransformerTest.java | 6 +- .../ToHexColumnTransformerTest.java | 6 +- .../dag/util/BitwiseUtilsTest.java | 17 +- 488 files changed, 1989 insertions(+), 2016 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/{expression/expression => }/multi/FunctionType.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/BoundSignature.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/FunctionId.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/FunctionKind.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/InterpretedFunctionInvoker.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/LongVariableConstraint.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/OperatorType.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/ResolvedFunctionCallBuilder.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/Signature.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/TableBuiltinTableFunction.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/TypeVariableConstraint.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/arithmetic/AdditionResolver.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/arithmetic/DivisionResolver.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/arithmetic/ModulusResolver.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/arithmetic/MultiplicationResolver.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/arithmetic/SubtractionResolver.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/tvf/ClassifyTableFunction.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/tvf/ForecastTableFunction.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/tvf/PatternMatchTableFunction.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/tvf/TableFunctionUtils.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/tvf/match/MatchConfig.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/tvf/match/QetchAlgorithm.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/tvf/match/model/MatchState.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/tvf/match/model/PatternSegment.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/tvf/match/model/Point.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/tvf/match/model/RegexMatchState.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/{function => }/tvf/match/model/Section.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/Expression.java (80%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/ExpressionFactory.java (78%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/ExpressionType.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/UnknownExpressionTypeException.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/AdditionExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/ArithmeticBinaryExpression.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/BinaryExpression.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/CompareBinaryExpression.java (69%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/DivisionExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/EqualToExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/GreaterEqualExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/GreaterThanExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/LessEqualExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/LessThanExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/LogicAndExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/LogicBinaryExpression.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/LogicOrExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/ModuloExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/MultiplicationExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/NonEqualExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/SubtractionExpression.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/binary/WhenThenExpression.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/leaf/ConstantOperand.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/leaf/LeafOperand.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/leaf/NullOperand.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/leaf/TimeSeriesOperand.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/leaf/TimestampOperand.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/multi/FunctionExpression.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/multi/builtin/BuiltInFunctionHelper.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/multi/builtin/BuiltInScalarFunctionHelper.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/multi/builtin/BuiltInScalarFunctionHelperFactory.java (69%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/multi/builtin/helper/CastFunctionHelper.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/multi/builtin/helper/DiffFunctionHelper.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/multi/builtin/helper/ReplaceFunctionHelper.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/multi/builtin/helper/RoundFunctionHelper.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/multi/builtin/helper/SubStringFunctionHelper.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/other/CaseWhenThenExpression.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/other/GroupByTimeExpression.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/ternary/BetweenExpression.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/ternary/TernaryExpression.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/unary/InExpression.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/unary/IsNullExpression.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/unary/LikeExpression.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/unary/LogicNotExpression.java (74%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/unary/NegationExpression.java (77%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/unary/RegularExpression.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/unary/UnaryExpression.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/BindTypeForTimeSeriesOperandVisitor.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/CollectAggregationExpressionsVisitor.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/CollectSourceExpressionsVisitor.java (75%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/CollectVisitor.java (77%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/ColumnTransformerVisitor.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/CompleteMeasurementSchemaVisitor.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/ConcatDeviceVisitor.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/CountTimeAggregationAmountVisitor.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/ExistUnknownTypeInExpression.java (78%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/ExpressionAnalyzeVisitor.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/ExpressionNormalizeVisitor.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/ExpressionVisitor.java (64%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/GetMeasurementExpressionVisitor.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/IntermediateLayerVisitor.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/LowercaseNormalizeVisitor.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/ReconstructVisitor.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/RemoveRootPrefixVisitor.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/ReplaceLogicalViewVisitor.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/ReplaceRawPathWithGroupedPathVisitor.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/ReplaceSubTreeWithViewVisitor.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/TransformToViewExpressionVisitor.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/cartesian/BindSchemaForExpressionVisitor.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/cartesian/BindSchemaForPredicateVisitor.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/cartesian/CartesianProductVisitor.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/cartesian/QueryContextProvider.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/logical/LogicalAndVisitor.java (73%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/logical/LogicalOrVisitor.java (73%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/logical/PredicateCanPushDownToSourceChecker.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/logical/TimeFilterExistChecker.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/predicate/ConvertPredicateToFilterVisitor.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/predicate/PredicatePushIntoScanChecker.java (76%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/predicate/PredicateSimplifier.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression/expression => }/visitor/predicate/PredicateVisitor.java (61%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/{expression => }/visitor/predicate/ReversePredicateVisitor.java (71%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/AbstractCaseWhenThenColumnTransformer.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/ColumnCache.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/ColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/FailFunctionColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/TableCaseWhenThenColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/TreeCaseWhenThenColumnTransformer.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/ArithmeticAdditionColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/ArithmeticBinaryColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/ArithmeticDivisionColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/ArithmeticModuloColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/ArithmeticMultiplicationColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/ArithmeticSubtractionColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/BinaryColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/CompareBinaryColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/CompareEqualToColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/CompareGreaterEqualColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/CompareGreaterThanColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/CompareLessEqualColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/CompareLessThanColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/CompareNonEqualColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/HmacColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/Like2ColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/LogicAndColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/LogicBinaryColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/LogicOrColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column/binary/factory => column/binary}/factory/HmacStrategiesFactory.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/binary/strategies/HmacStrategy.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/leaf/ConstantColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/leaf/IdentityColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/leaf/LeafColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/leaf/NullColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/leaf/TimeColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/AbstractGreatestLeastColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/BinaryGreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/BinaryLeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/BooleanGreatestColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/BooleanLeastColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/CoalesceColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/DoubleGreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/DoubleLeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/FloatGreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/FloatLeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/InBinaryMultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/InBooleanMultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/InDoubleMultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/InFloatMultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/InInt32MultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/InInt64MultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/InMultiColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/Int32GreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/Int32LeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/Int64GreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/Int64LeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/LogicalAndMultiColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/LogicalMultiColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/LogicalOrMultiColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/MappableUDFColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/multi/MultiColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/ternary/BetweenColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/ternary/CompareTernaryColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/ternary/Like3ColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/ternary/LpadColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/ternary/RpadColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/ternary/TernaryColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/ternary/utils/BytePaddingUtils.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/udf/UserDefineScalarFunctionTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/ArithmeticNegationColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/InColumnTransformer.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/IsNullColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/LikeColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/LogicNotColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/RegularColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/UnaryColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/AbsColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/AbstractBitwise2ColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/AbstractBitwiseColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/AbstractCastFunctionColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/AbstractLengthColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/AcosColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/AsinColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/AtanColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitCount2ColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitCountColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitwiseAnd2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitwiseAndColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitwiseNotColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitwiseOr2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitwiseOrColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitwiseRightShiftColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitwiseXor2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BitwiseXorColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BlobLengthColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BytesToDoubleColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BytesToFloatColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BytesToIntColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/BytesToLongColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/CRC32Transformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/CastFunctionColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/CeilColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/Concat2ColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/ConcatColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/ConcatMultiColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/CosColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/CoshColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/DateBinFunctionColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/DegreesColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/DiffColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/DiffFunctionColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/DoubleToBytesColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/EndsWith2ColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/EndsWithColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/ExpColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/ExtractTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/FloatToBytesColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/FloorColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/FormatColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/GenericCodecColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/HmacConstantKeyColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/IntToBytesColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/LTrim2ColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/LTrimColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/LengthColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/LnColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/Log10ColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/LongToBytesColumnTransformer.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/LowerColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/ObjectLengthColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/RTrim2ColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/RTrimColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/RadiansColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/RegexpLike2ColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/RegexpLikeColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/Replace2ColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/Replace3ColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/ReplaceFunctionColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/RoundColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/RoundFunctionColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/SignColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/SinColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/SinhColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/SqrtColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/StartsWith2ColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/StartsWithColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/Strcmp2ColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/StrcmpColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/Strpos2ColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/StrposColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/SubString2ColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/SubString3ColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/SubStringColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/TanColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/TanhColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/Trim2ColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/TrimColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/TryCastFunctionColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/UpperColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/factory/CodecStrategiesFactory.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/factory/NumericCodecStrategiesFactory.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/inteface/CodecStrategy.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/util/HexUtils.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/util/SpookyHashV2Utils.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag/column => }/column/unary/scalar/util/TransformerDebugUtils.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag => }/memory/LayerMemoryAssigner.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/{dag => }/util/BitwiseUtils.java (98%) diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl index 554a2c285ca90..2e2c3f50f1ceb 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl @@ -31,7 +31,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; @@ -175,7 +175,7 @@ public class ${className} extends BinaryColumnTransformer { package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; @@ -293,7 +293,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl index 2f71280aef96a..038cd0ecd5437 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl @@ -23,12 +23,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; import org.apache.tsfile.read.common.type.Type; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.AdditionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.DivisionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.ModulusResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.MultiplicationResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.function.SubtractionResolver; -import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.AdditionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.DivisionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.ModulusResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.DoubleNegationColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.FloatNegationColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.IntNegationColumnTransformer; diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl index c893a601217bb..0afb3f57085dc 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl @@ -26,7 +26,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.column.dag.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index f02df34223e5b..41ac3da5b9373 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -26,8 +26,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; @@ -164,8 +164,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToStringLiteralVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToTimestampLiteralVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; +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.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/expression/multi/FunctionType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/multi/FunctionType.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/expression/multi/FunctionType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/multi/FunctionType.java index 70c4f888e2436..ee67c75734cd3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/expression/expression/multi/FunctionType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/multi/FunctionType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.expression.expression.multi; +package org.apache.iotdb.db.node_commons.plan.expression.multi; /** */ public enum FunctionType { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/BoundSignature.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/BoundSignature.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/BoundSignature.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/BoundSignature.java index 4aae233fd4036..4aca02fc832be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/BoundSignature.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/BoundSignature.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function; +package org.apache.iotdb.db.node_commons.plan.relational.function; import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionId.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionId.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionId.java index 4bec7ab1a76cd..b6ab0aa407546 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionId.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function; +package org.apache.iotdb.db.node_commons.plan.relational.function; import java.util.Locale; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionKind.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionKind.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionKind.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionKind.java index b07b0968acbe9..a3cdfa26c0301 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/FunctionKind.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionKind.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function; +package org.apache.iotdb.db.node_commons.plan.relational.function; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/InterpretedFunctionInvoker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/InterpretedFunctionInvoker.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/InterpretedFunctionInvoker.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/InterpretedFunctionInvoker.java index 1d148d01bba98..6e139182ef5e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/InterpretedFunctionInvoker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/InterpretedFunctionInvoker.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function; +package org.apache.iotdb.db.node_commons.plan.relational.function; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.queryengine.common.SessionInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/LongVariableConstraint.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/LongVariableConstraint.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/LongVariableConstraint.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/LongVariableConstraint.java index 52de559764138..2bb222fadd357 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/LongVariableConstraint.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/LongVariableConstraint.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function; +package org.apache.iotdb.db.node_commons.plan.relational.function; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/OperatorType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/OperatorType.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/OperatorType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/OperatorType.java index 40d0647902570..621d3feb10924 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/OperatorType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/OperatorType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function; +package org.apache.iotdb.db.node_commons.plan.relational.function; public enum OperatorType { ADD("+", 2), diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/ResolvedFunctionCallBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/ResolvedFunctionCallBuilder.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java index 4e406fd8cff38..06d1f7de1d33b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/ResolvedFunctionCallBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function; +package org.apache.iotdb.db.node_commons.plan.relational.function; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/Signature.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/Signature.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/Signature.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/Signature.java index bcb46be547bcf..2d30e2d74a1cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/Signature.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/Signature.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function; +package org.apache.iotdb.db.node_commons.plan.relational.function; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TableBuiltinTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableBuiltinTableFunction.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TableBuiltinTableFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableBuiltinTableFunction.java index 514d33b679709..004f6114bd326 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TableBuiltinTableFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableBuiltinTableFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function; +package org.apache.iotdb.db.node_commons.plan.relational.function; import org.apache.iotdb.commons.udf.builtin.relational.tvf.CapacityTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.CumulateTableFunction; @@ -25,9 +25,9 @@ import org.apache.iotdb.commons.udf.builtin.relational.tvf.SessionTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.TumbleTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.VariationTableFunction; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ClassifyTableFunction; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.PatternMatchTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ClassifyTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ForecastTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.PatternMatchTableFunction; import org.apache.iotdb.udf.api.relational.TableFunction; import java.util.Arrays; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TypeVariableConstraint.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TypeVariableConstraint.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TypeVariableConstraint.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TypeVariableConstraint.java index 4517f2fea0969..09422c484db23 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/TypeVariableConstraint.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TypeVariableConstraint.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function; +package org.apache.iotdb.db.node_commons.plan.relational.function; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/AdditionResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/AdditionResolver.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/AdditionResolver.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/AdditionResolver.java index 4690bc2a416b9..c4b1de02797b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/AdditionResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/AdditionResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic; +package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/DivisionResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/DivisionResolver.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/DivisionResolver.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/DivisionResolver.java index 11854c0b47c94..4a8fd0143d53d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/DivisionResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/DivisionResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic; +package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/ModulusResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/ModulusResolver.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/ModulusResolver.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/ModulusResolver.java index 78b2ce538795e..3816abd18cb86 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/ModulusResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/ModulusResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic; +package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/MultiplicationResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/MultiplicationResolver.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java index cb61801c3b0b7..07e0070d34e43 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/MultiplicationResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic; +package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/SubtractionResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/SubtractionResolver.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java index bc79daedc3cb8..f788d6a50c762 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/arithmetic/SubtractionResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic; +package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ClassifyTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ClassifyTableFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java index 96e6ae36ee6a6..576acacf292a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ClassifyTableFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf; +package org.apache.iotdb.db.node_commons.plan.relational.function.tvf; import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ForecastTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ForecastTableFunction.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ForecastTableFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ForecastTableFunction.java index a89f1bf771a19..3d55302d2ffae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/ForecastTableFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ForecastTableFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf; +package org.apache.iotdb.db.node_commons.plan.relational.function.tvf; import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; @@ -72,8 +72,8 @@ import java.util.stream.Collectors; import static org.apache.iotdb.commons.udf.builtin.relational.tvf.WindowTVFUtils.findColumnIndex; -import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.TableFunctionUtils.checkType; -import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.TableFunctionUtils.parseOptions; +import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.TableFunctionUtils.checkType; +import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.TableFunctionUtils.parseOptions; import static org.apache.iotdb.db.node_commons.plan.relational.utils.ResultColumnAppender.createResultColumnAppender; public class ForecastTableFunction implements TableFunction { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/PatternMatchTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/PatternMatchTableFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java index b300edb10936d..f1cf66f7bc341 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/PatternMatchTableFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf; +package org.apache.iotdb.db.node_commons.plan.relational.function.tvf; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.QetchAlgorithm; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.MatchState; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.Point; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.RegexMatchState; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.Section; +import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.QetchAlgorithm; +import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.MatchState; +import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.Point; +import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.RegexMatchState; +import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.Section; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.access.Record; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/TableFunctionUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/TableFunctionUtils.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/TableFunctionUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/TableFunctionUtils.java index 7f798a215f93f..4ae0339c59643 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/TableFunctionUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/TableFunctionUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf; +package org.apache.iotdb.db.node_commons.plan.relational.function.tvf; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/MatchConfig.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/MatchConfig.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/MatchConfig.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/MatchConfig.java index 0c0da76cfb790..32bdba11b7757 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/MatchConfig.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/MatchConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match; +package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match; public class MatchConfig { // if the gap between new two points is larger than this times gap before, the new point diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/QetchAlgorithm.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/QetchAlgorithm.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java index d47cce178ed3c..ebe77106dbda0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/QetchAlgorithm.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match; +package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.MatchState; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.PatternSegment; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.Point; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.RegexMatchState; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.Section; +import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.MatchState; +import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.PatternSegment; +import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.Point; +import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.RegexMatchState; +import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.Section; import java.util.ArrayDeque; import java.util.ArrayList; @@ -32,9 +32,9 @@ import java.util.List; import java.util.Queue; -import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.GAP_TOLERANCE; -import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; -import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model.PatternSegment.tangent; +import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.GAP_TOLERANCE; +import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; +import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.PatternSegment.tangent; public class QetchAlgorithm { private int pointNum = -1; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/MatchState.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/MatchState.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/MatchState.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/MatchState.java index 4fe89134c2698..4435352346a30 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/MatchState.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/MatchState.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model; +package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model; import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; +import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; public class MatchState { private double matchValue = 0.0; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/PatternSegment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/PatternSegment.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java index fcb1cf895e502..e7fe93ec36bd0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/PatternSegment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model; +package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model; import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; +import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; public class PatternSegment { // variable area diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Point.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Point.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Point.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Point.java index 7b7ecc26da289..0a0b01528956a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Point.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Point.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model; +package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model; public class Point { public double x; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/RegexMatchState.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/RegexMatchState.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java index 8d039b1a76d5d..da64e0b6f0d84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/RegexMatchState.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model; +package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model; import java.util.ArrayDeque; import java.util.ArrayList; @@ -25,8 +25,8 @@ import java.util.Iterator; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.CALC_SE_USING_MORE_MEMORY; -import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; +import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.CALC_SE_USING_MORE_MEMORY; +import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; public class RegexMatchState { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Section.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Section.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Section.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Section.java index fee4d4f9f3458..af359d5db7ef2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/function/tvf/match/model/Section.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Section.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.match.model; +package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model; import java.util.ArrayList; import java.util.HashMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java index 3d95026146c58..bd1b702ad716a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.node_commons.plan.relational.metadata; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java index f91d592615d37..97b61dddef4c5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.expression.expression.expression.multi.FunctionType; +import org.apache.iotdb.db.node_commons.plan.expression.multi.FunctionType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java index e8e145b970553..62f50b06da7b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -144,12 +144,12 @@ import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher; import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePieceNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java index 1896a19573a9b..fb7938309af09 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java index 7f0f9ec24f048..73ec966b84b64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.udf.api.State; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java index 861f621c78c14..7e041e8551a76 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java @@ -24,7 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java index c66525a53dce9..d79fc2848043c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.tsfile.read.common.TimeRange; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java index 73635b9e23be7..92beafd3ab379 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java @@ -22,16 +22,16 @@ import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.AbstractCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MappableUDFColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.TernaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.AbstractCaseWhenThenColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MappableUDFColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java index e5b72cd70836f..eb75b8edd5a11 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java @@ -28,7 +28,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java index 89623529a3f7a..c3eb335521153 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; // with month interval public class GapFillWGroupWMoOperator extends AbstractGapFillWGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java index 0910ac07fffcc..40cb5fef8cbb4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWGroupWoMoOperator extends AbstractGapFillWGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java index d1cde369a4307..738e35cd5cf52 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java @@ -27,7 +27,7 @@ import java.time.ZoneId; import java.util.List; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWoGroupWMoOperator extends AbstractGapFillWoGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java index f72b818a9e1bf..d4f8b86abef5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java @@ -26,7 +26,7 @@ import java.util.List; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWoGroupWoMoOperator extends AbstractGapFillWoGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java index 2fcd151deb297..7d80cbdb46e04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.ArrayView; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; 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 f94425e9e2038..cc883bc7ad6f7 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; +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; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo; 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 ce4d43434b55f..ef71258c7c9d9 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; +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; 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/DevicePredicateFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateFilter.java index 56e8a776157b8..42c87b944998d 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 @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; +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; import java.util.Iterator; 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 9dba69842ff22..9cd6102c1be76 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.utils.PathUtils; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; +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; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; 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 a4ef5e715dc2b..06716c91e3624 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; +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; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.impl.ShowDevicesResult; 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 index 5c1922ae758c1..58001a893665c 100644 --- 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 @@ -65,7 +65,7 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.ConnectionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java index bc39e0fd29a58..a9cc81171fb1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ConditionWindowParameter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.window; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; public class ConditionWindowParameter extends WindowParameter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java index 8850b343a2a9e..47182c0a849ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java @@ -24,11 +24,11 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.AdditionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.DivisionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.ModulusResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.MultiplicationResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.AdditionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.DivisionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.ModulusResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; @@ -74,129 +74,129 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.TableCaseWhenThenColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticColumnTransformerApi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.TableCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessThanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.Like2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.NullColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.TimeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.AbstractGreatestLeastColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.CoalesceColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InBinaryMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InBooleanMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InDoubleMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InFloatMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InInt32MultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InInt64MultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.InMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.LogicalAndMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.LogicalOrMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.BetweenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.Like3ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.LpadColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.RpadColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.udf.UserDefineScalarFunctionTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LikeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.AbsColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.AcosColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.AsinColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.AtanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitCount2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitCountColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseAnd2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseAndColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseLeftShift2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseLeftShiftColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseNotColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseOr2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseOrColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseRightShift2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseRightShiftArithmetic2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseRightShiftArithmeticColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseRightShiftColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseXor2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BitwiseXorColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BlobLengthColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToDoubleColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToFloatColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CRC32Transformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CastFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CeilColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Concat2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ConcatColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ConcatMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CosColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CoshColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DegreesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DiffColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DiffFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DoubleToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.EndsWith2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.EndsWithColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ExpColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ExtractTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.FloatToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.FloorColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.FormatColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LTrim2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LTrimColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LengthColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LnColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Log10ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LowerColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ObjectLengthColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RTrim2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RTrimColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RadiansColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RegexpLike2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RegexpLikeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Replace2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Replace3ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ReplaceFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RoundColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RoundFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SignColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SinColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SinhColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SqrtColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWith2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWithColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Strcmp2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StrcmpColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Strpos2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StrposColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubString2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubString3ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubStringColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TanhColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.Trim2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TrimColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TryCastFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.UpperColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessThanColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.Like2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.NullColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.AbstractGreatestLeastColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.CoalesceColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InBinaryMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InBooleanMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InDoubleMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InFloatMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InInt32MultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InInt64MultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.LogicalAndMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.LogicalOrMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.BetweenColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.Like3ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.LpadColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.RpadColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.udf.UserDefineScalarFunctionTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LikeColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AbsColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AcosColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AsinColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AtanColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitCount2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitCountColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseAnd2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseAndColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseLeftShift2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseLeftShiftColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseNotColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseOr2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseOrColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShift2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmetic2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmeticColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShiftColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseXor2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseXorColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BlobLengthColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CRC32Transformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CeilColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Concat2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ConcatColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ConcatMultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CosColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CoshColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DegreesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DiffColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.EndsWith2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.EndsWithColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ExpColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ExtractTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FloorColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FormatColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LTrim2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LTrimColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LengthColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LnColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Log10ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LowerColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ObjectLengthColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RTrim2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RTrimColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RadiansColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RegexpLike2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RegexpLikeColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Replace2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Replace3ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RoundColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SignColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SinColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SinhColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SqrtColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWith2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Strcmp2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StrcmpColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Strpos2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StrposColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubString2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubString3ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubStringColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TanColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TanhColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Trim2ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TryCastFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.UpperColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.ScalarFunction; @@ -232,15 +232,15 @@ import static com.google.common.base.Preconditions.checkArgument; import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoMetadataChecker.isStringLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBlobType; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java index b837a33cd0d29..3dc50e768b7a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java @@ -39,9 +39,9 @@ import org.apache.iotdb.db.queryengine.plan.execution.memory.StatementMemorySource; import org.apache.iotdb.db.queryengine.plan.execution.memory.StatementMemorySourceContext; import org.apache.iotdb.db.queryengine.plan.execution.memory.StatementMemorySourceVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.TimePredicate; import org.apache.iotdb.db.queryengine.plan.planner.plan.TreeModelTimePredicate; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; 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 d60fb7105930c..dacdc69ba4596 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 @@ -62,14 +62,14 @@ import org.apache.iotdb.db.queryengine.plan.analyze.lock.SchemaLockType; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher; import org.apache.iotdb.db.queryengine.plan.analyze.schema.SchemaValidator; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExistUnknownTypeInExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExistUnknownTypeInExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.MeasurementGroup; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.DeviceViewIntoPathDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.FillDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java index 0b60a8bd70969..041f08e1b5cf3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ConcatPathRewriter.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.path.PathPatternTreeUtils; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; import org.apache.iotdb.db.queryengine.plan.statement.component.SelectComponent; 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 2d507b13072f2..9a847a9ebd132 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 @@ -27,32 +27,32 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.BindTypeForTimeSeriesOperandVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CollectAggregationExpressionsVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CollectSourceExpressionsVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionNormalizeVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.GetMeasurementExpressionVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.LowercaseNormalizeVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ReplaceRawPathWithGroupedPathVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ReplaceSubTreeWithViewVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForPredicateVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForExpressionVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForHavingVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForPredicateVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.ConcatExpressionWithSuffixPathsVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.BindTypeForTimeSeriesOperandVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.CollectAggregationExpressionsVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.CollectSourceExpressionsVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionNormalizeVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.GetMeasurementExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.LowercaseNormalizeVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ReplaceRawPathWithGroupedPathVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ReplaceSubTreeWithViewVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForPredicateVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForHavingVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForPredicateVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatExpressionWithSuffixPathsVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java index f621bef85eebb..f57c80980de09 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java @@ -21,26 +21,26 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.binary.ArithmeticBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDAFInformationInferrer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFInformationInferrer; import org.apache.iotdb.db.utils.TypeInferenceUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java index 6754101e0d5a2..1d9bb7838d5f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java @@ -21,36 +21,36 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; +import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java index 1e276c91ad821..a220fdf2883d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java index bab3676b2f7e2..55cfd18f16f48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java @@ -23,25 +23,25 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical.PredicateCanPushDownToSourceChecker; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical.TimeFilterExistChecker; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.ConvertPredicateToFilterVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.ConvertPredicateToTimeFilterVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.PredicatePushIntoScanChecker; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.PredicateSimplifier; -import org.apache.iotdb.db.queryengine.plan.expression.expression.visitor.predicate.ReversePredicateVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.logical.PredicateCanPushDownToSourceChecker; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.logical.TimeFilterExistChecker; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.ConvertPredicateToFilterVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.ConvertPredicateToTimeFilterVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.PredicatePushIntoScanChecker; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.PredicateSimplifier; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.ReversePredicateVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java index a8441712c2d3c..7e23b0b4590fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Pair; 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 1a91415fade04..8e8fd3cd40600 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 @@ -24,11 +24,11 @@ import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java index daf7c33f7c139..21b8d9d8dc105 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java @@ -29,10 +29,10 @@ import org.apache.iotdb.db.queryengine.common.schematree.DeviceSchemaInfo; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.TemplatedConcatRemoveUnExistentMeasurementVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.TemplatedConcatRemoveUnExistentMeasurementVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java index 911e86fefb751..3bfe91c75d153 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -41,7 +41,7 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; +import static org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; /** * If in align by device query ,all queried devices are set in one template, we can store the common diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java index c90456cba0e89..e5a6b8458ccbf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java @@ -38,7 +38,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; +import static org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; public class TypeProvider { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java index 73baddacb4e62..cf404e8d57b76 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java @@ -250,8 +250,8 @@ import org.apache.iotdb.db.queryengine.plan.execution.config.sys.quota.ShowThrottleQuotaTask; import org.apache.iotdb.db.queryengine.plan.execution.config.sys.subscription.ShowSubscriptionsTask; import org.apache.iotdb.db.queryengine.plan.execution.config.sys.subscription.ShowTopicsTask; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.TransformToViewExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.TransformToViewExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view.AlterLogicalViewNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB; 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 8c1dcbce78720..b99e8c6fbf380 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 @@ -26,7 +26,7 @@ import org.apache.iotdb.commons.udf.UDFType; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; 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/expression/expression/expression/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java similarity index 80% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/Expression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java index a3c437cd372a1..cb0483d75d33a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/Expression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java @@ -17,42 +17,42 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression; +package org.apache.iotdb.db.queryengine.plan.expression; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java index 463da9bb40575..b45a90c5b8026 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java @@ -17,33 +17,33 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression; +package org.apache.iotdb.db.queryengine.plan.expression; import org.apache.iotdb.common.rpc.thrift.TAggregationType; 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.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionType.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionType.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionType.java index 0b99dce1f50e5..81a98956c47b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ExpressionType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression; +package org.apache.iotdb.db.queryengine.plan.expression; public enum ExpressionType { CONSTANT((short) -4, (short) 1400), diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/UnknownExpressionTypeException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/UnknownExpressionTypeException.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java index 346b66987a345..459f19680d66f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/UnknownExpressionTypeException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression; +package org.apache.iotdb.db.queryengine.plan.expression; public class UnknownExpressionTypeException extends IllegalArgumentException { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/AdditionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/AdditionExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/AdditionExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/AdditionExpression.java index 37ac2f7f74f6f..88383201cf7d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/AdditionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/AdditionExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ArithmeticBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ArithmeticBinaryExpression.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ArithmeticBinaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ArithmeticBinaryExpression.java index 8bdacebc0863a..a43e348ffe9a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ArithmeticBinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ArithmeticBinaryExpression.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/BinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/BinaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java index 0ab008d6e48a0..31a75b2825edb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/BinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/CompareBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/CompareBinaryExpression.java similarity index 69% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/CompareBinaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/CompareBinaryExpression.java index ba03aaa64afb5..7b2f744f1d038 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/CompareBinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/CompareBinaryExpression.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.GREATER_EQUAL; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.GREATER_THAN; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.LESS_EQUAL; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.LESS_THAN; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.GREATER_EQUAL; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.GREATER_THAN; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.LESS_EQUAL; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.LESS_THAN; public abstract class CompareBinaryExpression extends BinaryExpression { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/DivisionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/DivisionExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/DivisionExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/DivisionExpression.java index 2128de94fc074..ca8bd5a2d2807 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/DivisionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/DivisionExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/EqualToExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/EqualToExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/EqualToExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/EqualToExpression.java index 5378780d55f42..ae61914c6a4d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/EqualToExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/EqualToExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterEqualExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterEqualExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterEqualExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterEqualExpression.java index 384c079e3208f..3f8c32cb77e63 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterEqualExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterEqualExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterThanExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterThanExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterThanExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterThanExpression.java index e6313087f0bb6..484a0ce51cced 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/GreaterThanExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/GreaterThanExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessEqualExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessEqualExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessEqualExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessEqualExpression.java index c621a81328718..74d80793f7ec8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessEqualExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessEqualExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessThanExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessThanExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessThanExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessThanExpression.java index 2637450827bd9..413476f2c4959 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LessThanExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LessThanExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicAndExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicAndExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicAndExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicAndExpression.java index a70906d48c8c4..e73977fd14852 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicAndExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicAndExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicBinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicBinaryExpression.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicBinaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicBinaryExpression.java index 933b4fc087612..a8adeb070b1d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicBinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicBinaryExpression.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicOrExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicOrExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicOrExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicOrExpression.java index d32c12f9a50d1..134208d04239b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/LogicOrExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/LogicOrExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ModuloExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ModuloExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ModuloExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ModuloExpression.java index c29d3f5a0ced8..6e98a30bd3249 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/ModuloExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/ModuloExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/MultiplicationExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/MultiplicationExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/MultiplicationExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/MultiplicationExpression.java index 0053407607fbd..8ed7d625d5b94 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/MultiplicationExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/MultiplicationExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/NonEqualExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/NonEqualExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/NonEqualExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/NonEqualExpression.java index e73b9093e4907..e1a19a64d2fb1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/NonEqualExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/NonEqualExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/SubtractionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/SubtractionExpression.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/SubtractionExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/SubtractionExpression.java index d24f2ba5e5317..c6ee62cbeaa4f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/SubtractionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/SubtractionExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/WhenThenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/WhenThenExpression.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/WhenThenExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/WhenThenExpression.java index 562d344f9441b..c12c09852af24 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/binary/WhenThenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/WhenThenExpression.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary; +package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/ConstantOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/ConstantOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java index d46997c1ea861..98b78740ae7ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/ConstantOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf; +package org.apache.iotdb.db.queryengine.plan.expression.leaf; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/LeafOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/LeafOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java index add22bf224127..f01051a5c388a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/LeafOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf; +package org.apache.iotdb.db.queryengine.plan.expression.leaf; import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/NullOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/NullOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java index 046a59748b88e..d4ae229171af1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/NullOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf; +package org.apache.iotdb.db.queryengine.plan.expression.leaf; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimeSeriesOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimeSeriesOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java index 10688633f4878..dbc82a3b7156e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimeSeriesOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf; +package org.apache.iotdb.db.queryengine.plan.expression.leaf; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimestampOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimestampOperand.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java index cb4b9ba789156..459cb75340308 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/leaf/TimestampOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf; +package org.apache.iotdb.db.queryengine.plan.expression.leaf; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/FunctionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/FunctionExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java index 11836b7ba4f0d..638bdc79a89af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/FunctionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java @@ -17,23 +17,23 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi; +package org.apache.iotdb.db.queryengine.plan.expression.multi; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.expression.expression.expression.multi.FunctionType; +import org.apache.iotdb.db.node_commons.plan.expression.multi.FunctionType; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.db.queryengine.plan.udf.TreeUDFUtils; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFInformationInferrer; import org.apache.iotdb.udf.api.customizer.strategy.AccessStrategy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInFunctionHelper.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInFunctionHelper.java index ddafd90b7728e..9a7cdfca87fd6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInFunctionHelper.java @@ -17,6 +17,6 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin; +package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin; public interface BuiltInFunctionHelper {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java index f7462584fa2f1..621b06660a886 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin; +package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.tsfile.enums.TSDataType; @@ -71,7 +71,7 @@ ColumnTransformer getBuiltInScalarFunctionColumnTransformer( /** * Construct a {@link Transformer} for this built-in function in {@link - * org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.IntermediateLayerVisitor} + * org.apache.iotdb.db.queryengine.plan.expression.visitor.IntermediateLayerVisitor} * * @param expression The FunctionExpression representing the scalar function * @param layerReader input reader diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java similarity index 69% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java index 9892793baf3c6..80cf9d282769c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelperFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin; +package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.DiffFunctionHelper; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.ReplaceFunctionHelper; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.RoundFunctionHelper; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.SubStringFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.DiffFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.ReplaceFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.RoundFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.SubStringFunctionHelper; public class BuiltInScalarFunctionHelperFactory { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/CastFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/CastFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java index e9a3eb39fe0a0..9a610ba05fc77 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/CastFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper; +package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.SessionInfo; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CastFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.CastFunctionTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/DiffFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/DiffFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java index 02445b9ce54c7..858d21ecad8bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/DiffFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper; +package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DiffFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.DiffFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java index bb81afa54d272..af28d6cc857f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/ReplaceFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper; +package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ReplaceFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.ReplaceFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/RoundFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/RoundFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java index 480cf9c33937e..0a4a8bf4a738d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/RoundFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper; +package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RoundFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.RoundFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java index a251321b97265..7d9490ac75983 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/multi/builtin/helper/SubStringFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper; +package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.SubStringFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.SubStringFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/CaseWhenThenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/CaseWhenThenExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java index 0fe1acae15657..07023786cf0f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/CaseWhenThenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other; +package org.apache.iotdb.db.queryengine.plan.expression.other; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/GroupByTimeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/GroupByTimeExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java index c6e6789a8286b..4a68d7f01db25 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/other/GroupByTimeExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other; +package org.apache.iotdb.db.queryengine.plan.expression.other; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/BetweenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/BetweenExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java index 6f09047614ded..63cc341e80f82 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/BetweenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java @@ -19,12 +19,12 @@ * */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary; +package org.apache.iotdb.db.queryengine.plan.expression.ternary; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/TernaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/TernaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java index a6c3239ea5e7e..4db828bc4f1b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/ternary/TernaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java @@ -19,13 +19,13 @@ * */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary; +package org.apache.iotdb.db.queryengine.plan.expression.ternary; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/InExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/InExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java index 441fc56333c9f..78536161df562 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/InExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary; +package org.apache.iotdb.db.queryengine.plan.expression.unary; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/IsNullExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/IsNullExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java index 875f5139f74e5..3baf8dcffd4fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/IsNullExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary; +package org.apache.iotdb.db.queryengine.plan.expression.unary; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LikeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LikeExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java index 3f1c351a8f8e9..9a58bfdc46b6c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LikeExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary; +package org.apache.iotdb.db.queryengine.plan.expression.unary; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LogicNotExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java similarity index 74% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LogicNotExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java index 47d83b4f5721c..5c8bcf651267e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/LogicNotExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary; +package org.apache.iotdb.db.queryengine.plan.expression.unary; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/NegationExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java similarity index 77% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/NegationExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java index 17369a1f22fe0..b6b0bb453dda5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/NegationExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary; +package org.apache.iotdb.db.queryengine.plan.expression.unary; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/RegularExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/RegularExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java index 70581923c717b..bd5a4323188cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/RegularExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary; +package org.apache.iotdb.db.queryengine.plan.expression.unary; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.tsfile.external.commons.lang3.Validate; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/UnaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/UnaryExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java index 3659ce76433bf..50d673a564dcb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/unary/UnaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary; +package org.apache.iotdb.db.queryengine.plan.expression.unary; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; +import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java index ab85ec601b2ff..13df1ff2c2bd8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +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.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +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; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectAggregationExpressionsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectAggregationExpressionsVisitor.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectAggregationExpressionsVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectAggregationExpressionsVisitor.java index 30cfd786270c3..5595a92585cee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectAggregationExpressionsVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectAggregationExpressionsVisitor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +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.multi.FunctionExpression; import java.util.Collections; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectSourceExpressionsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectSourceExpressionsVisitor.java similarity index 75% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectSourceExpressionsVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectSourceExpressionsVisitor.java index 761483dbb8cd2..156dbe72d1708 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectSourceExpressionsVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectSourceExpressionsVisitor.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +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; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import java.util.Collections; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectVisitor.java similarity index 77% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectVisitor.java index f8d1904558086..16e545d768dd5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CollectVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CollectVisitor.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ColumnTransformerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ColumnTransformerVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java index 06d4b1971fe34..8e7bb0a129e51 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ColumnTransformerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java @@ -17,58 +17,58 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.TreeCaseWhenThenColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticDivisionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticModuloColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessThanColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LogicAndColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LogicOrColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LongDivisionLongColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LongModulusLongColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.TreeCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticDivisionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticModuloColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticMultiplicationColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticSubtractionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessThanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.LogicAndColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.LogicOrColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.NullColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.TimeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MappableUDFColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.BetweenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.ArithmeticNegationColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.InColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LikeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.RegularColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.NullColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MappableUDFColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.BetweenColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.ArithmeticNegationColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.InColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LikeColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.RegularColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; @@ -84,7 +84,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType.BETWEEN; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionType.BETWEEN; import static org.apache.tsfile.enums.TSDataType.UNKNOWN; import static org.apache.tsfile.read.common.type.LongType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java index 772e0189bc328..f8bb7b8dbe7bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CompleteMeasurementSchemaVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.metadata.view.BrokenViewException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ConcatDeviceVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ConcatDeviceVisitor.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ConcatDeviceVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ConcatDeviceVisitor.java index cf8244a92a60c..b62e1a230457e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ConcatDeviceVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ConcatDeviceVisitor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; public class ConcatDeviceVisitor extends ReconstructVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CountTimeAggregationAmountVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CountTimeAggregationAmountVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java index afd25304d54b7..1a573f856c26e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/CountTimeAggregationAmountVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +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.multi.FunctionExpression; import java.util.Collections; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExistUnknownTypeInExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExistUnknownTypeInExpression.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExistUnknownTypeInExpression.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExistUnknownTypeInExpression.java index 92ebf3639259f..d786e48dd0083 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExistUnknownTypeInExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExistUnknownTypeInExpression.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +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; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionAnalyzeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionAnalyzeVisitor.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionAnalyzeVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionAnalyzeVisitor.java index e9b2019bf0f28..e31921d7c643d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionAnalyzeVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionAnalyzeVisitor.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import java.util.List; import java.util.stream.Collectors; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionNormalizeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionNormalizeVisitor.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionNormalizeVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionNormalizeVisitor.java index cc3c2851e928c..59868395c3969 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionNormalizeVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionNormalizeVisitor.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionVisitor.java similarity index 64% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionVisitor.java index 1a0bec9dc6753..74537fb60b84a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ExpressionVisitor.java @@ -17,44 +17,44 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; - -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; + +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.ArithmeticBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; /** * This class provides a visitor of {@link Expression}, which can be extended to create a visitor diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/GetMeasurementExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/GetMeasurementExpressionVisitor.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/GetMeasurementExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/GetMeasurementExpressionVisitor.java index 7a15635b7857d..4eefc378cfada 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/GetMeasurementExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/GetMeasurementExpressionVisitor.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionTypeAnalyzer; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; public class GetMeasurementExpressionVisitor extends ReconstructVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/IntermediateLayerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/IntermediateLayerVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java index 759d0a14c5932..a7b11f2cfd293 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/IntermediateLayerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java @@ -17,34 +17,34 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.input.QueryDataSetInputLayer; import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.ConstantIntermediateLayer; import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.IntermediateLayer; import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.MultiInputLayer; import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.SingleInputMultiReferenceLayer; import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.SingleInputSingleReferenceLayer; +import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary.ArithmeticAdditionTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary.ArithmeticDivisionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/LowercaseNormalizeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/LowercaseNormalizeVisitor.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/LowercaseNormalizeVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/LowercaseNormalizeVisitor.java index 64fe89d0d4251..973388dba1e33 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/LowercaseNormalizeVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/LowercaseNormalizeVisitor.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReconstructVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReconstructVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java index 1e159ed488754..94e2022637558 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReconstructVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; import org.apache.iotdb.db.utils.constant.SqlConstant; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/RemoveRootPrefixVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/RemoveRootPrefixVisitor.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/RemoveRootPrefixVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/RemoveRootPrefixVisitor.java index b4d80f134d5ac..57b2b65a52902 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/RemoveRootPrefixVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/RemoveRootPrefixVisitor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import static org.apache.iotdb.commons.schema.SchemaConstant.ROOT; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceLogicalViewVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceLogicalViewVisitor.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceLogicalViewVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceLogicalViewVisitor.java index 96092383e6fac..39fe3c637c938 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceLogicalViewVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceLogicalViewVisitor.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.GetSourcePathsVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.TransformToExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java index 5d9c642817969..dd71fbca165b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceRawPathWithGroupedPathVisitor.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.queryengine.plan.analyze.GroupByLevelHelper; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; import java.util.function.UnaryOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceSubTreeWithViewVisitor.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceSubTreeWithViewVisitor.java index 9d52c0d3fa5de..49702ff5528e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/ReplaceSubTreeWithViewVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReplaceSubTreeWithViewVisitor.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java index 18358df5e0ff5..682ed41093481 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TemplatedConcatRemoveUnExistentMeasurementVisitor.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.tsfile.write.schema.IMeasurementSchema; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TransformToViewExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TransformToViewExpressionVisitor.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TransformToViewExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TransformToViewExpressionVisitor.java index 75f2ee419ebac..27befb28c9066 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/TransformToViewExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/TransformToViewExpressionVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.binary.arithmetic.AdditionViewExpression; @@ -45,33 +45,33 @@ import org.apache.iotdb.commons.schema.view.viewExpression.unary.LogicNotViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.unary.NegationViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.unary.RegularViewExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java index 4ef553d02ad91..a26863e5a4e33 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; @@ -26,12 +26,12 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CompleteMeasurementSchemaVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.CompleteMeasurementSchemaVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.TransformToExpressionVisitor; import org.apache.iotdb.db.utils.constant.SqlConstant; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java index 49c16f76bdf75..71691cd79e651 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.external.commons.lang3.Validate; @@ -45,7 +45,7 @@ import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructBinaryExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructTimeSeriesOperandsWithMemoryCheck; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; +import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; import static org.apache.iotdb.db.utils.TypeInferenceUtils.bindTypeForBuiltinAggregationNonSeriesInputExpressions; import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/CartesianProductVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/CartesianProductVisitor.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/CartesianProductVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/CartesianProductVisitor.java index 381ff5503d9d2..78a9b2ab974ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/CartesianProductVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/CartesianProductVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionAnalyzeVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionAnalyzeVisitor; import java.util.ArrayList; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java index 9bf57bf0274b6..00e71b6f08caa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; @@ -25,11 +25,11 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.external.commons.lang3.Validate; @@ -43,7 +43,7 @@ import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; +import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; import static org.apache.iotdb.db.utils.TypeInferenceUtils.bindTypeForBuiltinAggregationNonSeriesInputExpressions; import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java index a1a79b8462249..79fdd754f273a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.tsfile.enums.TSDataType; @@ -32,7 +32,7 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; +import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; public class ConcatDeviceAndBindSchemaForHavingVisitor extends ConcatDeviceAndBindSchemaForExpressionVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java index ed5776255a599..e263970ed8006 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.tsfile.external.commons.lang3.Validate; @@ -40,7 +40,7 @@ import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructTimeSeriesOperandsWithMemoryCheck; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; +import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; public class ConcatDeviceAndBindSchemaForPredicateVisitor extends CartesianProductVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java index 5550930664587..391c66ad3c228 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.common.constant.TsFileConstant; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/QueryContextProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/QueryContextProvider.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/QueryContextProvider.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/QueryContextProvider.java index dbbee1bb0faff..2eb0ec0b4e72f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/cartesian/QueryContextProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/QueryContextProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.cartesian; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalAndVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalAndVisitor.java similarity index 73% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalAndVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalAndVisitor.java index 21654f57e5879..d3369e2c9d08d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalAndVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalAndVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.logical; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionAnalyzeVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionAnalyzeVisitor; public abstract class LogicalAndVisitor extends ExpressionAnalyzeVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalOrVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalOrVisitor.java similarity index 73% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalOrVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalOrVisitor.java index 31fd5bdb62ac4..96c0077460e28 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/LogicalOrVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/LogicalOrVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.logical; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.BinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.TernaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionAnalyzeVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionAnalyzeVisitor; public abstract class LogicalOrVisitor extends ExpressionAnalyzeVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java index e80d539593c41..3a7c1ddbb37fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/PredicateCanPushDownToSourceChecker.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.logical; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; public class PredicateCanPushDownToSourceChecker extends LogicalAndVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/TimeFilterExistChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/TimeFilterExistChecker.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/TimeFilterExistChecker.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/TimeFilterExistChecker.java index 5c7103a8b3fb6..a1d0992facc48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/logical/TimeFilterExistChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/logical/TimeFilterExistChecker.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.logical; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.logical; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; public class TimeFilterExistChecker extends LogicalOrVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java index 85586f180ffdc..1b14f05833724 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java @@ -17,30 +17,30 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; import org.apache.iotdb.db.utils.DateTimeUtils; import com.google.common.io.BaseEncoding; @@ -65,7 +65,7 @@ import java.util.Set; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression.flipType; +import static org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression.flipType; import static org.apache.tsfile.enums.TSDataType.DOUBLE; import static org.apache.tsfile.enums.TSDataType.INT32; import static org.apache.tsfile.enums.TSDataType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java index 6748103aec15f..7982de7d01542 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -17,27 +17,27 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate; - -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; + +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.tsfile.enums.TSDataType; @@ -51,7 +51,7 @@ import java.util.TimeZone; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression.flipType; +import static org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression.flipType; import static org.apache.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG; public class ConvertPredicateToTimeFilterVisitor extends PredicateVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicatePushIntoScanChecker.java similarity index 76% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicatePushIntoScanChecker.java index 1bf3a84a3ecd1..f692e27a85861 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicatePushIntoScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicatePushIntoScanChecker.java @@ -17,26 +17,26 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate; - -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; + +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; import static org.apache.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateSimplifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateSimplifier.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateSimplifier.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateSimplifier.java index 24d4383b62230..be81a33587c40 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateSimplifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateSimplifier.java @@ -17,35 +17,35 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ArithmeticBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.LeafOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionAnalyzeVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.binary.ArithmeticBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionAnalyzeVisitor; import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.ConvertPredicateToFilterVisitor.getValue; +import static org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.ConvertPredicateToFilterVisitor.getValue; public class PredicateSimplifier extends ExpressionAnalyzeVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateVisitor.java similarity index 61% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateVisitor.java index c3434c3150df4..fe36b95fd04aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/expression/visitor/predicate/PredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/PredicateVisitor.java @@ -17,25 +17,25 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate; - -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ExpressionVisitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; + +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; /** * This class provides a visitor of {@link Expression}, which can be extended to create a visitor diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ReversePredicateVisitor.java similarity index 71% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ReversePredicateVisitor.java index d873d1abe8be9..e9b5c715fb4fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/expression/visitor/predicate/ReversePredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ReversePredicateVisitor.java @@ -17,26 +17,25 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression.expression.visitor.predicate; - -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.GroupByTimeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.predicate.PredicateVisitor; +package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; + +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; +import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.GroupByTimeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; public class ReversePredicateVisitor extends PredicateVisitor { 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 415ab0e55548b..6dac919560cc1 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 @@ -33,9 +33,9 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java index cf0717a2c8e55..42fbd67b39eae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java @@ -26,7 +26,7 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.CollectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java index 0bd88de4c052e..b0f2c66be70be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java @@ -33,8 +33,8 @@ import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ProjectNode; 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 c759ec67fc5c9..113209f31af4c 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 @@ -71,37 +71,37 @@ import org.apache.iotdb.db.queryengine.execution.operator.window.ainode.TailInferenceWindow; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ColumnDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateView; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; @@ -308,7 +308,7 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.canPushDownLimitOffsetToGroupByTime; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.pushDownLimitOffsetToTimeParameter; import static org.apache.iotdb.db.queryengine.plan.relational.sql.parser.AstBuilder.lowerIdentifier; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java index 0c7b18544005d..4fc5e50a060af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java @@ -30,13 +30,13 @@ import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.SqlLexer; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.component.FromComponent; import org.apache.iotdb.db.queryengine.plan.statement.component.GroupByTimeComponent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 13de7172861e7..81514efbffd17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -118,8 +118,8 @@ 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.statement.component.Ordering; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; 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 c9b0923cb1964..10365024d4e25 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 @@ -41,9 +41,9 @@ import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesCountNode; 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 5a6fa3c1a7bea..47695ce2683b5 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 @@ -26,8 +26,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.TransformToViewExpressionVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.TransformToViewExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFileNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index 1407bf79f1e6c..6407bf676315e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -172,12 +172,12 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ColumnTransformerVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ColumnTransformerVisitor; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimatorFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; @@ -265,8 +265,8 @@ import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; import org.apache.iotdb.db.queryengine.plan.statement.literal.Literal; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; +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.queryengine.transformation.dag.udf.UDTFContext; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSourceType; import org.apache.iotdb.db.utils.columngenerator.ColumnGenerator; @@ -324,7 +324,7 @@ import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DELIMITER_BETWEEN_ID; import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DOWNSTREAM_PLAN_NODE_ID; import static org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils.convertPredicateToFilter; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; +import static org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor.getAggregationTypeByFuncName; import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions.updateFilterUsingTTL; import static org.apache.iotdb.db.queryengine.plan.statement.component.Ordering.ASC; 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 73ac215bf758d..128c998b4f77a 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 @@ -25,9 +25,9 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; 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 944a0ad2929dd..0a7d369565854 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 @@ -25,7 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.RawDataAggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java index 71dc7d115f7e6..5055f43aaf0bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanContext.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.external.commons.lang3.Validate; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java index f522c361c8f6a..d9005b42bec7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java @@ -25,7 +25,7 @@ import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.plan.ClusterTopology; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.AbstractFragmentParallelPlanner; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java index aeccd9b9e827d..c7c4387c61ece 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java @@ -31,7 +31,7 @@ import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.expression.expression.expression.multi.FunctionType; +import org.apache.iotdb.db.node_commons.plan.expression.multi.FunctionType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; @@ -39,9 +39,9 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.ConcatDeviceVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.ConcatDeviceVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.BaseSourceRewriter; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaFetchMergeNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java index 75d9bba5b2ecc..cd61a2f5737a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.read.filter.basic.Filter; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.java index a2ad33f17580d..132077d801b61 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TreeModelTimePredicate.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.read.filter.basic.Filter; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 e1365ab5e5065..5beb295214b86 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 @@ -49,7 +49,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.CollectNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java index 47ebfdb1d07ba..f5637e0c95439 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java @@ -24,7 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; 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 33ec8c5f41f81..c426aa856125f 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 @@ -25,7 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationSourceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java index 9e6094df3709c..996cd48fd0f7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java @@ -24,7 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; 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 b94ccd5e87160..8468770de5f4c 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 @@ -25,7 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java index c6b90976d50b1..f2443b7591fc2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java @@ -24,7 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java index 774db7567e354..0251dbdaa8085 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java @@ -29,7 +29,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java index dacad0bac3887..88be2ddd980b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java @@ -29,7 +29,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java index b21341c003eb6..9d2acee670b32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java index d1ace2f44d3ba..f935bc2d6b706 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java @@ -27,7 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; 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 e950d2ab6462e..2b0ae8a9e1389 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 @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java index 6b2f0b25d0b19..e7553320728e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java @@ -27,7 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java index 3f619520ca1f9..62136d5764e5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java index 8a2bb0c59bb5a..707ccc1c41aea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java index f903a5909a294..415723ad1e79f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java @@ -27,7 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java index 1d27848cb67f7..40ad0aab985c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java @@ -21,7 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java index fac6a1be5e046..d986baf2faa3c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java index 8cd35ccbcaf8d..ec277b5aae11d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByConditionParameter.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 0a056eb14a723..004cad134602d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index bdc23a3c66725..eaf59bd02d32d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -26,7 +26,7 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; @@ -272,7 +272,7 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.schema.table.TsTable.TABLE_ALLOWED_PROPERTIES; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; -import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction.TIMECOL_PARAMETER_NAME; +import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ForecastTableFunction.TIMECOL_PARAMETER_NAME; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression.getQualifiedName; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.FULL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.INNER; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java index bd79521fcd497..cafb9b92411fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java @@ -76,7 +76,7 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.ConvertPredicateToTimeFilterVisitor.getLongValue; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java index d3afbe8704996..f761134be9393 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java @@ -62,7 +62,7 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java index 1a39aa0e14789..7ca39440de204 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java @@ -26,7 +26,7 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinWindowFunction; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java index 7932f8301624c..9362de110d8dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import com.google.common.base.Joiner; 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 7ecac03a94769..eeb92adf50c7e 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 @@ -32,13 +32,13 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.AdditionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.DivisionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.ModulusResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.MultiplicationResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.AdditionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.DivisionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.ModulusResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; @@ -77,7 +77,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.tsfile.read.common.type.BinaryType.TEXT; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java index 48c0b0b8f5706..5adec402229f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java @@ -21,8 +21,8 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.InterpretedFunctionInvoker; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.function.InterpretedFunctionInvoker; +import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; @@ -49,7 +49,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; @@ -82,7 +82,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; public class IrExpressionInterpreter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java index f816aa424b801..9e8fa898d278e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java @@ -21,7 +21,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java index 99d035af37e99..0fb65377d9a5e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java @@ -25,7 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException; +import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; import org.apache.tsfile.utils.Pair; 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 721a99cc1782b..59a2d94ae7bc0 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 @@ -36,8 +36,8 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; @@ -144,7 +144,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED; -import static org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind.AGGREGATE; +import static org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind.AGGREGATE; import static org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java index 46c1494f5ec50..e95e54bc01363 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java @@ -40,7 +40,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; public class GapFillStartAndEndTimeExtractVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java index a3b8ec485dd9d..ed3f8c85e97f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java @@ -37,7 +37,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.UnknownExpressionTypeException; +import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java index 3843d16a4cf90..5469f4d29c473 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java index 93714a9a98f12..b6ea2b034b37a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind; import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java index e4a790c36accc..b6f66f5afa646 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -44,7 +44,7 @@ import static com.google.common.base.Verify.verify; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind.AGGREGATE; +import static org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind.AGGREGATE; import static org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index 21e712beb88a9..8c7fc61a66d43 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -56,7 +56,7 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.LongType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java index 133cd1d80759f..d41de1b3a0ee2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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 92ff9b9fcfb0e..2596d2e6d64b7 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 @@ -23,7 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java index d04cf6925fa0b..997704f24291e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind; import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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 45deb5b94fb27..0cfe868f90249 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 @@ -39,8 +39,8 @@ import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; 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.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; +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; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.storageengine.dataregion.modification.ModEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java index 2049b6d5dfa8c..ec45a90a4b827 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByComponent.java @@ -21,7 +21,7 @@ import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; public abstract class GroupByComponent extends StatementNode { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java index 9d441c7c89110..2e54f2b4a0dd7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/GroupByConditionComponent.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; public class GroupByConditionComponent extends GroupByComponent { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java index e6fcb88d98981..34d7d272c636f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/HavingCondition.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; /** This class maintains information of {@code HAVING} clause. */ diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java index 878b95515e617..00bd6f01b0a5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java index 4bee56ea22022..236a939dc9aef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/OrderByComponent.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java index f6daf263e0be8..f97391330811e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/ResultColumn.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java index 0e20be2b33925..1bf41bd8abfb3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SelectComponent.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java index c45c1f97e5d5b..6d6bb4ef30a42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/SortItem.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java index d581a6df2cc3d..7352c1e96fcb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/WhereCondition.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; /** This class maintains information of {@code WHERE} clause. */ diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java index 92ad2c33ae839..d966903abd392 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java @@ -24,10 +24,10 @@ import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType; import org.apache.iotdb.db.queryengine.execution.operator.window.ainode.InferenceWindow; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CountTimeAggregationAmountVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.CountTimeAggregationAmountVisitor; import org.apache.iotdb.db.queryengine.plan.statement.AuthorityInformationStatement; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java index 716f062dd62ff..8bca6b8f5d1cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/AlterLogicalViewStatement.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.IConfigStatement; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java index dbb5461d61282..e1a122b081620 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java @@ -24,8 +24,8 @@ import org.apache.iotdb.db.exception.metadata.view.UnsupportedViewException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.analyze.SelectIntoUtils; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java index 0f5814bc25a9e..f47ff93cf5ed2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java @@ -29,7 +29,7 @@ import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.commons.udf.service.UDFExecutableManager; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.udf.api.UDF; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.exception.UDFManagementException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java index b92a4c035a065..daf88dfb6626c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java @@ -21,12 +21,12 @@ import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.IntermediateLayerVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.IntermediateLayerVisitor; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.input.QueryDataSetInputLayer; import org.apache.iotdb.db.queryengine.transformation.dag.intermediate.IntermediateLayer; +import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/AbstractCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/AbstractCaseWhenThenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java index 24f7963f7c660..7ac2f348d27a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/AbstractCaseWhenThenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column; +package org.apache.iotdb.db.queryengine.transformation.dag.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnCache.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnCache.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnCache.java index 5b23084ac132b..6adfbe072e1f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnCache.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column; +package org.apache.iotdb.db.queryengine.transformation.dag.column; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnTransformer.java index c3137e9628f7a..50ba07fe49653 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column; +package org.apache.iotdb.db.queryengine.transformation.dag.column; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.NullColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.NullColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/FailFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/FailFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/FailFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/FailFunctionColumnTransformer.java index 8ff4c7f5b036b..41632d7be1a4a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/FailFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/FailFunctionColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column; +package org.apache.iotdb.db.queryengine.transformation.dag.column; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TableCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TableCaseWhenThenColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TableCaseWhenThenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TableCaseWhenThenColumnTransformer.java index d99bb54ffdf4d..637c41417465a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TableCaseWhenThenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TableCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column; +package org.apache.iotdb.db.queryengine.transformation.dag.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TreeCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TreeCaseWhenThenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java index 40f02fca4244b..c3704ced734e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/TreeCaseWhenThenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column; +package org.apache.iotdb.db.queryengine.transformation.dag.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java index 2cbab868b84cc..f8036106e5cf3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticAdditionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java index 2c3f65842d834..08e2171147380 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticBinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java index d25e1417a37ed..c4f92be150a4a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticDivisionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticModuloColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticModuloColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java index 1854fcd1655ba..854379cd87661 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticModuloColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java index 9223368d5cf9b..f223350930230 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticMultiplicationColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java index 06f7a9f0896ac..18f935ca0fdcd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/ArithmeticSubtractionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/BinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/BinaryColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/BinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/BinaryColumnTransformer.java index 722965c34230e..75dcb6dc17ed8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/BinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/BinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareBinaryColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareBinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareBinaryColumnTransformer.java index 2fc5f47a20b96..fb09941245b3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareBinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareEqualToColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareEqualToColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareEqualToColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareEqualToColumnTransformer.java index bd4b3f99f59f8..f777180e9f089 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareEqualToColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareEqualToColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java index effaea54d6d72..1aba400614c17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterEqualColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterThanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterThanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java index cdd5092b03ef3..4f46f76bf3dce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareGreaterThanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessEqualColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java index 53964b6e8ccc4..0eede197be3ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessEqualColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessThanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessThanColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessThanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessThanColumnTransformer.java index ee0aea5207457..09bd953be181f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareLessThanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessThanColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareNonEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareNonEqualColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java index 5414fa9a6cdd2..9f0cd152ebe77 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/CompareNonEqualColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/HmacColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/HmacColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/HmacColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/HmacColumnTransformer.java index ad4eacdc8ed7d..a3872608a3260 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/HmacColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/HmacColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class HmacColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/Like2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/Like2ColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/Like2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/Like2ColumnTransformer.java index ea60f1159c520..6f8bd9764db35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/Like2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/Like2ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicAndColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicAndColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicAndColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicAndColumnTransformer.java index 4b93435024f75..7a68e5fa030d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicAndColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicAndColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicBinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformer.java index 5bf73f07ed444..595fa291c32ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicBinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicOrColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicOrColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicOrColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicOrColumnTransformer.java index fe4b6156ccf1c..064ad6974daba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/LogicOrColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicOrColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/binary/factory/factory/HmacStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/factory/HmacStrategiesFactory.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/binary/factory/factory/HmacStrategiesFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/factory/HmacStrategiesFactory.java index 2fe9d6527b5a1..9228c728eb2e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/binary/factory/factory/HmacStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/factory/HmacStrategiesFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/strategies/HmacStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/strategies/HmacStrategy.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/strategies/HmacStrategy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/strategies/HmacStrategy.java index 237004e818fa5..01f83cce52b7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/binary/strategies/HmacStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/strategies/HmacStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies; +package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies; @FunctionalInterface public interface HmacStrategy { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/ConstantColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/ConstantColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/ConstantColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/ConstantColumnTransformer.java index 14207917ac3b4..0750e5dc9d1fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/ConstantColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/ConstantColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf; +package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/IdentityColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/IdentityColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/IdentityColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/IdentityColumnTransformer.java index 5a7b27f51632d..f4cc0667777fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/IdentityColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/IdentityColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf; +package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/LeafColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/LeafColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/LeafColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/LeafColumnTransformer.java index 4cfe57c571e4a..4e6d423b4b50f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/LeafColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/LeafColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf; +package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/NullColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/NullColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/NullColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/NullColumnTransformer.java index 04add40c52825..d6cc68ab3ca5e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/NullColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/NullColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf; +package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; import org.apache.tsfile.read.common.block.column.NullColumn; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/TimeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/TimeColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/TimeColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/TimeColumnTransformer.java index e20aa79652ea6..d8fe028bf092f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/leaf/TimeColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/TimeColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf; +package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java index a835c8d0a697d..f92c5fa2811e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/AbstractGreatestLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java index 7557522e36120..e81487bbac3e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryLeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryLeastColumnTransformer.java index 028322d39856f..6cde29f4c8453 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BinaryLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java index 6d2e18117f75a..6c283225c7403 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanLeastColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanLeastColumnTransformer.java index f72506711a9f8..1cfbde1575857 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/BooleanLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/CoalesceColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/CoalesceColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/CoalesceColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/CoalesceColumnTransformer.java index 298f7d1b5b13c..82efc732e451c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/CoalesceColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/CoalesceColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java index 114346fe77930..e09f0b6df4b21 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleLeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleLeastColumnTransformer.java index d4d2bfea2e956..2dc19ec75e7a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/DoubleLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatGreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatGreatestColumnTransformer.java index bcd236b33d734..bc5bfc982f8c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatLeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatLeastColumnTransformer.java index 9d6dc10247f0e..223f63673390d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/FloatLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBinaryMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBinaryMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java index 9dbe1ac39e63e..9491a201ed1d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBinaryMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBooleanMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBooleanMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java index 6669fbe9817a2..f99bc791b39e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InBooleanMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InDoubleMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InDoubleMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java index 66b071382717b..482214498b950 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InDoubleMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InFloatMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InFloatMultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InFloatMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InFloatMultiColumnTransformer.java index e99a64e8fa273..310669c73cf01 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InFloatMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InFloatMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt32MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt32MultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt32MultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt32MultiColumnTransformer.java index 65bcd9253793f..ad291426a1cb7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt32MultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt32MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt64MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt64MultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt64MultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt64MultiColumnTransformer.java index c1a818dcd7ebc..aa3ec1397fbf4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InInt64MultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt64MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InMultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InMultiColumnTransformer.java index f389a433cb012..319b4225d8502 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/InMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32GreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32GreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32GreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32GreatestColumnTransformer.java index f303b6d0a2ebc..551970f470a67 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32GreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32GreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32LeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32LeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32LeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32LeastColumnTransformer.java index 4e46c78c9e254..26b64349fb4f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int32LeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32LeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64GreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64GreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64GreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64GreatestColumnTransformer.java index 0d40289835236..7818d217d0aad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64GreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64GreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64LeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64LeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64LeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64LeastColumnTransformer.java index 9e3060ed318be..0efaccb378690 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/Int64LeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64LeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalAndMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalAndMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java index 55bf38c4be1e7..321f03b186bdb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalAndMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalMultiColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalMultiColumnTransformer.java index 5814a0e8781bd..c90133e7cf523 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalOrMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalOrMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java index 72f34436500a1..9164ec578eec2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/LogicalOrMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MappableUDFColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MappableUDFColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MappableUDFColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MappableUDFColumnTransformer.java index 67417bf6ac982..440585eed781b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MappableUDFColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MappableUDFColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MultiColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MultiColumnTransformer.java index 4ddaf76dd4eed..8045edc4a53bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/multi/MultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi; +package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/BetweenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/BetweenColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/BetweenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/BetweenColumnTransformer.java index 9fd0cb569bb66..c0344b001fafd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/BetweenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/BetweenColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/CompareTernaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/CompareTernaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java index 2a2da54697c66..26dabe9a7c54e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/CompareTernaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/Like3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/Like3ColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/Like3ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/Like3ColumnTransformer.java index d61870d85e79b..34000e227c66e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/Like3ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/Like3ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -27,7 +27,7 @@ import org.apache.tsfile.common.regexp.LikePattern; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; public class Like3ColumnTransformer extends TernaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/LpadColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/LpadColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformer.java index c9ef147a9cc10..db4d17d75f196 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/LpadColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.utils.BytePaddingUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.utils.BytePaddingUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/RpadColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/RpadColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformer.java index 134fe7e657f1b..ea05be1319a60 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/RpadColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.utils.BytePaddingUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.utils.BytePaddingUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/TernaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/TernaryColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/TernaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/TernaryColumnTransformer.java index 98005aee17108..3a9dccd8e8fda 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/TernaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/TernaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/utils/BytePaddingUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/utils/BytePaddingUtils.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/utils/BytePaddingUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/utils/BytePaddingUtils.java index b57307eb50510..1e5f3ed20a87b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/ternary/utils/BytePaddingUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/utils/BytePaddingUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.utils; +package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.utils; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/udf/UserDefineScalarFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/udf/UserDefineScalarFunctionTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java index 163014031b399..47fd40ed73f92 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/udf/UserDefineScalarFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.udf; +package org.apache.iotdb.db.queryengine.transformation.dag.column.udf; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.RecordIterator; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.iotdb.udf.api.relational.ScalarFunction; import org.apache.iotdb.udf.api.relational.access.Record; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/ArithmeticNegationColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/ArithmeticNegationColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java index 4029e31ff5fb0..81819dddf8141 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/ArithmeticNegationColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/InColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/InColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java index 26fc7d817e116..17fc57a1b5277 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/InColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/IsNullColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/IsNullColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/IsNullColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/IsNullColumnTransformer.java index 2472226060618..fa781f270575c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/IsNullColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/IsNullColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LikeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LikeColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LikeColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LikeColumnTransformer.java index f6de680e4d32e..5930cc999e972 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LikeColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LikeColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LogicNotColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LogicNotColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LogicNotColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LogicNotColumnTransformer.java index 80d20ab35b574..8c0f983121169 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/LogicNotColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LogicNotColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/RegularColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/RegularColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/RegularColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/RegularColumnTransformer.java index 071f2017b8b9d..b22c1c64856c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/RegularColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/RegularColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/UnaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/UnaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformer.java index 6d521b67ddbce..7b3294f3c1dae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/UnaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbsColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbsColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbsColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbsColumnTransformer.java index 75e42784f88d4..294c02b3d2d96 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbsColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbsColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java index bde7582a152bf..dfc7a2333513f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwise2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java index 567d952a7614c..c4d1cd8f3176d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractBitwiseColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java index 3a49b4761ed7c..9ed1bb33075da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractCastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; @@ -38,7 +38,7 @@ import java.time.ZoneId; import java.time.format.DateTimeParseException; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper.ERROR_MSG; +import static org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper.ERROR_MSG; import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE; public abstract class AbstractCastFunctionColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java index 6a83ce6dd229e..08eb47691668f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AbstractLengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AcosColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AcosColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AcosColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AcosColumnTransformer.java index 533647dc6ac4b..1808e147fbd1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AcosColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AcosColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AsinColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AsinColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AsinColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AsinColumnTransformer.java index 6928059f6a267..8a73986f897d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AsinColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AsinColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AtanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AtanColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AtanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AtanColumnTransformer.java index ca8b88828d33d..8f86f838474c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/AtanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AtanColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java index d636838a202ad..04ffea29c63c9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCount2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCountColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCountColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java index d0c7986cf0186..87a928ef16b8b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitCountColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java index 8af9b52436ab5..3be14f412b3cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAnd2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java index 3b50ab74027cf..57676824bb976 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseAndColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java index 3daf805def12f..8c42d788878a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java index b69b51758a6f1..40651076dfc08 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java index 20663508281a1..8649cdbdb6b49 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseNotColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java index d6746237a5bbe..d54ff7b1607a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOr2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java index f7b6589d6da98..e6be0927f4643 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseOrColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java index e9745711e966d..8d717c6c883d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java index 5386f7ec96057..402d38d40c858 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java index 93ff7b741e3d8..5042d83d4c0f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java index 7537eb6f6d90d..5f77af2e87c89 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseRightShiftColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java index 5b94895a9afa0..8ab1c754f286b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXor2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java index 2658f1783908a..0d648b3e26ee9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BitwiseXorColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java index 85baad1698898..bce18fb059718 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BlobLengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java index a2f92613f5969..e62fdfcbe2375 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToDoubleColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToDoubleColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java index 0ebd19280ae2a..15af6deed2dfd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToFloatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToFloatColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java index dea22a1eec0d5..0e42a3a713afd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToIntColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToIntColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java index 7fc65f096b087..dcf0e4a086531 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/BytesToLongColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; /** A transformer that converts byte array representations to long values */ public class BytesToLongColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CRC32Transformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CRC32Transformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CRC32Transformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CRC32Transformer.java index 8dec0fe907242..d7e9dccb62a92 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CRC32Transformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CRC32Transformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java index 3f30934fc4beb..624eabadc62d6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CeilColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CeilColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CeilColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CeilColumnTransformer.java index a95dc3f772cff..31cb8df744813 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CeilColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CeilColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Concat2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Concat2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java index 9009ae40b2bc7..18c59344be8a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Concat2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.ConcatColumnTransformer.concat; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ConcatColumnTransformer.concat; public class Concat2ColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java index 3ab02e6991c16..47dd6866a33b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java index 25a8f0a5a6cc6..ec053fe2ad9e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ConcatMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CosColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CosColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CosColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CosColumnTransformer.java index bc1fcf6feae06..4d731965b6846 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CosColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CosColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CoshColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CoshColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CoshColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CoshColumnTransformer.java index f5a5c14d0bc41..2079f1659c5dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/CoshColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CoshColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java index 73db1eb447cb4..93ef9dff3a2d4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DateBinFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DegreesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DegreesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java index 0bb1f1e75673c..b1921aa1be473 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DegreesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffColumnTransformer.java index d79315a723ed1..0d316a6c40093 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java index b96271436650c..ce6f7ebf8bfdd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DiffFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java index 6bac4d89b43b1..7b9c06147a53b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/DoubleToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java index 58e2f0530fa41..c81d83fbda779 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWith2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class EndsWith2ColumnTransformer extends BinaryColumnTransformer { public EndsWith2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWithColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWithColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java index 7eaf34bfdda32..afa1e4dff8630 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/EndsWithColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class EndsWithColumnTransformer extends UnaryColumnTransformer { private final byte[] suffix; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExpColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExpColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExpColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExpColumnTransformer.java index 631942d453e80..b804869867afc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExpColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExpColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExtractTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExtractTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java index 2159f3d641bd2..201b4bc099bf0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ExtractTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java index afba004f32f90..7d4d4795c721a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloatToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloorColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloorColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloorColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloorColumnTransformer.java index 11281d82d844f..9912df4dacd99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FloorColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloorColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FormatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FormatColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FormatColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FormatColumnTransformer.java index febab08b9166b..b47b46a636d80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/FormatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FormatColumnTransformer.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.multi.MultiColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java index 7c7b5785940a9..f387b8850e4fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/GenericCodecColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.inteface.CodecStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.inteface.CodecStrategy; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; /** * A generic, reusable column converter for handling all codec-based encoding/decoding functions. It diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java index 722c684076ec2..daa5868b938de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/HmacConstantKeyColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java index 8187aba714f8d..5c25a949c8f62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/IntToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java index 6b38e558b31f6..4643c3a6ec45d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrim2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LTrimColumnTransformer.ltrim; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LTrimColumnTransformer.ltrim; public class LTrim2ColumnTransformer extends BinaryColumnTransformer { public LTrim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrimColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java index 6104702e74e2d..aa67b782c0754 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LTrimColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TrimColumnTransformer.isContain; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; public class LTrimColumnTransformer extends UnaryColumnTransformer { private final byte[] character; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LengthColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LengthColumnTransformer.java index ace8caa2b03ac..c94530c83d403 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LnColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LnColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LnColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LnColumnTransformer.java index 4c66df684e4be..3bccb13eb6a27 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LnColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LnColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Log10ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Log10ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java index f35c64c93f9c3..fa6c021ea550a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Log10ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java index fd2d0b2114719..72c3a5b2404ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LongToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LowerColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LowerColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LowerColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LowerColumnTransformer.java index 1c7111a05efad..d4c8fbad01117 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/LowerColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LowerColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java index 4810bd15a2cd7..5d39c6f6af3ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ObjectLengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.utils.ObjectTypeUtils; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java index 0e918ec352cc2..2d04dce84e491 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrim2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.RTrimColumnTransformer.rtrim; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RTrimColumnTransformer.rtrim; public class RTrim2ColumnTransformer extends BinaryColumnTransformer { public RTrim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrimColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java index 2903344bca7ba..18c4311d5246d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RTrimColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TrimColumnTransformer.isContain; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; public class RTrimColumnTransformer extends UnaryColumnTransformer { private final byte[] character; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RadiansColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RadiansColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java index d3c3d853765cb..b8d7cbab88f3c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RadiansColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java index ab9c938ed9c2d..67c2c2624c53a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLike2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java index f3409481b9e6d..e85e1b9724254 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RegexpLikeColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java index ccdbde2b1d3c1..5a44243206de2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace3ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java index cbd7ee7985c32..c5133c5e39034 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Replace3ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.TernaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java index e62ad0ce31304..d2efd3483db84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/ReplaceFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundColumnTransformer.java index a503faec08636..4e66aeb7b96aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java index e8ae02293369a..7817fcd1c7d22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/RoundFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SignColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SignColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SignColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SignColumnTransformer.java index f30dd1cc74290..b2796eaad1fc0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SignColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SignColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinColumnTransformer.java index 073e6fddba4b3..f1f2a4da27744 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinhColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinhColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinhColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinhColumnTransformer.java index 8284d2d2cd39f..c6faf22c838ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SinhColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinhColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SqrtColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SqrtColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java index ea9957a28b36b..bcd6b97eb3485 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SqrtColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java index 0710614210910..b181603ca44e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWith2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class StartsWith2ColumnTransformer extends BinaryColumnTransformer { public StartsWith2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWithColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWithColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java index 2b7195ec9e7a3..cf44d3ec0fc67 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StartsWithColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java index 56b2df010486e..c432738952d74 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strcmp2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrcmpColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrcmpColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java index 9b08c9709c8a9..c9541fe170181 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrcmpColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java index 5fff4a71db8bc..692f088a59969 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Strpos2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrposColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrposColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrposColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrposColumnTransformer.java index 78edf7ee3d36c..cd4459bd33362 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/StrposColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrposColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java index b68a2c242f1b7..b085976c2ed53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString3ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java index 28eb7ab4b8f2b..7a1dba3e08aa1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubString3ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.TernaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -29,7 +29,7 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.BytesUtils; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; public class SubString3ColumnTransformer extends TernaryColumnTransformer { public SubString3ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubStringColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubStringColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java index 761d28c9746b2..59cc8cb43694b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/SubStringColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanColumnTransformer.java index 5a5497c1011a7..a4c07da38d3f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanhColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanhColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanhColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanhColumnTransformer.java index 655f3f3239ba4..b0d2271698544 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TanhColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanhColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Trim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Trim2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java index e65ae830de878..c6788c95b632b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/Trim2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.TrimColumnTransformer.trim; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer.trim; public class Trim2ColumnTransformer extends BinaryColumnTransformer { public Trim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TrimColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TrimColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TrimColumnTransformer.java index 89dad44fb8784..8e75c5e700741 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TrimColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TrimColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java index 107eb430cc6b0..419d1bbabf3be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/TryCastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/UpperColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/UpperColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/UpperColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/UpperColumnTransformer.java index 161a4a08d8b29..dee529093dda2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/UpperColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/UpperColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java index 941303d541d6d..546a8286d0414 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/CodecStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.inteface.CodecStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.HexUtils; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util.SpookyHashV2Utils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.inteface.CodecStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.HexUtils; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.SpookyHashV2Utils; import com.google.common.hash.Hashing; import com.google.common.io.BaseEncoding; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java index 7996a650390f8..60d1e77f78b2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/factory/NumericCodecStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/inteface/CodecStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/inteface/CodecStrategy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java index cc83fbda982b5..7c2fd4833a139 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/inteface/CodecStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.inteface; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.inteface; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/HexUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/HexUtils.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/HexUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/HexUtils.java index 1545ea651616c..15ed2b9d342d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/HexUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/HexUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java index c734c70f8c8b0..e6ef386827e46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/SpookyHashV2Utils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/TransformerDebugUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/TransformerDebugUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java index 9a3d0bc15e9b9..2ad8e6a29a887 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/column/column/unary/scalar/util/TransformerDebugUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.util; +package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java index e0c8e0ebe522d..14643a7b6ac50 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.input; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.utils.CommonUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java index ca960343c7ce6..72127aad5a56e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.dag.input.ConstantInputReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java index f5843b87feffd..149485ef3b5b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.udf.api.customizer.strategy.AccessStrategy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java index 21b3d0d7a3274..78e0c7451b7c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java index 41073a7e9c2bc..2bf5f2b3eb84d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java index e9bcd2ba0dd2a..e7d67c36349ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/memory/LayerMemoryAssigner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/LayerMemoryAssigner.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/memory/LayerMemoryAssigner.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/LayerMemoryAssigner.java index 5f17a2e890d05..0eb796b72aa2e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/memory/LayerMemoryAssigner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/LayerMemoryAssigner.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.memory; +package org.apache.iotdb.db.queryengine.transformation.dag.memory; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import java.util.HashMap; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java index ee785aca5b3a7..195acb6de8527 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.helper.CastFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.UnaryTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java index 8883d6861a681..3ea2cbbce2a2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java index b0e5cd041dd86..71312657ce4c2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java @@ -30,7 +30,7 @@ import org.apache.tsfile.utils.BytesUtils; import org.apache.tsfile.write.UnSupportedDataTypeException; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; public class SubStringFunctionTransformer extends UnaryTransformer { private int beginPosition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java index 6676897a7902d..771ecbd9b96ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.service.TemporaryQueryDataFileService; import java.time.ZoneId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/util/BitwiseUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtils.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/util/BitwiseUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtils.java index e82d215e08dfc..97038b20e0e73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/dag/util/BitwiseUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.dag.util; +package org.apache.iotdb.db.queryengine.transformation.dag.util; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java index a9cbf7a75b55c..015904399c201 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.datastructure.util.ValueRecorder; import org.apache.iotdb.db.utils.CommonUtils; 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 3463cba1aeed4..9401e88a5c925 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 @@ -70,8 +70,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableNodeLocationAddNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.LeafColumnTransformer; +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.metric.ISchemaRegionMetric; import org.apache.iotdb.db.schemaengine.metric.SchemaRegionMemMetric; import org.apache.iotdb.db.schemaengine.rescon.DataNodeSchemaQuotaManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java index 8c7be23ef6b1b..b74c026cefdd5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java @@ -31,8 +31,8 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ClusterSchemaFetcher; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CompleteMeasurementSchemaVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.CompleteMeasurementSchemaVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ITimeSeriesSchemaInfo; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.reader.ISchemaReader; import org.apache.iotdb.db.schemaengine.schemaregion.utils.filter.FilterContainsVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java index e1d1d03978549..73127f25c153f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/ViewPaths.java @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.metadata.view.UnsupportedViewException; import org.apache.iotdb.db.exception.metadata.view.ViewContainsAggregationException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CollectAggregationExpressionsVisitor; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.visitor.CollectAggregationExpressionsVisitor; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java index 5aae306dfdadb..622a62b06c753 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/view/visitor/TransformToExpressionVisitor.java @@ -55,32 +55,32 @@ import org.apache.iotdb.commons.schema.view.viewExpression.unary.RegularViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.unary.UnaryViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.visitor.ViewExpressionVisitor; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.NullOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ternary.BetweenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.InExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.IsNullExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LikeExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.LogicNotExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.NegationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.unary.RegularExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.ternary.BetweenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.InExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.IsNullExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.NegationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java index f13a712fc3e9d..aa2855f7b0592 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java @@ -23,13 +23,13 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.CompareBinaryExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelper; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; +import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java index 6851ccb0190a9..6476300ed3493 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.common.schematree; import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.tsfile.enums.TSDataType; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index ea18ca34ae1f9..39eaf7d6be3e0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -76,17 +76,17 @@ import org.apache.iotdb.db.queryengine.execution.operator.window.TimeWindowParameter; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowParameter; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.TimeColumnTransformer; import com.google.common.collect.Sets; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java index 53810e08ff8cc..0fd29b76e539c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java @@ -33,8 +33,8 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.process.TransformOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.input.QueryDataSetInputLayer; import org.apache.iotdb.db.queryengine.transformation.dag.input.TsBlockInputDataSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java index 20c513b4959fb..3e8c75f943d9e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.expression.predicate; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.utils.TimestampPrecisionUtils; @@ -36,22 +36,22 @@ import java.util.LinkedHashSet; import java.util.TimeZone; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.between; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.eq; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.groupByTime; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gte; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.in; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.lt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.lte; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.neq; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.not; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.notBetween; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.notIn; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.or; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.between; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.eq; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.groupByTime; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gte; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.in; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.lt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.lte; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.neq; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.not; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.notBetween; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.notIn; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.or; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.time; import static org.apache.tsfile.read.filter.operator.Not.CONTAIN_NOT_ERR_MSG; public class ConvertPredicateToTimeFilterTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicatePushIntoScanTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicatePushIntoScanTest.java index 13dfd81e6f7f0..8ee7bdaf77663 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicatePushIntoScanTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicatePushIntoScanTest.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.junit.Assert; import org.junit.Test; @@ -30,22 +30,22 @@ import java.util.Arrays; import java.util.LinkedHashSet; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.add; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.between; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.eq; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gte; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.in; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.isNotNull; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.isNull; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.like; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.lt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.not; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.notRegex; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.sin; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.time; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.add; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.between; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.eq; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gte; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.in; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.isNotNull; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.isNull; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.like; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.lt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.not; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.notRegex; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.sin; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; public class PredicatePushIntoScanTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateRemoveNotTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateRemoveNotTest.java index 49bd6baf48f8d..6171cc4829473 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateRemoveNotTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateRemoveNotTest.java @@ -27,21 +27,21 @@ import static org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils.predicateRemoveNot; import static org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils.reversePredicate; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.between; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.eq; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gte; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.in; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.lt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.lte; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.neq; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.not; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.notBetween; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.notIn; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.or; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.between; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.eq; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gte; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.in; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.lt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.lte; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.neq; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.not; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.notBetween; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.notIn; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.or; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.time; public class PredicateRemoveNotTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateUtilsTest.java index ab22745764fdb..8cd0d106047d5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/PredicateUtilsTest.java @@ -24,11 +24,11 @@ import org.junit.Assert; import org.junit.Test; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.add; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.add; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.schemaMap; public class PredicateUtilsTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/TreePredicateConversionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/TreePredicateConversionTest.java index 59c05477d15d3..e4692e0166c4c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/TreePredicateConversionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/TreePredicateConversionTest.java @@ -23,15 +23,15 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.EqualToExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/serde/CaseWhenThenExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/serde/CaseWhenThenExpressionTest.java index e760fe8bc622e..fb614928741e2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/serde/CaseWhenThenExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/serde/CaseWhenThenExpressionTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.expression.serde; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.WhenThenExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.other.CaseWhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; +import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; import org.junit.Test; @@ -30,12 +30,12 @@ import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.eq; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.lt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.whenThen; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.eq; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.lt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.whenThen; import static org.junit.Assert.assertEquals; public class CaseWhenThenExpressionTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AggregationDescriptorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AggregationDescriptorTest.java index 1766a8fc67556..2252b2b74493e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AggregationDescriptorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AggregationDescriptorTest.java @@ -23,7 +23,7 @@ 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.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.CrossSeriesAggregationDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java index 7578ce72b405a..66dc7edb8fde1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java @@ -29,7 +29,7 @@ import java.time.ZonedDateTime; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.visitor.CountTimeAggregationAmountVisitor.COUNT_TIME_ONLY_SUPPORT_ONE_WILDCARD; +import static org.apache.iotdb.db.queryengine.plan.expression.visitor.CountTimeAggregationAmountVisitor.COUNT_TIME_ONLY_SUPPORT_ONE_WILDCARD; import static org.apache.iotdb.db.queryengine.plan.statement.component.IntoComponent.DEVICE_ALIGNMENT_INCONSISTENT_ERROR_MSG; import static org.apache.iotdb.db.queryengine.plan.statement.component.IntoComponent.DEVICE_NUM_MISMATCH_ERROR_MSG; import static org.apache.iotdb.db.queryengine.plan.statement.component.IntoComponent.DUPLICATE_TARGET_PATH_ERROR_MSG; 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 4f65a42517220..542a3db907d99 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 @@ -28,22 +28,22 @@ import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.AdditionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.DivisionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicOrExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.ModuloExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.MultiplicationExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.NonEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.SubtractionExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicOrExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.ModuloExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.MultiplicationExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.NonEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.SubtractionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; @@ -67,12 +67,12 @@ import java.util.Map; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.DEVICE; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.groupByTime; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gte; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.time; +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; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gte; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.time; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzerTest.java index a85e06bd842d7..0bd16ad83cf1f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzerTest.java @@ -25,19 +25,19 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.junit.Test; import java.util.Arrays; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.count; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.path; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.count; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.path; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; import static org.junit.Assert.assertEquals; public class ExpressionAnalyzerTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java index c0dacffd29a5d..d0ba14461f799 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.optimization; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; @@ -34,9 +34,9 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.getAggregationDescriptor; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.schemaMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java index 016dd4049258e..b59a783988442 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.optimization; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java index c9558cdc5d5a6..214289d4e7ff9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java @@ -29,7 +29,7 @@ import org.apache.iotdb.db.queryengine.plan.analyze.Analyzer; import org.apache.iotdb.db.queryengine.plan.analyze.FakePartitionFetcherImpl; import org.apache.iotdb.db.queryengine.plan.analyze.FakeSchemaFetcherImpl; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; @@ -51,11 +51,11 @@ import java.util.LinkedHashMap; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.add; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.function; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.add; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.function; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.schemaMap; /** Use optimize rule: LimitOffsetPushDown and OrderByExpressionWithLimitChangeToTopK */ diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java index 896a9d548e3e8..f1c5438ec2702 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java @@ -31,7 +31,7 @@ import org.apache.iotdb.db.queryengine.plan.analyze.Analyzer; import org.apache.iotdb.db.queryengine.plan.analyze.FakePartitionFetcherImpl; import org.apache.iotdb.db.queryengine.plan.analyze.FakeSchemaFetcherImpl; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.LogicalPlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java index 22bf90dcce3dc..16ce7c9112864 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java @@ -30,13 +30,13 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.add; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.and; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.intValue; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.or; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.sin; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.add; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.and; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.intValue; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.or; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.sin; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; import static org.apache.iotdb.db.queryengine.plan.optimization.OptimizationTestUtil.schemaMap; public class PredicatePushDownTest { 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 029c6da785dda..2301cc1b3c1ae 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 @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ColumnInjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java index 4a5c018ab3892..22fb4ed564bcc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java @@ -28,13 +28,13 @@ import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterEqualExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LessThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimestampOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; +import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java index 81da6ae628ff0..1ce97704eb0c1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.tsfile.enums.TSDataType; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java index 56f4132d33ea1..f5e8d6be70f23 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java @@ -35,7 +35,7 @@ import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory; +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.TreeModelTimePredicate; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java index b28f8a6ad61d2..63920f55f5f50 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java @@ -41,7 +41,7 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.ExchangeOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.memory.ConsumeAllChildrenPipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.ConsumeChildrenOneByOnePipelineMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java index b3065d8a65465..eac3821e0ddf1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java @@ -29,8 +29,8 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java index 032128587fdfb..387900bf69715 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java @@ -49,8 +49,8 @@ import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaComputationWithAutoCreation; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.LogicalPlanner; import org.apache.iotdb.db.queryengine.plan.statement.Statement; 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 0ba8a81d6bbd1..0db43153e14d9 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 @@ -25,11 +25,11 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.LogicAndExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +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; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java index 0ef2afa61eb5c..8ac50e4b9444a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java @@ -27,8 +27,8 @@ import org.apache.iotdb.commons.schema.filter.impl.TagFilter; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.Expression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesSchemaScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java index 55b5ac5d7b070..86bc0f13f65e6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; @@ -44,8 +44,8 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.in; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.timeSeries; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.in; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.timeSeries; import static org.junit.Assert.assertEquals; public class AggregationNodeSerdeTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java index 65b657cdbe605..887f3b261d463 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.binary.GreaterThanExpression; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.ConstantOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +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.leaf.ConstantOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FilterNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java index fd36467375401..10f9b3d08b09b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; @@ -44,9 +44,9 @@ import java.util.Arrays; import java.util.Collections; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.time; import static org.junit.Assert.assertEquals; public class GroupByLevelNodeSerdeTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java index c050516d3789b..a146a6a934755 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.multi.FunctionExpression; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByTagNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; @@ -50,9 +50,9 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.time; public class GroupByTagNodeSerdeTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java index 67f2211bf88f4..af562161cbf1c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionId; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind; import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java index dfce2a4150339..25d86e17887ec 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.plan.expression.expression.expression.leaf.TimeSeriesOperand; +import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; @@ -41,9 +41,9 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.gt; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.longValue; -import static org.apache.iotdb.db.queryengine.plan.expression.expression.expression.ExpressionFactory.time; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.longValue; +import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.time; import static org.junit.Assert.assertEquals; public class SeriesAggregationScanNodeSerdeTest { 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 1687ce936a34b..46e9cebb515f2 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 @@ -33,7 +33,7 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java index 6daeefbef7f58..a86a55ad30542 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java @@ -26,7 +26,7 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java index 8aab081b9ccf2..f7462691bc70d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ForecastTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; @@ -37,8 +37,8 @@ import java.util.Collections; import java.util.function.Consumer; -import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_INTERVAL; -import static org.apache.iotdb.db.node_commons.plan.relational.function.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_START_TIME; +import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_INTERVAL; +import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_START_TIME; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.FIRST; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index a30c160678390..c27428f757739 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -28,9 +28,9 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.OperatorType; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.TableBuiltinTableFunction; -import org.apache.iotdb.db.node_commons.plan.relational.function.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java index 9eb7fc99ff51e..a6d3003e5b00b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java @@ -19,18 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticDivisionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticModuloColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticMultiplicationColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.ArithmeticSubtractionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java index 913e3ba4b1eb4..7e66638f09f6f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java @@ -19,10 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.LogicAndColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.LogicOrColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java index 55038be287f75..ba6afb33c5a7e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java index cd6ab907a4e66..e80367f52b9e4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java index d592423037553..73792cabdb90c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java index 04aa77c74932a..f88604ecaeae9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.binary.factory.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java index 334c5c1ea3aae..6640ef79ed18e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java @@ -19,8 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.LpadColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java index c9c5d275fd1b4..955aa4905b9c3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java @@ -19,8 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ternary.RpadColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java index 361d70137afdf..3d9904d764e7b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java @@ -19,14 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.ArithmeticNegationColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.InColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LikeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.RegularColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java index 176cf0e6ba436..7fbbd6da2fa23 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java @@ -19,8 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BlobLengthColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java index 9b8c6d5a2c3bf..db271fdb9a335 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java @@ -27,7 +27,7 @@ import java.time.ZoneId; import java.util.TimeZone; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; +import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; import static org.junit.Assert.assertEquals; public class DateBinFunctionTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java index 35c25d624a5d5..c4c625e6a5f8b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java index 15ca564ecb92e..bb3b0165ff037 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java index 8173a6d10add3..e493bc2deda63 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToFloatColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java index 8758e620b812f..b764d1d696aaa 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToDoubleColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java index 1cff936d37306..f6240e3e1d487 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java index cb1c143890476..6e3cefa5483fd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java index 6bf5da1db8204..e84fd6d2ff86c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java index a22ba205bba15..27c4839aaf070 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.LongColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java index 714b3a09b1bf0..835013fde4f24 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.FloatToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.FloatColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java index 0ebcc4b96d484..aa70494031a67 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.DoubleToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.DoubleColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java index 87ee09da34da7..2465a3d81d0b7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java index 822e3db9bf495..941df13280833 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.LongColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java index d09ab4ea4238f..3c3695f32d281 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java @@ -19,9 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java index 93f750b45a266..78197d3d03c3c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java @@ -22,9 +22,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java index b0b3e64d11bd1..16e795273ffcd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java index 9c37358729278..535d222cd4b88 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java index 82bd9cf7ebe5d..f89cf121f6c6f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base32Encoding; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java index a5be655cfa92f..04eae176abf81 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java index b7bfbee9f7f90..db79311f311c8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java index 6ec4b61be326f..78cf7dace0b49 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java @@ -21,8 +21,8 @@ // Note: The actual package may vary, adjust if CRC32Transformer is in a different location. package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.CRC32Transformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CRC32Transformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java index 6109cef488d11..ac357616e3648 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java index 1828a89db9328..d4d7d675a26fe 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java index bc513de6101e5..c74f13e89165b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java index 8836c1539d33e..c0e177d774369 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java index 416c81c071fbb..9b65799b908cc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java index d6d25b1e3e5b5..eabf81d1ddba9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java @@ -19,9 +19,9 @@ * under the License. */ -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java index 6ebabefd05808..aa374a9031de0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java @@ -19,9 +19,9 @@ * under the License. */ -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java index 20f73a5b7032f..ab00d0105aa33 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import net.jpountz.xxhash.XXHash64; import net.jpountz.xxhash.XXHashFactory; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java index eea73d53e343b..ac885515ecab5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.string; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hexEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java index 154b75aafb738..b95ffe32b0868 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hexEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.column.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java index f3611505c630d..04a611f07c40c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java @@ -20,19 +20,18 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils; import org.junit.Assert; import org.junit.Test; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitCountCheck; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitwiseAndTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitwiseLeftShiftTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitwiseNotTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitwiseOrTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitwiseRightShiftArithmeticTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitwiseRightShiftTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.dag.util.BitwiseUtils.bitwiseXorTransform; +import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitCountCheck; +import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseAndTransform; +import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseLeftShiftTransform; +import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseNotTransform; +import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseOrTransform; +import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseRightShiftArithmeticTransform; +import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseRightShiftTransform; +import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseXorTransform; public class BitwiseUtilsTest { @Test From 2a9df458e725b780a402a164d9e1cbaff4f5ac17 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Wed, 15 Apr 2026 15:24:20 +0800 Subject: [PATCH 16/45] move SessionInfo --- .../common/SessionInfo.java | 21 ++++--- .../db/node_commons/common/SqlDialect.java | 56 +++++++++++++++++++ .../function/InterpretedFunctionInvoker.java | 2 +- .../planner/node/AggregationNode.java | 2 +- .../legacy/IoTDBLegacyPipeReceiverAgent.java | 2 +- .../legacy/loader/DeletionLoader.java | 2 +- .../protocol/legacy/loader/TsFileLoader.java | 2 +- .../protocol/writeback/WriteBackSink.java | 8 +-- .../dataregion/IoTDBDataRegionSource.java | 4 +- .../schemaregion/IoTDBSchemaRegionSource.java | 4 +- .../client/DataNodeInternalClient.java | 2 +- .../db/protocol/session/IClientSession.java | 41 +------------- .../db/protocol/session/SessionManager.java | 23 +++----- .../thrift/impl/ClientRPCServiceImpl.java | 22 ++++---- .../impl/DataNodeInternalRPCServiceImpl.java | 2 +- .../queryengine/common/MPPQueryContext.java | 1 + .../fragment/FragmentInstanceContext.java | 2 +- .../execution/operator/OperatorContext.java | 2 +- .../operator/source/ShowQueriesOperator.java | 4 +- ...formationSchemaContentSupplierFactory.java | 4 +- .../relational/ColumnTransformerBuilder.java | 2 +- .../execution/schedule/DriverScheduler.java | 2 +- .../execution/schedule/IDriverScheduler.java | 2 +- .../db/queryengine/plan/Coordinator.java | 2 +- .../plan/analyze/load/LoadTsFileAnalyzer.java | 8 +-- .../plan/execution/IQueryExecution.java | 4 +- .../plan/execution/QueryExecution.java | 4 +- .../execution/config/ConfigExecution.java | 4 +- .../executor/ClusterConfigTaskExecutor.java | 5 +- .../config/executor/IConfigTaskExecutor.java | 5 +- .../metadata/relational/DeleteDeviceTask.java | 2 +- .../config/session/SetSqlDialectTask.java | 6 +- .../builtin/helper/CastFunctionHelper.java | 2 +- .../queryengine/plan/parser/ASTVisitor.java | 5 +- .../plan/planner/LocalExecutionPlanner.java | 6 +- .../plan/planner/plan/FragmentInstance.java | 2 +- .../plan/relational/analyzer/Analyzer.java | 2 +- .../analyzer/ExpressionAnalyzer.java | 2 +- .../analyzer/StatementAnalyzer.java | 2 +- .../analyzer/StatementAnalyzerFactory.java | 2 +- .../plan/relational/metadata/Metadata.java | 2 +- .../relational/metadata/MetadataUtil.java | 2 +- .../metadata/TableMetadataImpl.java | 2 +- .../planner/IrExpressionInterpreter.java | 2 +- .../relational/planner/IrTypeAnalyzer.java | 2 +- .../planner/LiteralInterpreter.java | 2 +- .../plan/relational/planner/QueryPlanner.java | 2 +- .../relational/planner/RelationPlanner.java | 2 +- .../relational/planner/SubqueryPlanner.java | 2 +- .../planner/TableLogicalPlanner.java | 2 +- .../plan/relational/planner/ir/IrUtils.java | 2 +- .../planner/iterative/IterativeOptimizer.java | 2 +- .../relational/planner/iterative/Rule.java | 2 +- .../rule/CanonicalizeExpressionRewriter.java | 2 +- .../iterative/rule/InlineProjections.java | 2 +- .../rule/PushDownLimitIntoWindow.java | 2 +- .../iterative/rule/SimplifyExpressions.java | 2 +- .../planner/node/TableScanNode.java | 2 +- .../TableDeviceAttributeUpdateNode.java | 2 +- .../planner/optimizations/PlanOptimizer.java | 2 +- .../PushAggregationIntoTableScan.java | 2 +- .../sql/ast/AbstractTraverseDevice.java | 2 +- .../plan/relational/sql/ast/DeleteDevice.java | 2 +- .../relational/sql/ast/SetSqlDialect.java | 8 +-- .../relational/sql/parser/AstBuilder.java | 4 +- .../relational/sql/rewrite/ShowRewrite.java | 2 +- .../sql/rewrite/StatementRewrite.java | 2 +- .../statement/sys/SetSqlDialectStatement.java | 8 +-- .../impl/SchemaRegionMemoryImpl.java | 2 +- .../metrics/IoTDBInternalLocalReporter.java | 2 +- .../LoadTsFileDataTypeConverter.java | 5 +- .../iotdb/db/utils/DataNodeAuthUtils.java | 2 +- .../SchemaRegionSimpleRecoverTest.java | 2 +- .../operator/MergeTreeSortOperatorTest.java | 6 +- .../queryengine/plan/analyze/AnalyzeTest.java | 2 +- .../optimization/LimitOffsetPushDownTest.java | 2 +- .../planner/FragmentInstanceSerdeTest.java | 2 +- .../DistributionPlannerBasicTest.java | 10 ++-- .../logical/LogicalPlannerTestUtil.java | 2 +- .../relational/analyzer/AnalyzerTest.java | 9 ++- .../plan/relational/analyzer/AuthTest.java | 12 ++-- .../analyzer/LimitOffsetPushDownTest.java | 6 +- .../analyzer/RowPatternRecognitionTest.java | 7 +-- .../relational/analyzer/TSBSMetadata.java | 2 +- .../relational/analyzer/TestMetadata.java | 2 +- .../plan/relational/analyzer/TestUtils.java | 9 ++- .../plan/relational/planner/PlanTester.java | 8 +-- .../planner/PredicateUtilsTest.java | 6 +- .../AggregationDeviceTableScanMatcher.java | 2 +- .../AggregationFunctionMatcher.java | 2 +- .../assertions/AggregationMatcher.java | 2 +- .../assertions/AggregationStepMatcher.java | 2 +- .../planner/assertions/AliasMatcher.java | 2 +- .../planner/assertions/AliasPresent.java | 2 +- .../assertions/AssignUniqueIdMatcher.java | 2 +- .../assertions/BaseStrictSymbolsMatcher.java | 2 +- .../planner/assertions/ColumnReference.java | 2 +- .../planner/assertions/CteScanMatcher.java | 2 +- .../assertions/ExchangeNodeMatcher.java | 2 +- .../planner/assertions/ExpressionMatcher.java | 2 +- .../planner/assertions/FilterMatcher.java | 2 +- .../planner/assertions/GroupMatcher.java | 2 +- .../assertions/IdentityProjectionMatcher.java | 2 +- .../InformationSchemaTableScanMatcher.java | 2 +- .../planner/assertions/JoinMatcher.java | 2 +- .../planner/assertions/LimitMatcher.java | 2 +- .../assertions/MarkDistinctMatcher.java | 2 +- .../planner/assertions/Matcher.java | 2 +- .../assertions/NotPlanNodeMatcher.java | 2 +- .../planner/assertions/OffsetMatcher.java | 2 +- .../planner/assertions/OutputMatcher.java | 2 +- .../planner/assertions/PlanAssert.java | 6 +- .../planner/assertions/PlanMatchPattern.java | 2 +- .../assertions/PlanMatchingVisitor.java | 2 +- .../planner/assertions/PlanNodeMatcher.java | 2 +- .../planner/assertions/PredicateMatcher.java | 2 +- .../planner/assertions/RvalueMatcher.java | 2 +- .../planner/assertions/SemiJoinMatcher.java | 2 +- .../planner/assertions/SortMatcher.java | 2 +- .../StrictAssignedSymbolsMatcher.java | 2 +- .../assertions/StrictSymbolsMatcher.java | 2 +- .../TableFunctionProcessorMatcher.java | 2 +- .../planner/assertions/TableScanMatcher.java | 2 +- .../planner/assertions/TopKMatcher.java | 2 +- .../assertions/WindowFunctionMatcher.java | 2 +- .../plan/statement/InsertStatementTest.java | 2 +- .../builder/EvaluationDAGBuilderTest.java | 4 +- 127 files changed, 267 insertions(+), 260 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/common/SessionInfo.java (90%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/SqlDialect.java diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/SessionInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/SessionInfo.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/SessionInfo.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/SessionInfo.java index a3ea567e38b4c..f0b0863c4ede7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/SessionInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/SessionInfo.java @@ -17,13 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.common; +package org.apache.iotdb.db.node_commons.common; import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.node_commons.plan.relational.security.Identity; -import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -43,7 +42,7 @@ public class SessionInfo { @Nullable private final String databaseName; - private final IClientSession.SqlDialect sqlDialect; + private final SqlDialect sqlDialect; private ClientVersion version = ClientVersion.V_1_0; @@ -52,7 +51,7 @@ public SessionInfo(long sessionId, UserEntity userEntity, ZoneId zoneId) { this.userEntity = userEntity; this.zoneId = zoneId; this.databaseName = null; - this.sqlDialect = IClientSession.SqlDialect.TREE; + this.sqlDialect = SqlDialect.TREE; } public SessionInfo( @@ -60,7 +59,7 @@ public SessionInfo( UserEntity userEntity, ZoneId zoneId, @Nullable String databaseName, - IClientSession.SqlDialect sqlDialect) { + SqlDialect sqlDialect) { this(sessionId, userEntity, zoneId, ClientVersion.V_1_0, databaseName, sqlDialect); } @@ -70,7 +69,7 @@ public SessionInfo( ZoneId zoneId, ClientVersion version, @Nullable String databaseName, - IClientSession.SqlDialect sqlDialect) { + SqlDialect sqlDialect) { this.sessionId = sessionId; this.userEntity = userEntity; this.zoneId = zoneId; @@ -81,7 +80,7 @@ public SessionInfo( @TestOnly public SessionInfo(long sessionId, String username, ZoneId zoneId) { - this(sessionId, new UserEntity(-1, username, ""), zoneId, null, IClientSession.SqlDialect.TREE); + this(sessionId, new UserEntity(-1, username, ""), zoneId, null, SqlDialect.TREE); } @TestOnly @@ -90,7 +89,7 @@ public SessionInfo( String username, ZoneId zoneId, @Nullable String databaseName, - IClientSession.SqlDialect sqlDialect) { + SqlDialect sqlDialect) { this(sessionId, new UserEntity(-1, username, ""), zoneId, databaseName, sqlDialect); } @@ -101,7 +100,7 @@ public SessionInfo( ZoneId zoneId, ClientVersion version, @Nullable String databaseName, - IClientSession.SqlDialect sqlDialect) { + SqlDialect sqlDialect) { this(sessionId, new UserEntity(-1, username, ""), zoneId, version, databaseName, sqlDialect); } @@ -141,7 +140,7 @@ public Optional getDatabaseName() { return Optional.ofNullable(databaseName); } - public IClientSession.SqlDialect getSqlDialect() { + public SqlDialect getSqlDialect() { return sqlDialect; } @@ -156,7 +155,7 @@ public static SessionInfo deserializeFrom(final ByteBuffer buffer) { if (hasDatabaseName) { databaseName = ReadWriteIOUtils.readString(buffer); } - final IClientSession.SqlDialect sqlDialect1 = IClientSession.SqlDialect.deserializeFrom(buffer); + final SqlDialect sqlDialect1 = SqlDialect.deserializeFrom(buffer); return new SessionInfo( sessionId, new UserEntity(userId, userName, cliHostname), diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/SqlDialect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/SqlDialect.java new file mode 100644 index 0000000000000..cbab98514dc60 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/SqlDialect.java @@ -0,0 +1,56 @@ +/* + * 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.node_commons.common; + +import org.apache.tsfile.utils.ReadWriteIOUtils; + +import java.io.DataOutputStream; +import java.io.IOException; +import java.nio.ByteBuffer; + +public enum SqlDialect { + TREE((byte) 0), + TABLE((byte) 1); + + private final byte dialect; + + SqlDialect(byte dialect) { + this.dialect = dialect; + } + + public byte getDialect() { + return dialect; + } + + public void serialize(final DataOutputStream stream) throws IOException { + ReadWriteIOUtils.write(dialect, stream); + } + + public void serialize(final ByteBuffer buffer) { + ReadWriteIOUtils.write(dialect, buffer); + } + + public static SqlDialect deserializeFrom(final ByteBuffer buffer) { + byte b = ReadWriteIOUtils.readByte(buffer); + switch (b) { + case 0: + return TREE; + case 1: + return TABLE; + default: + throw new IllegalArgumentException(String.format("Unknown sql dialect: %s", b)); + } + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/InterpretedFunctionInvoker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/InterpretedFunctionInvoker.java index 6e139182ef5e9..13630ea0d8ccc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/InterpretedFunctionInvoker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/InterpretedFunctionInvoker.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.function; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; -import org.apache.iotdb.db.queryengine.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java index 97b61dddef4c5..05900d8425c5f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.expression.multi.FunctionType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java index ea7baae792775..5a276f29ccd49 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java @@ -28,10 +28,10 @@ import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.pipe.sink.payload.legacy.PipeData; import org.apache.iotdb.db.pipe.sink.payload.legacy.TsFilePipeData; import org.apache.iotdb.db.protocol.session.SessionManager; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/DeletionLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/DeletionLoader.java index 56875a840ed36..7c94878d78f66 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/DeletionLoader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/DeletionLoader.java @@ -24,8 +24,8 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadFileException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.protocol.session.SessionManager; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/TsFileLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/TsFileLoader.java index e4a1c079a2146..6875086aac585 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/TsFileLoader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/TsFileLoader.java @@ -25,8 +25,8 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadFileException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.protocol.session.SessionManager; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; import org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java index b5dccb55c880a..44be8d5a31d2f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java @@ -29,12 +29,12 @@ import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.pipe.event.common.statement.PipeStatementInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletInsertNodeReqV2; import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferTabletRawReqV2; -import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.plan.Coordinator; @@ -206,7 +206,7 @@ public void customize( ZoneId.systemDefault().toString(), SessionManager.CURRENT_RPC_VERSION, IoTDBConstant.ClientVersion.V_1_0, - IClientSession.SqlDialect.TREE, + SqlDialect.TREE, environment.getRegionId() >= 0) .getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) { @@ -391,7 +391,7 @@ public void close() throws Exception { private TSStatus executeStatementForTableModel( Statement statement, String dataBaseName, final String userName) { session.setDatabaseName(dataBaseName); - session.setSqlDialect(IClientSession.SqlDialect.TABLE); + session.setSqlDialect(SqlDialect.TABLE); final String originalUserName = session.getUsername(); if (useEventUserName && userName != null) { session.setUsername(userName); @@ -496,7 +496,7 @@ private void autoCreateDatabaseIfNecessary(final String database) { private TSStatus executeStatementForTreeModel(final Statement statement, final String userName) { session.setDatabaseName(null); - session.setSqlDialect(IClientSession.SqlDialect.TREE); + session.setSqlDialect(SqlDialect.TREE); final String originalUserName = session.getUsername(); if (useEventUserName && userName != null) { session.setUsername(userName); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java index 1b06aab8a0713..7aa311e7604ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java @@ -30,6 +30,7 @@ import org.apache.iotdb.commons.pipe.source.IoTDBSource; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.pipe.metric.overview.PipeTsFileToTabletsMetrics; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionLogSource; import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionSource; import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionTsFileSource; -import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.storageengine.StorageEngine; @@ -569,7 +569,7 @@ protected void login(final @Nonnull String password) { ZoneId.systemDefault().toString(), SessionManager.CURRENT_RPC_VERSION, IoTDBConstant.ClientVersion.V_1_0, - IClientSession.SqlDialect.TREE, + SqlDialect.TREE, regionId >= 0) .getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java index bbcfe44ff42aa..088f0f0467d2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java @@ -36,6 +36,7 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; @@ -46,7 +47,6 @@ import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.pipe.metric.schema.PipeSchemaRegionSourceMetrics; import org.apache.iotdb.db.pipe.receiver.visitor.PipeTreeStatementToBatchVisitor; -import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; @@ -165,7 +165,7 @@ protected void login(final @Nonnull String password) { ZoneId.systemDefault().toString(), SessionManager.CURRENT_RPC_VERSION, IoTDBConstant.ClientVersion.V_1_0, - IClientSession.SqlDialect.TREE, + SqlDialect.TREE, regionId >= 0) .getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/DataNodeInternalClient.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/DataNodeInternalClient.java index 227f8731cae3c..d520e94187599 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/DataNodeInternalClient.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/DataNodeInternalClient.java @@ -25,11 +25,11 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.IntoProcessException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.protocol.thrift.OperationType; -import org.apache.iotdb.db.queryengine.common.SessionInfo; 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.IPartitionFetcher; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java index f874aa16e7c44..4669530dda0a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java @@ -22,16 +22,12 @@ import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.db.node_commons.common.ConnectionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.service.rpc.thrift.TSConnectionInfo; import org.apache.iotdb.service.rpc.thrift.TSConnectionType; -import org.apache.tsfile.utils.ReadWriteIOUtils; - import javax.annotation.Nullable; -import java.io.DataOutputStream; -import java.io.IOException; -import java.nio.ByteBuffer; import java.time.ZoneId; import java.util.Set; import java.util.TimeZone; @@ -230,39 +226,4 @@ public long getLastActiveTime() { public void setLastActiveTime(long lastActiveTime) { this.lastActiveTime = lastActiveTime; } - - public enum SqlDialect { - TREE((byte) 0), - TABLE((byte) 1); - - private final byte dialect; - - SqlDialect(byte dialect) { - this.dialect = dialect; - } - - public byte getDialect() { - return dialect; - } - - public void serialize(final DataOutputStream stream) throws IOException { - ReadWriteIOUtils.write(dialect, stream); - } - - public void serialize(final ByteBuffer buffer) { - ReadWriteIOUtils.write(dialect, buffer); - } - - public static SqlDialect deserializeFrom(final ByteBuffer buffer) { - byte b = ReadWriteIOUtils.readByte(buffer); - switch (b) { - case 0: - return TREE; - case 1: - return TABLE; - default: - throw new IllegalArgumentException(String.format("Unknown sql dialect: %s", b)); - } - } - } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java index 85e0f0fafa4e1..4aa56cf0a74b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java @@ -37,9 +37,10 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.auth.LoginLockManager; import org.apache.iotdb.db.node_commons.common.ConnectionInfo; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.protocol.basic.BasicOpenSessionResp; import org.apache.iotdb.db.protocol.thrift.OperationType; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.execution.config.session.PreparedStatementMemoryManager; import org.apache.iotdb.db.storageengine.dataregion.read.control.QueryResourceManager; import org.apache.iotdb.db.utils.DataNodeAuthUtils; @@ -113,13 +114,7 @@ public BasicOpenSessionResp login( TSProtocolVersion tsProtocolVersion, IoTDBConstant.ClientVersion clientVersion) { return login( - session, - username, - password, - zoneId, - tsProtocolVersion, - clientVersion, - IClientSession.SqlDialect.TREE); + session, username, password, zoneId, tsProtocolVersion, clientVersion, SqlDialect.TREE); } public BasicOpenSessionResp login( @@ -129,7 +124,7 @@ public BasicOpenSessionResp login( String zoneId, TSProtocolVersion tsProtocolVersion, IoTDBConstant.ClientVersion clientVersion, - IClientSession.SqlDialect sqlDialect) { + SqlDialect sqlDialect) { return login( session, username, password, zoneId, tsProtocolVersion, clientVersion, sqlDialect, false); } @@ -142,7 +137,7 @@ public BasicOpenSessionResp login( final String zoneId, final TSProtocolVersion tsProtocolVersion, final IoTDBConstant.ClientVersion clientVersion, - final IClientSession.SqlDialect sqlDialect, + final SqlDialect sqlDialect, final boolean useEncryptedPassword) { final BasicOpenSessionResp openSessionResp = new BasicOpenSessionResp(); @@ -551,7 +546,7 @@ public SessionInfo copySessionInfoForTreeModel(final SessionInfo sessionInfo) { ZoneId.systemDefault(), sessionInfo.getVersion(), sessionInfo.getDatabaseName().orElse(null), - IClientSession.SqlDialect.TREE); + SqlDialect.TREE); } public SessionInfo getSessionInfoOfTreeModel(IClientSession session) { @@ -561,7 +556,7 @@ public SessionInfo getSessionInfoOfTreeModel(IClientSession session) { ZoneId.systemDefault(), session.getClientVersion(), session.getDatabaseName(), - IClientSession.SqlDialect.TREE); + SqlDialect.TREE); } public SessionInfo getSessionInfoOfTableModel(IClientSession session) { @@ -571,7 +566,7 @@ public SessionInfo getSessionInfoOfTableModel(IClientSession session) { ZoneId.systemDefault(), session.getClientVersion(), session.getDatabaseName(), - IClientSession.SqlDialect.TABLE); + SqlDialect.TABLE); } public SessionInfo getSessionInfoOfPipeReceiver(IClientSession session, String databaseName) { @@ -581,7 +576,7 @@ public SessionInfo getSessionInfoOfPipeReceiver(IClientSession session, String d ZoneId.systemDefault(), session.getClientVersion(), databaseName, - IClientSession.SqlDialect.TABLE); + SqlDialect.TABLE); } @Override 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 e1e6bb06390e9..758d4527d6587 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 @@ -47,6 +47,8 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; @@ -65,7 +67,6 @@ import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.protocol.thrift.OperationType; -import org.apache.iotdb.db.queryengine.common.SessionInfo; 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; @@ -343,7 +344,7 @@ private TSExecuteStatementResp executeStatementInternal( try { // create and cache dataset ExecutionResult result; - if (clientSession.getSqlDialect() == IClientSession.SqlDialect.TREE) { + if (clientSession.getSqlDialect() == SqlDialect.TREE) { Statement s = request.getTreeStatement(clientSession.getZoneId()); if (s instanceof SetSqlDialectStatement) { setSqlDialect = true; @@ -507,7 +508,7 @@ private TSExecuteStatementResp executeStatementInternal( if (setSqlDialect) { resp.setTableModel( SESSION_MANAGER.getCurrSessionAndUpdateIdleTime().getSqlDialect() - == IClientSession.SqlDialect.TABLE); + == SqlDialect.TABLE); } } return resp; @@ -1589,7 +1590,7 @@ public TSFetchResultsResp fetchResultsV2(TSFetchResultsReq req) { @Override public TSOpenSessionResp openSession(TSOpenSessionReq req) throws TException { IoTDBConstant.ClientVersion clientVersion = parseClientVersion(req); - IClientSession.SqlDialect sqlDialect; + SqlDialect sqlDialect; try { sqlDialect = parseSqlDialect(req); } catch (IllegalArgumentException e) { @@ -1628,19 +1629,19 @@ private IoTDBConstant.ClientVersion parseClientVersion(TSOpenSessionReq req) { return IoTDBConstant.ClientVersion.V_0_12; } - private IClientSession.SqlDialect parseSqlDialect(TSOpenSessionReq req) { + private SqlDialect parseSqlDialect(TSOpenSessionReq req) { Map configuration = req.configuration; if (configuration != null && configuration.containsKey("sql_dialect")) { String sqlDialect = configuration.get("sql_dialect"); if ("tree".equalsIgnoreCase(sqlDialect)) { - return IClientSession.SqlDialect.TREE; + return SqlDialect.TREE; } else if ("table".equalsIgnoreCase(sqlDialect)) { - return IClientSession.SqlDialect.TABLE; + return SqlDialect.TABLE; } else { throw new IllegalArgumentException("Unknown sql_dialect: " + sqlDialect); } } else { - return IClientSession.SqlDialect.TREE; + return SqlDialect.TREE; } } @@ -2102,7 +2103,7 @@ public TSStatus executeBatchStatement(TSExecuteBatchStatementReq req) { try { long queryId; ExecutionResult result; - if (clientSession.getSqlDialect() == IClientSession.SqlDialect.TREE) { + if (clientSession.getSqlDialect() == SqlDialect.TREE) { Statement s = StatementGenerator.createStatement(statement, clientSession.getZoneId()); if (s == null) { return RpcUtils.getStatus( @@ -3484,8 +3485,7 @@ private TSExecuteStatementResp createResponse(DatasetHeader header, long queryId resp.setColumnIndex2TsBlockColumnIndexList(header.getColumnIndex2TsBlockColumnIndexList()); resp.setQueryId(queryId); resp.setTableModel( - SESSION_MANAGER.getCurrSessionAndUpdateIdleTime().getSqlDialect() - == IClientSession.SqlDialect.TABLE); + SESSION_MANAGER.getCurrSessionAndUpdateIdleTime().getSqlDialect() == SqlDialect.TABLE); return resp; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java index 62f50b06da7b5..299a3b7594e4d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -105,6 +105,7 @@ import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; @@ -123,7 +124,6 @@ import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.protocol.thrift.OperationType; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.executor.RegionExecutionResult; import org.apache.iotdb.db.queryengine.execution.executor.RegionReadExecutor; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java index 973aaa6e95602..3fc29d3ad003b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.audit.IAuditEntity; import org.apache.iotdb.commons.auth.entity.PrivilegeType; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java index df9ac2d2f936f..66f98ff4f6e68 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java @@ -30,10 +30,10 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.metric.DriverSchedulerMetricSet; import org.apache.iotdb.db.queryengine.metric.QueryRelatedResourceMetricSet; import org.apache.iotdb.db.queryengine.metric.QueryResourceMetricSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java index 7e51a434a76f6..aa6201d83433d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java index 8ddbe5de3306c..8ccddf64ccc40 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; @@ -140,7 +140,7 @@ private TsBlock buildTsBlock() { if (allowedUsername != null && !allowedUsername.equals(queryExecution.getUser())) { continue; } - if (queryExecution.getSQLDialect().equals(IClientSession.SqlDialect.TREE)) { + if (queryExecution.getSQLDialect().equals(SqlDialect.TREE)) { timeColumnBuilder.writeLong( TimestampPrecisionUtils.convertToCurrPrecision( queryExecution.getStartExecutionTime(), TimeUnit.MILLISECONDS)); 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 index 58001a893665c..d40b570433ff0 100644 --- 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 @@ -65,6 +65,7 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.ConnectionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; @@ -73,7 +74,6 @@ 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.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.QueryState; @@ -272,7 +272,7 @@ private QueriesSupplier(final List dataTypes, final UserEntity userE protected void constructLine() { final IQueryExecution queryExecution = queryExecutions.get(nextConsumedIndex); - if (queryExecution.getSQLDialect().equals(IClientSession.SqlDialect.TABLE)) { + if (queryExecution.getSQLDialect().equals(SqlDialect.TABLE)) { columnBuilders[0].writeBinary(BytesUtils.valueOf(queryExecution.getQueryId())); columnBuilders[1].writeLong( TimestampPrecisionUtils.convertToCurrPrecision( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java index 47182c0a849ff..d9f773405f03e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.AdditionResolver; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.DivisionResolver; @@ -69,7 +70,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java index 811b2adec163c..e5a93093d5e4d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java @@ -28,9 +28,9 @@ import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.exception.CpuNotEnoughException; import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; import org.apache.iotdb.db.queryengine.execution.driver.DataDriver; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java index 1569870bd493e..7b91ae7f09998 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.schedule; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.exception.CpuNotEnoughException; import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; import org.apache.iotdb.db.queryengine.execution.driver.IDriver; 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 345ce6c491dfc..fb195f08dd97f 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 @@ -37,6 +37,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryTimeoutRuntimeException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; @@ -50,7 +51,6 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.QueryIdGenerator; import org.apache.iotdb.db.queryengine.execution.QueryState; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java index 9d350d97c82e1..d612bbd57941b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java @@ -27,9 +27,9 @@ import org.apache.iotdb.db.exception.load.LoadAnalyzeTypeMismatchException; import org.apache.iotdb.db.exception.load.LoadEmptyFileException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.protocol.session.IClientSession; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; @@ -408,7 +408,7 @@ && handleSingleMiniFile(i)) { sessionInfo.getUserEntity(), sessionInfo.getZoneId(), sessionInfo.getDatabaseName().orElse(null), - IClientSession.SqlDialect.TABLE); + SqlDialect.TABLE); context.setSession(newSessionInfo); doAnalyzeSingleTableFile(tsFile, reader, timeseriesMetadataIterator, tableSchemaMap); } else { @@ -418,7 +418,7 @@ && handleSingleMiniFile(i)) { sessionInfo.getUserEntity(), sessionInfo.getZoneId(), sessionInfo.getDatabaseName().orElse(null), - IClientSession.SqlDialect.TREE); + SqlDialect.TREE); context.setSession(newSessionInfo); doAnalyzeSingleTreeFile(tsFile, reader, timeseriesMetadataIterator); } 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 9b5a183d98a68..362e33a45e90b 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 @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.execution; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.protocol.session.IClientSession; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; @@ -97,7 +97,7 @@ public interface IQueryExecution { String getStatementType(); - IClientSession.SqlDialect getSQLDialect(); + SqlDialect getSQLDialect(); String getUser(); 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 7500fbb9c34db..7efa083a58542 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 @@ -28,7 +28,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.KilledByOthersException; import org.apache.iotdb.db.exception.query.QueryTimeoutRuntimeException; -import org.apache.iotdb.db.protocol.session.IClientSession; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; @@ -729,7 +729,7 @@ public String getStatementType() { } @Override - public IClientSession.SqlDialect getSQLDialect() { + public SqlDialect getSQLDialect() { return context.getSession().getSqlDialect(); } 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 2b70a667be90a..1c7e41ed649cd 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 @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.protocol.session.IClientSession; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.execution.QueryStateMachine; @@ -365,7 +365,7 @@ public String getStatementType() { } @Override - public IClientSession.SqlDialect getSQLDialect() { + public SqlDialect getSQLDialect() { return context.getSession().getSqlDialect(); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java index cf404e8d57b76..b67aff59b9cf2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java @@ -180,6 +180,8 @@ import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.metadata.SchemaQuotaExceededException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.source.dataregion.DataRegionListeningFilter; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; @@ -191,7 +193,6 @@ import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; @@ -1632,7 +1633,7 @@ public SettableFuture showCurrentSqlDialect(final String sqlDi } @Override - public SettableFuture setSqlDialect(IClientSession.SqlDialect sqlDialect) { + public SettableFuture setSqlDialect(SqlDialect sqlDialect) { final SettableFuture future = SettableFuture.create(); try { SessionManager.getInstance().getCurrSession().setSqlDialectAndClean(sqlDialect); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java index 9e02ba6cff7f4..0cb937023154f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java @@ -31,9 +31,10 @@ import org.apache.iotdb.confignode.rpc.thrift.TFetchTableResp; import org.apache.iotdb.confignode.rpc.thrift.TSpaceQuotaResp; import org.apache.iotdb.confignode.rpc.thrift.TThrottleQuotaResp; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult; import org.apache.iotdb.db.queryengine.plan.execution.config.metadata.region.ExtendRegionTask; import org.apache.iotdb.db.queryengine.plan.execution.config.metadata.region.MigrateRegionTask; @@ -445,7 +446,7 @@ SettableFuture createTableView( SettableFuture showCurrentSqlDialect(String sqlDialect); - SettableFuture setSqlDialect(IClientSession.SqlDialect sqlDialect); + SettableFuture setSqlDialect(SqlDialect sqlDialect); SettableFuture showCurrentUser(String currentUser); 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 0ab31dda196a7..41ef30916dc9a 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 @@ -21,7 +21,7 @@ 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.node_commons.common.SessionInfo; 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/session/SetSqlDialectTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/SetSqlDialectTask.java index df4e3d3c641f3..761efe1c5aed0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/SetSqlDialectTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/SetSqlDialectTask.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.session; -import org.apache.iotdb.db.protocol.session.IClientSession; +import org.apache.iotdb.db.node_commons.common.SqlDialect; 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; @@ -27,9 +27,9 @@ import com.google.common.util.concurrent.ListenableFuture; public class SetSqlDialectTask implements IConfigTask { - private final IClientSession.SqlDialect sqlDialect; + private final SqlDialect sqlDialect; - public SetSqlDialectTask(IClientSession.SqlDialect sqlDialect) { + public SetSqlDialectTask(SqlDialect sqlDialect) { this.sqlDialect = sqlDialect; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java index 9a610ba05fc77..e112c4a2e58e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; 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 113209f31af4c..3b020a9463896 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 @@ -41,6 +41,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataTypeParameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; @@ -49,7 +50,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; -import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.ConstantContext; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.CountDatabasesContext; @@ -5064,8 +5064,7 @@ public Statement visitShowCurrentTimestamp(IoTDBSqlParser.ShowCurrentTimestampCo @Override public Statement visitSetSqlDialect(IoTDBSqlParser.SetSqlDialectContext ctx) { - return new SetSqlDialectStatement( - ctx.TABLE() == null ? IClientSession.SqlDialect.TREE : IClientSession.SqlDialect.TABLE); + return new SetSqlDialectStatement(ctx.TABLE() == null ? SqlDialect.TREE : SqlDialect.TABLE); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java index 30cc8970c8c22..89a6da3901d1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java @@ -26,8 +26,8 @@ import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; @@ -54,7 +54,7 @@ import java.util.Map; import java.util.Objects; -import static org.apache.iotdb.db.protocol.session.IClientSession.SqlDialect.TREE; +import static org.apache.iotdb.db.node_commons.common.SqlDialect.TREE; /** * Used to plan a fragment instance. One fragment instance could be split into multiple pipelines so @@ -171,7 +171,7 @@ private Operator generateOperator( // Generate pipelines, return the last pipeline data structure // TODO Replace operator with operatorFactory to build multiple driver for one pipeline Operator root; - IClientSession.SqlDialect sqlDialect = + SqlDialect sqlDialect = instanceContext.getSessionInfo() == null ? TREE : instanceContext.getSessionInfo().getSqlDialect(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/FragmentInstance.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/FragmentInstance.java index d53e29e16924f..0e531ffe641b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/FragmentInstance.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/FragmentInstance.java @@ -28,8 +28,8 @@ import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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 6178a2434a3ee..1c0c796b13c9d 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 @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 004cad134602d..26c1fef2d9372 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; @@ -82,7 +83,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.Range; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index eaf59bd02d32d..312b3888a3445 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -91,7 +92,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.IoTDBWarning; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java index 9e326689c2901..aa73322497351 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -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.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java index 7ca39440de204..873c31b53937b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java @@ -26,12 +26,12 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinWindowFunction; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java index 055f76a2a7a8d..4fb8e4dd964a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; 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 eeb92adf50c7e..4340b78e9716a 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 @@ -32,6 +32,7 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.AdditionResolver; @@ -45,7 +46,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java index 5adec402229f4..72ba654cb7631 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.function.InterpretedFunctionInvoker; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; @@ -47,7 +48,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java index 9e8fa898d278e..97136d60ca0e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -57,7 +58,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java index 78f5d5476f98c..0305bab99cdbe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index 3eace69bb25f6..23fa5c3571ef6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; @@ -57,7 +58,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; 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.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.GroupingSetAnalysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.FieldId; 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 422c4cc96196b..2c09ecedb9fd7 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; @@ -70,7 +71,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; 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.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFileNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedDeleteDataNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java index f29d3d01a6b59..1ef84eab6a31b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; @@ -42,7 +43,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; 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.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Field; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.RelationType; 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 34f1ac281c105..700f2b30932c0 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 @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -40,7 +41,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; 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.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/ir/IrUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java index a69fc60cd2193..583cba2e1cdb7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java index 1dad29f5beedd..86a0c4ebf2d43 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.common.QueryId; -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.execution.querystats.PlanOptimizersStatsCollector; import org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.QueryPlanOptimizerStatistics; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java index 2a9a462f24a90..5f3290cbe91f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.QueryId; -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.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java index a2cca3c07370b..870aa591ed644 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java index 35672ab91b056..d1a18b7093c2c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java index 9bd7f075e0926..ae68b5d630a05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java index fd2409116f241..cb9eb0fd6c1a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.relational.planner.LiteralEncoder; 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 f3a906d962524..11aae81ed3136 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 @@ -21,13 +21,13 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.common.SessionInfo; 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.Metadata; 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 2dd85d153ae81..e53bddb08d866 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 @@ -22,13 +22,13 @@ 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.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java index 49ddb4b81d65f..1415e76b43de2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; 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.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.PlanOptimizersStatsCollector; 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 474557fd0a178..03d02945d682a 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; 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 f33c25900a6c6..3debfdd058c1f 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 @@ -22,6 +22,7 @@ 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.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.SessionInfo; 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/DeleteDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DeleteDevice.java index 0cfe868f90249..185c09255283b 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 @@ -24,13 +24,13 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.SessionInfo; 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/SetSqlDialect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java index b2f0953c60408..49fe127f10172 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.protocol.session.IClientSession; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -37,14 +37,14 @@ public class SetSqlDialect extends Statement { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(SetSqlDialect.class); - private final IClientSession.SqlDialect sqlDialect; + private final SqlDialect sqlDialect; - public SetSqlDialect(IClientSession.SqlDialect sqlDialect, @Nullable NodeLocation location) { + public SetSqlDialect(SqlDialect sqlDialect, @Nullable NodeLocation location) { super(location); this.sqlDialect = sqlDialect; } - public IClientSession.SqlDialect getSqlDialect() { + public SqlDialect getSqlDialect() { return sqlDialect; } 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 dbdb9d3a94e60..a3b4f708deac8 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 @@ -34,6 +34,7 @@ import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllRows; @@ -1652,8 +1653,7 @@ public Node visitShowCurrentSqlDialectStatement( @Override public Node visitSetSqlDialectStatement(RelationalSqlParser.SetSqlDialectStatementContext ctx) { return new SetSqlDialect( - ctx.TABLE() == null ? IClientSession.SqlDialect.TREE : IClientSession.SqlDialect.TABLE, - getLocation(ctx)); + ctx.TABLE() == null ? SqlDialect.TREE : SqlDialect.TABLE, 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 index 614ea7972d150..99dc7ba2e32ea 100644 --- 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -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.StatementAnalyzerFactory; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; 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 index 9a44ec77730aa..6949d04e0c5da 100644 --- 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 @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -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.StatementAnalyzerFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java index 75cbbee32e693..c5c5b1437b096 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.sys; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.protocol.session.IClientSession; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.statement.IConfigStatement; import org.apache.iotdb.db.queryengine.plan.statement.Statement; @@ -31,13 +31,13 @@ import java.util.Objects; public class SetSqlDialectStatement extends Statement implements IConfigStatement { - private final IClientSession.SqlDialect sqlDialect; + private final SqlDialect sqlDialect; - public SetSqlDialectStatement(IClientSession.SqlDialect sqlDialect) { + public SetSqlDialectStatement(SqlDialect sqlDialect) { this.sqlDialect = sqlDialect; } - public IClientSession.SqlDialect getSqlDialect() { + public SqlDialect getSqlDialect() { return sqlDialect; } 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 9401e88a5c925..e69cb524d7f8d 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 @@ -43,11 +43,11 @@ 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.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.common.SessionInfo; 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/service/metrics/IoTDBInternalLocalReporter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java index 2ba061b0ea28a..c6c4d3aa61a9a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java @@ -33,11 +33,11 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; 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.db.protocol.session.SessionManager; -import org.apache.iotdb.db.queryengine.common.SessionInfo; 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.IPartitionFetcher; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTsFileDataTypeConverter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTsFileDataTypeConverter.java index 383ac4a306497..8337e4a937c23 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTsFileDataTypeConverter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTsFileDataTypeConverter.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; @@ -108,7 +109,7 @@ private TSStatus executeForTableModel(final Statement statement, final String da session.setUsername(AuthorityChecker.SUPER_USER); session.setClientVersion(IoTDBConstant.ClientVersion.V_1_0); session.setZoneId(ZoneId.systemDefault()); - session.setSqlDialect(IClientSession.SqlDialect.TABLE); + session.setSqlDialect(SqlDialect.TABLE); SESSION_MANAGER.registerSession(session); } else { @@ -161,7 +162,7 @@ private TSStatus executeForTreeModel(final Statement statement) { session.setUsername(AuthorityChecker.SUPER_USER); session.setClientVersion(IoTDBConstant.ClientVersion.V_1_0); session.setZoneId(ZoneId.systemDefault()); - session.setSqlDialect(IClientSession.SqlDialect.TREE); + session.setSqlDialect(SqlDialect.TREE); SESSION_MANAGER.registerSession(session); } else { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeAuthUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeAuthUtils.java index 6ee378282adb2..17d69fa031261 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeAuthUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeAuthUtils.java @@ -33,8 +33,8 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.protocol.session.SessionManager; -import org.apache.iotdb.db.queryengine.common.SessionInfo; 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/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 8da702dbc0b49..c0308d119e77c 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 @@ -30,10 +30,10 @@ import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; 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 63484090e2fa8..e492ead8be0f0 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,9 +22,9 @@ 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.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -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; @@ -1850,8 +1850,8 @@ public String getStatementType() { } @Override - public IClientSession.SqlDialect getSQLDialect() { - return IClientSession.SqlDialect.TREE; + public SqlDialect getSQLDialect() { + return SqlDialect.TREE; } @Override 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 542a3db907d99..6fba751d66fdd 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 @@ -24,9 +24,9 @@ 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.node_commons.common.SessionInfo; 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.DatasetHeader; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java index 214289d4e7ff9..e242c46ad0c0e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; 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.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.Analyzer; import org.apache.iotdb.db.queryengine.plan.analyze.FakePartitionFetcherImpl; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java index f5e8d6be70f23..1e0bc4565bb6a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java @@ -30,10 +30,10 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java index 5de1894ab280d..14808ea1065ba 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java @@ -24,11 +24,11 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.protocol.session.IClientSession; 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.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; @@ -253,8 +253,7 @@ public void testInsertRowNodeParallelPlan() throws IllegalPathException { new MPPQueryContext( "", queryId, - new SessionInfo( - 0, "test", ZoneId.systemDefault(), "root.sg", IClientSession.SqlDialect.TABLE), + new SessionInfo(0, "test", ZoneId.systemDefault(), "root.sg", SqlDialect.TABLE), new TEndPoint(), new TEndPoint()); context.setQueryType(QueryType.WRITE); @@ -307,8 +306,7 @@ public void testInsertRowsNodeParallelPlan() throws IllegalPathException { new MPPQueryContext( "", queryId, - new SessionInfo( - 0, "test", ZoneId.systemDefault(), "root.sg", IClientSession.SqlDialect.TABLE), + new SessionInfo(0, "test", ZoneId.systemDefault(), "root.sg", SqlDialect.TABLE), new TEndPoint(), new TEndPoint()); context.setQueryType(QueryType.WRITE); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java index 7ecf4ea7a37ce..bc00ff4160202 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.logical; import org.apache.iotdb.db.auth.AuthorityChecker; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; 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.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.Analyzer; import org.apache.iotdb.db.queryengine.plan.analyze.FakePartitionFetcherImpl; 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 46e9cebb515f2..6b22b86cb82f9 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 @@ -32,6 +32,8 @@ import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -45,11 +47,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; 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.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; @@ -135,7 +135,7 @@ public class AnalyzerTest { ZoneId.systemDefault(), IoTDBConstant.ClientVersion.V_1_0, database, - IClientSession.SqlDialect.TABLE); + SqlDialect.TABLE); Metadata metadata = new TestMetadata(); WarningCollector warningCollector = NOOP; String sql; @@ -1372,8 +1372,7 @@ public static Analysis analyzeSQL(String sql, Metadata metadata, final MPPQueryC sqlParser.createStatement( sql, ZoneId.systemDefault(), new InternalClientSession("testClient")); SessionInfo session = - new SessionInfo( - 0, "test", ZoneId.systemDefault(), "testdb", IClientSession.SqlDialect.TABLE); + new SessionInfo(0, "test", ZoneId.systemDefault(), "testdb", SqlDialect.TABLE); return analyzeStatement(statement, metadata, context, sqlParser, session); } 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 9c9f212964845..a028679dec67a 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 @@ -20,11 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.execution.config.TableConfigTaskVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControlImpl; @@ -219,8 +220,7 @@ private void analyzeSQL( Statement statement = sqlParser.createStatement(sql, zoneId, clientSession); SessionInfo session = - new SessionInfo( - 0, userName, zoneId, databaseNameInSessionInfo, IClientSession.SqlDialect.TABLE); + new SessionInfo(0, userName, zoneId, databaseNameInSessionInfo, SqlDialect.TABLE); StatementAnalyzerFactory statementAnalyzerFactory = new StatementAnalyzerFactory( TEST_MATADATA, @@ -245,8 +245,7 @@ private void analyzeConfigTask(String sql, String userName, ITableAuthChecker au Mockito.when(clientSession.getDatabaseName()).thenReturn(null); Statement statement = sqlParser.createStatement(sql, zoneId, clientSession); - SessionInfo session = - new SessionInfo(0, userName, zoneId, null, IClientSession.SqlDialect.TABLE); + SessionInfo session = new SessionInfo(0, userName, zoneId, null, SqlDialect.TABLE); MPPQueryContext context = new MPPQueryContext(sql, QUERY_ID, 0, session, null, null); statement.accept( @@ -261,8 +260,7 @@ private void analyzeConfigTask(String sql, String userName, ITableAuthChecker au private void analyzeConfigTask( String sql, String userName, ITableAuthChecker authChecker, IClientSession clientSession) { Statement statement = sqlParser.createStatement(sql, zoneId, clientSession); - SessionInfo session = - new SessionInfo(0, userName, zoneId, null, IClientSession.SqlDialect.TABLE); + SessionInfo session = new SessionInfo(0, userName, zoneId, null, SqlDialect.TABLE); MPPQueryContext context = new MPPQueryContext(sql, QUERY_ID, 0, session, null, null); statement.accept( 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 2ea001eadc8ed..37beedf87d667 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 @@ -21,15 +21,15 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; @@ -71,7 +71,7 @@ public class LimitOffsetPushDownTest { ZoneId.systemDefault(), IoTDBConstant.ClientVersion.V_1_0, "db", - IClientSession.SqlDialect.TABLE); + SqlDialect.TABLE); Metadata metadata = new TestMetadata(); String sql; Analysis analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java index 3774d51958dc5..59682729487a2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java @@ -14,11 +14,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.security.AllowAllAccessControl; @@ -464,8 +464,7 @@ public static void analyzeSQL(String sql, Metadata metadata, final MPPQueryConte SqlParser sqlParser = new SqlParser(); Statement statement = sqlParser.createStatement(sql, ZoneId.systemDefault(), null); SessionInfo session = - new SessionInfo( - 0, "test", ZoneId.systemDefault(), "testdb", IClientSession.SqlDialect.TABLE); + new SessionInfo(0, "test", ZoneId.systemDefault(), "testdb", SqlDialect.TABLE); analyzeStatement(statement, metadata, context, sqlParser, session); } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java index a86a55ad30542..8d2faf4afc545 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnMetadata; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index c27428f757739..e78ff3bb11c65 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -28,6 +28,7 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver; @@ -40,7 +41,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.function.Exclude; import org.apache.iotdb.db.queryengine.plan.function.Repeat; 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 c59afe2abfacc..b0a7b18c938d4 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 @@ -20,16 +20,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.protocol.session.IClientSession; 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.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; @@ -68,7 +68,7 @@ public class TestUtils { ZoneId.systemDefault(), IoTDBConstant.ClientVersion.V_1_0, "db", - IClientSession.SqlDialect.TABLE); + SqlDialect.TABLE); public static final Metadata TEST_MATADATA = new TestMetadata(); public static final MPPQueryContext QUERY_CONTEXT = new MPPQueryContext("only for test", QUERY_ID, SESSION_INFO, null, null); @@ -178,8 +178,7 @@ public static void assertAnalyzeSemanticException(String sql, String message) { SqlParser sqlParser = new SqlParser(); Statement statement = sqlParser.createStatement(sql, ZoneId.systemDefault(), null); SessionInfo session = - new SessionInfo( - 0, "test", ZoneId.systemDefault(), "testdb", IClientSession.SqlDialect.TABLE); + new SessionInfo(0, "test", ZoneId.systemDefault(), "testdb", SqlDialect.TABLE); analyzeStatementWithException(statement, TEST_MATADATA, QUERY_CONTEXT, sqlParser, session); fail("Expect test sql throws exception: " + sql); } catch (Exception e) { 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 29674d8e36970..09a9446bb080a 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 @@ -22,6 +22,8 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; @@ -29,7 +31,6 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; @@ -69,7 +70,7 @@ public class PlanTester { ZoneId.systemDefault(), IoTDBConstant.ClientVersion.V_1_0, "db", - IClientSession.SqlDialect.TABLE); + SqlDialect.TABLE); private final Metadata metadata; private DistributedQueryPlan distributedQueryPlan; @@ -191,8 +192,7 @@ public static Analysis analyze(String sql, Metadata metadata, MPPQueryContext co Mockito.when(clientSession.getDatabaseName()).thenReturn(databaseName); Statement statement = sqlParser.createStatement(sql, ZoneId.systemDefault(), clientSession); SessionInfo session = - new SessionInfo( - 0, "test", ZoneId.systemDefault(), databaseName, IClientSession.SqlDialect.TABLE); + new SessionInfo(0, "test", ZoneId.systemDefault(), databaseName, SqlDialect.TABLE); return analyzeStatement(statement, metadata, context, sqlParser, session); } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java index 975fd892bbf89..2fe0c7bef61da 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.protocol.session.IClientSession; 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.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; @@ -52,7 +52,7 @@ public void extractGlobalTimePredicateTest() { ZoneId.systemDefault(), IoTDBConstant.ClientVersion.V_1_0, "db", - IClientSession.SqlDialect.TABLE), + SqlDialect.TABLE), null, null); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java index 1ee2f40255dd2..4f0a82ec45449 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java index 222ca4bb51664..c848afcc8f02c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Map; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java index 01fcb1da6e70b..495805040900a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Collection; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java index bc7c7ced044b4..11d5242f12e0e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java index 1a1cfafd2727d..67742f041c73c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java index 0c7d14476565f..786332c415ab6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java index c76a36c1bcfc8..dab164985850f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java index 9c25f2f90bd88..ca63b46468699 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Set; 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 ff96bd39b027d..5309cbc4c8c99 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,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.common.SessionInfo; 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.metadata.TableSchema; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java index 8ba88ce57a1a5..0fd6ee6e360cb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java @@ -21,9 +21,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java index c2d61d2443f21..bb0a60c41119b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java index 3f2c22c27d4e1..5afd944c9bc92 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java index a2a7b580a445b..2799d67b9e688 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java index 413c0d79b894e..df6746f32e658 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java index 169bbce23832b..1dfc6d529fc88 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.Preconditions.checkState; 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 index 990bc1c693199..bd7fe863774c5 100644 --- 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 @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java index c0b94266225dc..b61be9de708aa 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java index 63d2d47ee579c..fd5be67799bdc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java index 11127341b1b74..1307adce00944 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java index 063f5d4f6e3a7..41a8fd31d9803 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; public interface Matcher { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java index 7cc577be679ce..75b6f05c700e6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java index 2ee3fa312c283..b84a6f22f258d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java index caafe915d2335..573c75d2e3d91 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java index 55941e59cdf1a..3ad067dcb2b28 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.db.protocol.session.IClientSession; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata; @@ -58,7 +58,7 @@ public static void assertPlan(PlanNode actual, PlanMatchPattern pattern) { ZoneId.systemDefault(), IoTDBConstant.ClientVersion.V_1_0, "db", - IClientSession.SqlDialect.TABLE), + SqlDialect.TABLE), new TestMetadata(), actual, noLookup(), 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 ba12682d3aa9d..e79a75860bd17 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; @@ -50,7 +51,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java index 691ac8e78d48d..36fe9ac1e00f8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java index 14e19907a66b9..cd77262852ddb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java index 062e7ac262290..b69c998545cb8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.function.Predicate; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java index 9513b296b3e5c..ededbc634be2c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java index dca8501ded490..0c0786ad57192 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java index cc28b475f08de..2113038decbb8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java index efaa1fe2b61a1..2f1a6cd732616 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java index e8e721873a502..a63e8b54901d5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java index e69c5f470db08..7a91253871b3c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; 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 c0fc8a4d49744..c0087c25ac93e 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 @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java index 2f74b73a0052a..cdb3cb9326bbf 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java index 545d435ce7c9a..2504062bc0a38 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java index efaf992b4ebfa..6f204780bb4ff 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java @@ -27,9 +27,9 @@ import org.apache.iotdb.commons.schema.table.column.TagColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.common.SessionInfo; 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.metadata.TableSchema; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java index a095d0eae5f7e..b3b618f03655e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.protocol.session.IClientSession.SqlDialect; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; From 7266836a10b9ac7279b020cf8843446c15b5b75e Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Wed, 15 Apr 2026 15:32:07 +0800 Subject: [PATCH 17/45] fix --- .../main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java | 6 +++--- .../rest/protocol/table/v1/impl/RestApiServiceImpl.java | 5 +++-- .../iotdb/rest/protocol/v2/impl/RestApiServiceImpl.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java b/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java index 395447e9734f4..24a34d391f416 100644 --- a/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java +++ b/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java @@ -25,7 +25,7 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.protocol.session.IClientSession; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.protocol.session.MqttClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.plan.Coordinator; @@ -105,7 +105,7 @@ public void onConnect(InterceptConnectMessage msg) { ZoneId.systemDefault().toString(), TSProtocolVersion.IOTDB_SERVICE_PROTOCOL_V3, ClientVersion.V_1_0, - useTableInsert ? IClientSession.SqlDialect.TABLE : IClientSession.SqlDialect.TREE); + useTableInsert ? SqlDialect.TABLE : SqlDialect.TREE); sessionManager.registerSessionForMqtt(session); clientIdToSessionMap.put(msg.getClientID(), session); } @@ -173,7 +173,7 @@ private void insertTable(TableMessage message, MqttClientSession session) { TimestampPrecisionUtils.checkTimestampPrecision(message.getTimestamp()); InsertTabletStatement insertTabletStatement = constructInsertTabletStatement(message); session.setDatabaseName(message.getDatabase().toLowerCase()); - session.setSqlDialect(IClientSession.SqlDialect.TABLE); + session.setSqlDialect(SqlDialect.TABLE); long queryId = sessionManager.requestQueryId(); SqlParser relationSqlParser = new SqlParser(); Metadata metadata = LocalExecutionPlanner.getInstance().metadata; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java index 215f4d948d31a..87f60bddd7df0 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor; +import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; @@ -156,7 +157,7 @@ public Response insertTablet( StatementConstructionHandler.constructInsertTabletStatement(insertTabletRequest); IClientSession clientSession = SESSION_MANAGER.getCurrSession(); clientSession.setDatabaseName(insertTabletRequest.getDatabase()); - clientSession.setSqlDialect(IClientSession.SqlDialect.TABLE); + clientSession.setSqlDialect(SqlDialect.TABLE); queryId = SESSION_MANAGER.requestQueryId(); Metadata metadata = LocalExecutionPlanner.getInstance().metadata; @@ -286,7 +287,7 @@ private Statement createStatement( clientSession.setDatabaseName(sql.getDatabase()); } - clientSession.setSqlDialect(IClientSession.SqlDialect.TABLE); + clientSession.setSqlDialect(SqlDialect.TABLE); return relationSqlParser.createStatement(sql.getSql(), ZoneId.systemDefault(), clientSession); } diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/impl/RestApiServiceImpl.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/impl/RestApiServiceImpl.java index f6c42533a6231..6a7f08c6d8b80 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/impl/RestApiServiceImpl.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/impl/RestApiServiceImpl.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.protocol.thrift.OperationType; -import org.apache.iotdb.db.queryengine.common.SessionInfo; 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.IPartitionFetcher; From 919761eb9402a7349ba09c79e4ca4e7caf309d4d Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Wed, 15 Apr 2026 16:41:30 +0800 Subject: [PATCH 18/45] move transformation.dag.column --- .../ArithmeticBinaryColumnTransformer.ftl | 18 +- .../ArithmeticColumnTransformerApi.ftl | 16 +- .../ArithmeticUnaryColumnTransformer.ftl | 6 +- .../plan/planner/TableOperatorGenerator.java | 4 +- .../metadata/CommonMetadataUtils.java | 185 ++++++++ ...AbstractCaseWhenThenColumnTransformer.java | 2 +- .../dag/column/ColumnCache.java | 2 +- .../dag/column/ColumnTransformer.java | 6 +- .../column/FailFunctionColumnTransformer.java | 2 +- .../TableCaseWhenThenColumnTransformer.java | 2 +- .../TreeCaseWhenThenColumnTransformer.java | 2 +- .../ArithmeticAdditionColumnTransformer.java | 4 +- .../ArithmeticBinaryColumnTransformer.java | 4 +- .../ArithmeticDivisionColumnTransformer.java | 4 +- .../ArithmeticModuloColumnTransformer.java | 4 +- ...hmeticMultiplicationColumnTransformer.java | 4 +- ...rithmeticSubtractionColumnTransformer.java | 4 +- .../binary/BinaryColumnTransformer.java | 4 +- .../CompareBinaryColumnTransformer.java | 14 +- .../CompareEqualToColumnTransformer.java | 6 +- .../CompareGreaterEqualColumnTransformer.java | 4 +- .../CompareGreaterThanColumnTransformer.java | 4 +- .../CompareLessEqualColumnTransformer.java | 4 +- .../CompareLessThanColumnTransformer.java | 4 +- .../CompareNonEqualColumnTransformer.java | 6 +- .../column/binary/HmacColumnTransformer.java | 8 +- .../column/binary/Like2ColumnTransformer.java | 6 +- .../binary/LogicAndColumnTransformer.java | 4 +- .../binary/LogicBinaryColumnTransformer.java | 4 +- .../binary/LogicOrColumnTransformer.java | 4 +- .../binary/factory/HmacStrategiesFactory.java | 4 +- .../binary/strategies/HmacStrategy.java | 2 +- .../leaf/ConstantColumnTransformer.java | 2 +- .../leaf/IdentityColumnTransformer.java | 2 +- .../column/leaf/LeafColumnTransformer.java | 4 +- .../column/leaf/NullColumnTransformer.java | 2 +- .../column/leaf/TimeColumnTransformer.java | 2 +- ...bstractGreatestLeastColumnTransformer.java | 4 +- .../BinaryGreatestColumnTransformer.java | 4 +- .../multi/BinaryLeastColumnTransformer.java | 4 +- .../BooleanGreatestColumnTransformer.java | 4 +- .../multi/BooleanLeastColumnTransformer.java | 4 +- .../multi/CoalesceColumnTransformer.java | 4 +- .../DoubleGreatestColumnTransformer.java | 4 +- .../multi/DoubleLeastColumnTransformer.java | 4 +- .../multi/FloatGreatestColumnTransformer.java | 4 +- .../multi/FloatLeastColumnTransformer.java | 4 +- .../multi/InBinaryMultiColumnTransformer.java | 4 +- .../InBooleanMultiColumnTransformer.java | 4 +- .../multi/InDoubleMultiColumnTransformer.java | 4 +- .../multi/InFloatMultiColumnTransformer.java | 4 +- .../multi/InInt32MultiColumnTransformer.java | 4 +- .../multi/InInt64MultiColumnTransformer.java | 4 +- .../multi/InMultiColumnTransformer.java | 4 +- .../multi/Int32GreatestColumnTransformer.java | 4 +- .../multi/Int32LeastColumnTransformer.java | 4 +- .../multi/Int64GreatestColumnTransformer.java | 4 +- .../multi/Int64LeastColumnTransformer.java | 4 +- .../LogicalAndMultiColumnTransformer.java | 4 +- .../multi/LogicalMultiColumnTransformer.java | 4 +- .../LogicalOrMultiColumnTransformer.java | 4 +- .../multi/MappableUDFColumnTransformer.java | 4 +- .../column/multi/MultiColumnTransformer.java | 4 +- .../ternary/BetweenColumnTransformer.java | 16 +- .../CompareTernaryColumnTransformer.java | 4 +- .../ternary/Like3ColumnTransformer.java | 8 +- .../column/ternary/LpadColumnTransformer.java | 6 +- .../column/ternary/RpadColumnTransformer.java | 6 +- .../ternary/TernaryColumnTransformer.java | 4 +- .../ternary/utils/BytePaddingUtils.java | 2 +- .../UserDefineScalarFunctionTransformer.java | 6 +- .../ArithmeticNegationColumnTransformer.java | 4 +- .../dag/column/unary/InColumnTransformer.java | 4 +- .../column/unary/IsNullColumnTransformer.java | 4 +- .../column/unary/LikeColumnTransformer.java | 6 +- .../unary/LogicNotColumnTransformer.java | 4 +- .../unary/RegularColumnTransformer.java | 6 +- .../column/unary/UnaryColumnTransformer.java | 4 +- .../unary/scalar/AbsColumnTransformer.java | 6 +- .../AbstractBitwise2ColumnTransformer.java | 6 +- .../AbstractBitwiseColumnTransformer.java | 6 +- ...AbstractCastFunctionColumnTransformer.java | 36 +- .../AbstractLengthColumnTransformer.java | 6 +- .../unary/scalar/AcosColumnTransformer.java | 6 +- .../unary/scalar/AsinColumnTransformer.java | 6 +- .../unary/scalar/AtanColumnTransformer.java | 6 +- .../scalar/BitCount2ColumnTransformer.java | 8 +- .../scalar/BitCountColumnTransformer.java | 8 +- .../scalar/BitwiseAnd2ColumnTransformer.java | 6 +- .../scalar/BitwiseAndColumnTransformer.java | 6 +- .../BitwiseLeftShift2ColumnTransformer.java | 6 +- .../BitwiseLeftShiftColumnTransformer.java | 6 +- .../scalar/BitwiseNotColumnTransformer.java | 8 +- .../scalar/BitwiseOr2ColumnTransformer.java | 6 +- .../scalar/BitwiseOrColumnTransformer.java | 6 +- .../BitwiseRightShift2ColumnTransformer.java | 6 +- ...ightShiftArithmetic2ColumnTransformer.java | 6 +- ...RightShiftArithmeticColumnTransformer.java | 6 +- .../BitwiseRightShiftColumnTransformer.java | 6 +- .../scalar/BitwiseXor2ColumnTransformer.java | 6 +- .../scalar/BitwiseXorColumnTransformer.java | 6 +- .../scalar/BlobLengthColumnTransformer.java | 4 +- .../BytesToDoubleColumnTransformer.java | 10 +- .../scalar/BytesToFloatColumnTransformer.java | 10 +- .../scalar/BytesToIntColumnTransformer.java | 10 +- .../scalar/BytesToLongColumnTransformer.java | 10 +- .../column/unary/scalar/CRC32Transformer.java | 6 +- .../scalar/CastFunctionColumnTransformer.java | 4 +- .../unary/scalar/CeilColumnTransformer.java | 6 +- .../scalar/Concat2ColumnTransformer.java | 8 +- .../unary/scalar/ConcatColumnTransformer.java | 6 +- .../scalar/ConcatMultiColumnTransformer.java | 6 +- .../unary/scalar/CosColumnTransformer.java | 6 +- .../unary/scalar/CoshColumnTransformer.java | 6 +- .../DateBinFunctionColumnTransformer.java | 6 +- .../scalar/DegreesColumnTransformer.java | 6 +- .../unary/scalar/DiffColumnTransformer.java | 6 +- .../scalar/DiffFunctionColumnTransformer.java | 6 +- .../DoubleToBytesColumnTransformer.java | 8 +- .../scalar/EndsWith2ColumnTransformer.java | 8 +- .../scalar/EndsWithColumnTransformer.java | 8 +- .../unary/scalar/ExpColumnTransformer.java | 6 +- .../unary/scalar/ExtractTransformer.java | 6 +- .../scalar/FloatToBytesColumnTransformer.java | 8 +- .../unary/scalar/FloorColumnTransformer.java | 6 +- .../unary/scalar/FormatColumnTransformer.java | 6 +- .../scalar/GenericCodecColumnTransformer.java | 10 +- .../HmacConstantKeyColumnTransformer.java | 8 +- .../scalar/IntToBytesColumnTransformer.java | 8 +- .../unary/scalar/LTrim2ColumnTransformer.java | 8 +- .../unary/scalar/LTrimColumnTransformer.java | 8 +- .../unary/scalar/LengthColumnTransformer.java | 4 +- .../unary/scalar/LnColumnTransformer.java | 6 +- .../unary/scalar/Log10ColumnTransformer.java | 6 +- .../scalar/LongToBytesColumnTransformer.java | 8 +- .../unary/scalar/LowerColumnTransformer.java | 6 +- .../scalar/ObjectLengthColumnTransformer.java | 4 +- .../unary/scalar/RTrim2ColumnTransformer.java | 8 +- .../unary/scalar/RTrimColumnTransformer.java | 8 +- .../scalar/RadiansColumnTransformer.java | 6 +- .../scalar/RegexpLike2ColumnTransformer.java | 6 +- .../scalar/RegexpLikeColumnTransformer.java | 6 +- .../scalar/Replace2ColumnTransformer.java | 6 +- .../scalar/Replace3ColumnTransformer.java | 6 +- .../ReplaceFunctionColumnTransformer.java | 6 +- .../unary/scalar/RoundColumnTransformer.java | 6 +- .../RoundFunctionColumnTransformer.java | 6 +- .../unary/scalar/SignColumnTransformer.java | 6 +- .../unary/scalar/SinColumnTransformer.java | 6 +- .../unary/scalar/SinhColumnTransformer.java | 6 +- .../unary/scalar/SqrtColumnTransformer.java | 6 +- .../scalar/StartsWith2ColumnTransformer.java | 8 +- .../scalar/StartsWithColumnTransformer.java | 6 +- .../scalar/Strcmp2ColumnTransformer.java | 6 +- .../unary/scalar/StrcmpColumnTransformer.java | 6 +- .../scalar/Strpos2ColumnTransformer.java | 6 +- .../unary/scalar/StrposColumnTransformer.java | 6 +- .../scalar/SubString2ColumnTransformer.java | 6 +- .../scalar/SubString3ColumnTransformer.java | 8 +- .../scalar/SubStringColumnTransformer.java | 6 +- .../unary/scalar/TanColumnTransformer.java | 6 +- .../unary/scalar/TanhColumnTransformer.java | 6 +- .../unary/scalar/Trim2ColumnTransformer.java | 8 +- .../unary/scalar/TrimColumnTransformer.java | 6 +- .../TryCastFunctionColumnTransformer.java | 4 +- .../unary/scalar/UpperColumnTransformer.java | 6 +- .../factory/CodecStrategiesFactory.java | 8 +- .../NumericCodecStrategiesFactory.java | 2 +- .../unary/scalar/inteface/CodecStrategy.java | 2 +- .../column/unary/scalar/util/HexUtils.java | 2 +- .../unary/scalar/util/SpookyHashV2Utils.java | 2 +- .../scalar/util/TransformerDebugUtils.java | 6 +- .../transformation/dag/util/BitwiseUtils.java | 2 +- .../dag/util/CastFunctionUtils.java | 349 +++++++++++++++ .../dag/util/CommonTransformUtils.java | 40 ++ .../TableDateBinTimeRangeIterator.java | 2 +- .../process/FilterAndProjectOperator.java | 20 +- .../gapfill/GapFillWGroupWMoOperator.java | 2 +- .../gapfill/GapFillWGroupWoMoOperator.java | 2 +- .../gapfill/GapFillWoGroupWMoOperator.java | 2 +- .../gapfill/GapFillWoGroupWoMoOperator.java | 2 +- .../schema/source/DeviceAttributeUpdater.java | 4 +- .../source/DeviceBlackListConstructor.java | 4 +- .../schema/source/DevicePredicateFilter.java | 4 +- .../schema/source/DevicePredicateHandler.java | 4 +- .../operator/schema/source/DeviceUpdater.java | 4 +- .../relational/ColumnTransformerBuilder.java | 262 +++++------ .../builtin/BuiltInScalarFunctionHelper.java | 2 +- .../builtin/helper/CastFunctionHelper.java | 331 +------------- .../builtin/helper/DiffFunctionHelper.java | 4 +- .../builtin/helper/ReplaceFunctionHelper.java | 4 +- .../builtin/helper/RoundFunctionHelper.java | 4 +- .../helper/SubStringFunctionHelper.java | 2 +- .../plan/expression/unary/LikeExpression.java | 9 - .../visitor/ColumnTransformerVisitor.java | 60 +-- .../queryengine/plan/parser/ASTVisitor.java | 2 +- .../DataNodeTableOperatorGenerator.java | 4 +- .../plan/planner/OperatorTreeGenerator.java | 4 +- .../analyzer/ExpressionAnalyzer.java | 12 +- .../analyzer/StatementAnalyzer.java | 14 +- .../ConvertPredicateToFilterVisitor.java | 2 +- ...ConvertSchemaPredicateToFilterVisitor.java | 2 +- .../metadata/TableMetadataImpl.java | 406 +++++++----------- .../fetcher/TableHeaderSchemaValidator.java | 6 +- .../planner/IrExpressionInterpreter.java | 6 +- .../relational/planner/LiteralEncoder.java | 6 +- .../plan/relational/planner/QueryPlanner.java | 2 +- .../planner/TableLogicalPlanner.java | 4 +- .../GapFillStartAndEndTimeExtractVisitor.java | 2 +- .../TransformCorrelatedScalarSubquery.java | 2 +- .../plan/relational/sql/ast/DeleteDevice.java | 4 +- .../binary/CompareEqualToTransformer.java | 5 +- .../CompareGreaterEqualTransformer.java | 5 +- .../binary/CompareGreaterThanTransformer.java | 5 +- .../binary/CompareLessEqualTransformer.java | 5 +- .../binary/CompareLessThanTransformer.java | 5 +- .../binary/CompareNonEqualTransformer.java | 5 +- .../ternary/BetweenTransformer.java | 6 +- .../unary/scalar/CastFunctionTransformer.java | 20 +- .../SubStringFunctionColumnTransformer.java | 4 +- .../scalar/SubStringFunctionTransformer.java | 2 +- .../dag/util/TransformUtils.java | 8 - .../impl/SchemaRegionMemoryImpl.java | 4 +- .../table/DataNodeTableCache.java | 4 +- .../storageengine/dataregion/DataRegion.java | 6 +- .../operator/OperatorMemoryTest.java | 10 +- .../relational/analyzer/TSBSMetadata.java | 6 +- .../relational/analyzer/TestMetadata.java | 6 +- ...AndCompareBinaryColumnTransformerTest.java | 13 +- .../LogicBinaryColumnTransformerTest.java | 5 +- .../hmac/HmacMd5ColumnTransformerTest.java | 10 +- .../hmac/HmacSha1ColumnTransformerTest.java | 10 +- .../hmac/HmacSha256ColumnTransformerTest.java | 10 +- .../hmac/HmacSha512ColumnTransformerTest.java | 10 +- .../ternary/LpadColumnTransformerTest.java | 3 +- .../ternary/RpadColumnTransformerTest.java | 3 +- .../unary/UnaryColumnTransformerTest.java | 9 +- .../BlobLengthColumnTransformerTest.java | 3 +- .../unary/scalar/DateBinFunctionTest.java | 2 +- .../FromBigEndian32ColumnTransformerTest.java | 6 +- .../FromBigEndian64ColumnTransformerTest.java | 6 +- ...E754_32BigEndianColumnTransformerTest.java | 6 +- ...E754_64BigEndianColumnTransformerTest.java | 6 +- ...omLittleEndian32ColumnTransformerTest.java | 6 +- ...omLittleEndian64ColumnTransformerTest.java | 6 +- .../ToBigEndian32ColumnTransformerTest.java | 6 +- .../ToBigEndian64ColumnTransformerTest.java | 6 +- ...E754_32BigEndianColumnTransformerTest.java | 6 +- ...E754_64BigEndianColumnTransformerTest.java | 6 +- ...ToLittleEndian32ColumnTransformerTest.java | 6 +- ...ToLittleEndian64ColumnTransformerTest.java | 6 +- .../scalar/ReverseColumnTransformerTest.java | 5 +- .../FromBase32ColumnTransformerTest.java | 6 +- .../FromBase64ColumnTransformerTest.java | 6 +- .../FromBase64UrlColumnTransformerTest.java | 6 +- .../ToBase32ColumnTransformerTest.java | 6 +- .../ToBase64ColumnTransformerTest.java | 6 +- .../ToBase64UrlColumnTransformerTest.java | 6 +- .../hashing/Crc32ColumnTransformerTest.java | 4 +- .../hashing/Md5ColumnTransformerTest.java | 6 +- .../hashing/Murmur3ColumnTransformerTest.java | 6 +- .../hashing/Sha1ColumnTransformerTest.java | 6 +- .../hashing/Sha256ColumnTransformerTest.java | 6 +- .../hashing/Sha512ColumnTransformerTest.java | 6 +- .../SpookyHashV2_32ColumnTransformerTest.java | 6 +- .../SpookyHashV2_64ColumnTransformerTest.java | 6 +- .../XxHash64ColumnTransformerTest.java | 6 +- .../FromHexColumnTransformerTest.java | 6 +- .../ToHexColumnTransformerTest.java | 6 +- .../dag/util/BitwiseUtilsTest.java | 17 +- 270 files changed, 1651 insertions(+), 1497 deletions(-) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/CommonMetadataUtils.java rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/ColumnCache.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/ColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/FailFunctionColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/TableCaseWhenThenColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/BinaryColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/CompareBinaryColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/CompareEqualToColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/CompareLessThanColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/HmacColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/Like2ColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/LogicAndColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/LogicBinaryColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/LogicOrColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/factory/HmacStrategiesFactory.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/binary/strategies/HmacStrategy.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/leaf/ConstantColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/leaf/IdentityColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/leaf/LeafColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/leaf/NullColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/leaf/TimeColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/BinaryLeastColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/BooleanLeastColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/CoalesceColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/DoubleLeastColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/FloatGreatestColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/FloatLeastColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/InFloatMultiColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/InInt32MultiColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/InInt64MultiColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/InMultiColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/Int32GreatestColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/Int32LeastColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/Int64GreatestColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/Int64LeastColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/LogicalMultiColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/MappableUDFColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/multi/MultiColumnTransformer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/ternary/BetweenColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/ternary/Like3ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/ternary/LpadColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/ternary/RpadColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/ternary/TernaryColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/ternary/utils/BytePaddingUtils.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/InColumnTransformer.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/IsNullColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/LikeColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/LogicNotColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/RegularColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/UnaryColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/AbsColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/AcosColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/AsinColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/AtanColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/CRC32Transformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/CeilColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/CosColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/CoshColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/DiffColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/ExpColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/ExtractTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/FloorColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/FormatColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/LengthColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/LnColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/LowerColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/RoundColumnTransformer.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/SignColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/SinColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/SinhColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/StrposColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/TanColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/TanhColumnTransformer.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/TrimColumnTransformer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/UpperColumnTransformer.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/util/HexUtils.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/util/BitwiseUtils.java (99%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl index 2e2c3f50f1ceb..23faf1ecaa6ac 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl @@ -25,13 +25,13 @@ <#--Main Part--> <#if (first.instance == "DATE" || first.instance == "TIMESTAMP") && (second.instance == "INT" || second.instance == "LONG")><#if operator.name == "Addition" || operator.name == "Subtraction"> -<@pp.changeOutputFile name="/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/${className}.java" /> +<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/${className}.java" /> <#--Date + int || Date + long || Timestamp + int || Timestamp + long--> <#--Date - int || Date - long || Timestamp - int || Timestamp - long--> -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; @@ -171,11 +171,11 @@ public class ${className} extends BinaryColumnTransformer { <#elseif (second.instance == "DATE" || second.instance =="TIMESTAMP") && (first.instance == "INT" || first.instance == "LONG")> <#if operator.name == "Addition"> <#--int + Date || long + Date || int + Timestamp || long + Timestamp--> -<@pp.changeOutputFile name="/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/${className}.java" /> -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/${className}.java" /> +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; @@ -276,7 +276,7 @@ public class ${className} extends BinaryColumnTransformer { } <#elseif first.instance != "DATE" && first.instance != "TIMESTAMP" && second.instance != "DATE" && second.instance != "TIMESTAMP"> -<@pp.changeOutputFile name="/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/${className}.java" /> +<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/${className}.java" /> <#--int、long、float、double with + - * / %--> <#--assign resultType--> <#if first.dataType == "double" || second.dataType == "double"> @@ -289,11 +289,11 @@ public class ${className} extends BinaryColumnTransformer { <#assign resultType = "int" /> <#--Parting line--> -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl index 038cd0ecd5437..e80aa6e79c9d2 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl @@ -18,8 +18,8 @@ */ <@pp.dropOutputFile /> -<@pp.changeOutputFile name="/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticColumnTransformerApi.java" /> -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticColumnTransformerApi.java" /> +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; import org.apache.tsfile.read.common.type.Type; @@ -28,12 +28,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.Divi import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.ModulusResolver; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.DoubleNegationColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.FloatNegationColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.IntNegationColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LongNegationColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.TimestampNegationColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.DoubleNegationColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.FloatNegationColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.IntNegationColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LongNegationColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.TimestampNegationColumnTransformer; import java.time.ZoneId; import java.util.Arrays; diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl index 0afb3f57085dc..3080829c754a2 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl @@ -22,11 +22,11 @@ <#assign newType = type.type?replace("Type","")> <#assign className = "${newType}NegationColumnTransformer"> <#if newType != "Date"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/${className}.java" /> -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; + <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/${className}.java" /> +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 41ac3da5b9373..ea6eadbf78708 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.calc_commons.plan.planner; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; @@ -164,8 +166,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToStringLiteralVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToTimestampLiteralVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; -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.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/CommonMetadataUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/CommonMetadataUtils.java new file mode 100644 index 0000000000000..ff8d4eeaced97 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/CommonMetadataUtils.java @@ -0,0 +1,185 @@ +/* + * 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.calc_commons.plan.relational.metadata; + +import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.commons.exception.table.TableNotExistsException; +import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.rpc.TSStatusCode; + +import org.apache.tsfile.read.common.type.ObjectType; +import org.apache.tsfile.read.common.type.StringType; +import org.apache.tsfile.read.common.type.Type; + +import java.util.List; + +import static org.apache.tsfile.read.common.type.BinaryType.TEXT; +import static org.apache.tsfile.read.common.type.BlobType.BLOB; +import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; +import static org.apache.tsfile.read.common.type.DateType.DATE; +import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; +import static org.apache.tsfile.read.common.type.FloatType.FLOAT; +import static org.apache.tsfile.read.common.type.IntType.INT32; +import static org.apache.tsfile.read.common.type.LongType.INT64; +import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; +import static org.apache.tsfile.read.common.type.UnknownType.UNKNOWN; + +public class CommonMetadataUtils { + public static boolean isTwoNumericType(List argumentTypes) { + return argumentTypes.size() == 2 + && isNumericType(argumentTypes.get(0)) + && isNumericType(argumentTypes.get(1)); + } + + public static boolean isOneNumericType(List argumentTypes) { + return argumentTypes.size() == 1 && isNumericType(argumentTypes.get(0)); + } + + public static boolean isTwoSupportedMathNumericType(List argumentTypes) { + return argumentTypes.size() == 2 + && isSupportedMathNumericType(argumentTypes.get(0)) + && isSupportedMathNumericType(argumentTypes.get(1)); + } + + public static boolean isOneSupportedMathNumericType(List argumentTypes) { + return argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)); + } + + public static boolean isOneBooleanType(List argumentTypes) { + return argumentTypes.size() == 1 && BOOLEAN.equals(argumentTypes.get(0)); + } + + public static boolean isOneCharType(List argumentTypes) { + return argumentTypes.size() == 1 && isCharType(argumentTypes.get(0)); + } + + public static boolean isTwoCharType(List argumentTypes) { + return argumentTypes.size() == 2 + && isCharType(argumentTypes.get(0)) + && isCharType(argumentTypes.get(1)); + } + + public static boolean isThreeCharType(List argumentTypes) { + return argumentTypes.size() == 3 + && isCharType(argumentTypes.get(0)) + && isCharType(argumentTypes.get(1)) + && isCharType(argumentTypes.get(2)); + } + + public static boolean isCharType(Type type) { + return TEXT.equals(type) || StringType.STRING.equals(type); + } + + public static boolean isObjectType(Type type) { + return ObjectType.OBJECT.equals(type); + } + + public static boolean isBlobType(Type type) { + return BLOB.equals(type); + } + + public static boolean isBool(Type type) { + return BOOLEAN.equals(type); + } + + public static boolean isDecimalType(Type type) { + return DOUBLE.equals(type) || FLOAT.equals(type); + } + + public static boolean isSupportedMathNumericType(Type type) { + return DOUBLE.equals(type) || FLOAT.equals(type) || INT32.equals(type) || INT64.equals(type); + } + + public static boolean isNumericType(Type type) { + return DOUBLE.equals(type) + || FLOAT.equals(type) + || INT32.equals(type) + || INT64.equals(type) + || TIMESTAMP.equals(type); + } + + public static boolean isTimestampType(Type type) { + return TIMESTAMP.equals(type); + } + + public static boolean isUnknownType(Type type) { + return UNKNOWN.equals(type); + } + + public static boolean isIntegerNumber(Type type) { + return INT32.equals(type) || INT64.equals(type); + } + + public static boolean isTwoTypeComparable(List argumentTypes) { + if (argumentTypes.size() != 2) { + return false; + } + Type left = argumentTypes.get(0); + Type right = argumentTypes.get(1); + if (left.equals(right)) { + return true; + } + + // Boolean type and Binary Type can not be compared with other types + return (isNumericType(left) && isNumericType(right)) + || (isCharType(left) && isCharType(right)) + || (isUnknownType(left) && (isNumericType(right) || isCharType(right))) + || ((isNumericType(left) || isCharType(left)) && isUnknownType(right)); + } + + public static boolean areAllTypesSameAndComparable(List argumentTypes) { + if (argumentTypes == null || argumentTypes.isEmpty()) { + return true; + } + Type firstType = argumentTypes.get(0); + if (!firstType.isComparable()) { + return false; + } + return argumentTypes.stream().allMatch(type -> type.equals(firstType)); + } + + public static boolean isArithmeticType(Type type) { + return INT32.equals(type) + || INT64.equals(type) + || FLOAT.equals(type) + || DOUBLE.equals(type) + || DATE.equals(type) + || TIMESTAMP.equals(type); + } + + public static boolean isTwoTypeCalculable(List argumentTypes) { + if (argumentTypes.size() != 2) { + return false; + } + Type left = argumentTypes.get(0); + Type right = argumentTypes.get(1); + if ((isUnknownType(left) && isArithmeticType(right)) + || (isUnknownType(right) && isArithmeticType(left))) { + return true; + } + return isArithmeticType(left) && isArithmeticType(right); + } + + public static void throwTableNotExistsException(final String database, final String tableName) { + throw new SemanticException(new TableNotExistsException(database, tableName)); + } + + public static void throwColumnNotExistsException(final Object columnName) { + throw new SemanticException( + new IoTDBException( + String.format("Column '%s' cannot be resolved.", columnName), + TSStatusCode.COLUMN_NOT_EXISTS.getStatusCode())); + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java index 7ac2f348d27a2..42c0db3a2d67a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column; +package org.apache.iotdb.db.calc_commons.transformation.dag.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ColumnCache.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnCache.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ColumnCache.java index 6adfbe072e1f0..be0eaa390f3c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ColumnCache.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column; +package org.apache.iotdb.db.calc_commons.transformation.dag.column; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ColumnTransformer.java index 50ba07fe49653..06b2fc0d09bae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ColumnTransformer.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column; +package org.apache.iotdb.db.calc_commons.transformation.dag.column; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.NullColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.NullColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isNumericType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; public abstract class ColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/FailFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/FailFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java index 41632d7be1a4a..f8b186321653c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/FailFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column; +package org.apache.iotdb.db.calc_commons.transformation.dag.column; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TableCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TableCaseWhenThenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java index 637c41417465a..6b8500f14874e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TableCaseWhenThenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column; +package org.apache.iotdb.db.calc_commons.transformation.dag.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java index c3704ced734e3..ebe1084c5bfff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column; +package org.apache.iotdb.db.calc_commons.transformation.dag.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java index f8036106e5cf3..f0db702692696 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java index 08e2171147380..da9f0d75a9e98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java index c4f92be150a4a..c00c45bd03bc5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java index 854379cd87661..f425e137d695e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java index f223350930230..f7449ea66a645 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java index 18f935ca0fdcd..4dfbfef222538 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/BinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/BinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java index 75dcb6dc17ed8..a26b8564f22a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/BinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareBinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java index fb09941245b3e..054b3c68f01ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareBinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -28,9 +28,9 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBlobType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBool; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBool; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; public abstract class CompareBinaryColumnTransformer extends BinaryColumnTransformer { @@ -88,7 +88,7 @@ private void evaluateAndTransform( if (isCharType(leftTransformer.getType()) || isBlobType(leftTransformer.getType())) { flag = transform( - TransformUtils.compare( + CommonTransformUtils.compare( leftTransformer.getType().getBinary(leftColumn, index), rightTransformer.getType().getBinary(rightColumn, index))); } else if (isBool(leftTransformer.getType())) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareEqualToColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareEqualToColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java index f777180e9f089..37d8e9625aac2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareEqualToColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import java.util.Arrays; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isTwoTypeComparable; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; public class CompareEqualToColumnTransformer extends CompareBinaryColumnTransformer { public CompareEqualToColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java index 1aba400614c17..7c5ab298b9d8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java index 4f46f76bf3dce..e228ed7fdca46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java index 0eede197be3ef..23d9e477640a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessThanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessThanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java index 09bd953be181f..b5e72fe451562 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareLessThanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java index 9f0cd152ebe77..8f4d1052daece 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import java.util.Arrays; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isTwoTypeComparable; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; public class CompareNonEqualColumnTransformer extends CompareBinaryColumnTransformer { public CompareNonEqualColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/HmacColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/HmacColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java index a3872608a3260..0ec8cba48a412 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/HmacColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class HmacColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/Like2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/Like2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java index 6f8bd9764db35..24714e5350ff4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/Like2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -29,7 +29,7 @@ import java.util.Optional; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; public class Like2ColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicAndColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicAndColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java index 7a68e5fa030d1..63e9966daeb2e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicAndColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java index 595fa291c32ba..b7d01830b82d6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicOrColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicOrColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java index 064ad6974daba..bf739b16ac4e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicOrColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/factory/HmacStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/factory/HmacStrategiesFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java index 9228c728eb2e1..7f6ec9a162b99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/factory/HmacStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/strategies/HmacStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/strategies/HmacStrategy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java index 01f83cce52b7c..3a2d2d469725e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/strategies/HmacStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies; @FunctionalInterface public interface HmacStrategy { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/ConstantColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/ConstantColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java index 0750e5dc9d1fd..28a5a3d1ada26 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/ConstantColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/IdentityColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/IdentityColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java index f4cc0667777fb..43fe7d94de431 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/IdentityColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/LeafColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/LeafColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java index 4e6d423b4b50f..07f0c6febd89d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/LeafColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/NullColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/NullColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java index d6cc68ab3ca5e..44b14950c44fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/NullColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf; import org.apache.tsfile.read.common.block.column.NullColumn; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/TimeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/TimeColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java index d8fe028bf092f..1a9604a28f129 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/leaf/TimeColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.leaf; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java index f92c5fa2811e2..8c4a3d532c9fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java index e81487bbac3e6..135657223d5fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java index 6cde29f4c8453..9162046644668 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BinaryLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java index 6c283225c7403..fce268a08d465 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java index 1cfbde1575857..58d7efc40c2b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/BooleanLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/CoalesceColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/CoalesceColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java index 82efc732e451c..7980d20047f1d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/CoalesceColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java index e09f0b6df4b21..b29c417f272b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java index 2dc19ec75e7a7..e4aa504521e4c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/DoubleLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatGreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatGreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java index bc5bfc982f8c6..0500aa420f9e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatGreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatLeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatLeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java index 223f63673390d..01911c9e35d73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/FloatLeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java index 9491a201ed1d0..03c78f0f5b353 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java index f99bc791b39e5..2b05bf81f253d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java index 482214498b950..d81ee43ed2b54 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InFloatMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InFloatMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java index 310669c73cf01..b21ee2a30f862 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InFloatMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt32MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt32MultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java index ad291426a1cb7..d756ecf95eb51 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt32MultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt64MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt64MultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java index aa3ec1397fbf4..2a00fa74cbcd4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InInt64MultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java index 319b4225d8502..1b2dd0e1c8805 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/InMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32GreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32GreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java index 551970f470a67..4a094aa568fa5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32GreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32LeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32LeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java index 26b64349fb4f9..d6cb48ba9523d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int32LeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64GreatestColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64GreatestColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java index 7818d217d0aad..c89a3a38aa865 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64GreatestColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64LeastColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64LeastColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java index 0efaccb378690..45e4a358f681c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/Int64LeastColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java index 321f03b186bdb..44e4d99cc545a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java index c90133e7cf523..1ebe5f3485f26 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java index 9164ec578eec2..75ec256edbc4f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MappableUDFColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MappableUDFColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java index 440585eed781b..d4254f6614ed2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MappableUDFColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java index 8045edc4a53bc..8f7ba7c1fdb2f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/multi/MultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.multi; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/BetweenColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/BetweenColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java index c0344b001fafd..fa6fb9f175c14 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/BetweenColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBlobType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBool; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBool; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; public class BetweenColumnTransformer extends CompareTernaryColumnTransformer { private final boolean isNotBetween; @@ -85,11 +85,11 @@ private void transform( if (isCharType(firstColumnTransformer.getType()) || isBlobType(firstColumnTransformer.getType())) { flag = - ((TransformUtils.compare( + ((CommonTransformUtils.compare( firstColumnTransformer.getType().getBinary(firstColumn, i), secondColumnTransformer.getType().getBinary(secondColumn, i)) >= 0) - && (TransformUtils.compare( + && (CommonTransformUtils.compare( firstColumnTransformer.getType().getBinary(firstColumn, i), thirdColumnTransformer.getType().getBinary(thirdColumn, i)) <= 0)) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java index 26dabe9a7c54e..c520ab1fd48c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/Like3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/Like3ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java index 34000e227c66e..1c2c4af184168 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/Like3ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -27,8 +27,8 @@ import org.apache.tsfile.common.regexp.LikePattern; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; public class Like3ColumnTransformer extends TernaryColumnTransformer { public Like3ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java index db4d17d75f196..65dc1979ac90f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.utils.BytePaddingUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.utils.BytePaddingUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java index ea05be1319a60..dd730240c666f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.utils.BytePaddingUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.utils.BytePaddingUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/TernaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/TernaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java index 3a9dccd8e8fda..50e973df29902 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/TernaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/utils/BytePaddingUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/utils/BytePaddingUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java index 1e5f3ed20a87b..855fe7b0de1c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/utils/BytePaddingUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.utils; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.utils; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java index 47fd40ed73f92..66d3da3ec5348 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.udf; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.udf; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.RecordIterator; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.iotdb.udf.api.relational.ScalarFunction; import org.apache.iotdb.udf.api.relational.access.Record; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java index 81819dddf8141..8f33f4d599164 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/InColumnTransformer.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/InColumnTransformer.java index 17fc57a1b5277..1677dd0374515 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/InColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/InColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/IsNullColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/IsNullColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java index fa781f270575c..843997083f517 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/IsNullColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LikeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LikeColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java index 5930cc999e972..6b244c82bb66b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LikeColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -27,7 +27,7 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; public class LikeColumnTransformer extends UnaryColumnTransformer { private final LikePattern pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LogicNotColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LogicNotColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java index 8c0f983121169..de4585e8d4f17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/LogicNotColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/RegularColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/RegularColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java index b22c1c64856c8..86cfe7ee6862b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/RegularColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -28,7 +28,7 @@ import java.util.regex.Pattern; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; public class RegularColumnTransformer extends UnaryColumnTransformer { private final Pattern pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java index 7b3294f3c1dae..4bfb12dacdcd5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbsColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbsColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java index 294c02b3d2d96..d4a30665fa937 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbsColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java index dfc7a2333513f..7a5c55383adf8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java index c4d1cd8f3176d..c8bdb95c9eed1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java index 9ed1bb33075da..5b62959072452 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.CastFunctionUtils; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; @@ -38,7 +38,7 @@ import java.time.ZoneId; import java.time.format.DateTimeParseException; -import static org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper.ERROR_MSG; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CastFunctionUtils.ERROR_MSG; import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE; public abstract class AbstractCastFunctionColumnTransformer extends UnaryColumnTransformer { @@ -150,7 +150,7 @@ protected void castTimestamp(ColumnBuilder columnBuilder, long value) { try { switch (returnType.getTypeEnum()) { case INT32: - returnType.writeInt(columnBuilder, (CastFunctionHelper.castLongToInt(value))); + returnType.writeInt(columnBuilder, (CastFunctionUtils.castLongToInt(value))); break; case DATE: returnType.writeInt( @@ -192,7 +192,7 @@ protected void cast(ColumnBuilder columnBuilder, long value) { switch (returnType.getTypeEnum()) { case INT32: case DATE: - returnType.writeInt(columnBuilder, (CastFunctionHelper.castLongToInt(value))); + returnType.writeInt(columnBuilder, (CastFunctionUtils.castLongToInt(value))); break; case INT64: case TIMESTAMP: @@ -223,11 +223,11 @@ protected void cast(ColumnBuilder columnBuilder, float value) { switch (returnType.getTypeEnum()) { case INT32: case DATE: - returnType.writeInt(columnBuilder, CastFunctionHelper.castFloatToInt(value)); + returnType.writeInt(columnBuilder, CastFunctionUtils.castFloatToInt(value)); break; case INT64: case TIMESTAMP: - returnType.writeLong(columnBuilder, CastFunctionHelper.castFloatToLong(value)); + returnType.writeLong(columnBuilder, CastFunctionUtils.castFloatToLong(value)); break; case FLOAT: returnType.writeFloat(columnBuilder, value); @@ -254,14 +254,14 @@ protected void cast(ColumnBuilder columnBuilder, double value) { switch (returnType.getTypeEnum()) { case INT32: case DATE: - returnType.writeInt(columnBuilder, CastFunctionHelper.castDoubleToInt(value)); + returnType.writeInt(columnBuilder, CastFunctionUtils.castDoubleToInt(value)); break; case INT64: case TIMESTAMP: - returnType.writeLong(columnBuilder, CastFunctionHelper.castDoubleToLong(value)); + returnType.writeLong(columnBuilder, CastFunctionUtils.castDoubleToLong(value)); break; case FLOAT: - returnType.writeFloat(columnBuilder, CastFunctionHelper.castDoubleToFloat(value)); + returnType.writeFloat(columnBuilder, CastFunctionUtils.castDoubleToFloat(value)); break; case DOUBLE: returnType.writeDouble(columnBuilder, value); @@ -330,13 +330,13 @@ protected void castString(ColumnBuilder columnBuilder, Binary value) { columnBuilder, DateTimeUtils.convertDatetimeStrToLong(stringValue, zoneId)); break; case FLOAT: - returnType.writeFloat(columnBuilder, CastFunctionHelper.castTextToFloat(stringValue)); + returnType.writeFloat(columnBuilder, CastFunctionUtils.castTextToFloat(stringValue)); break; case DOUBLE: - returnType.writeDouble(columnBuilder, CastFunctionHelper.castTextToDouble(stringValue)); + returnType.writeDouble(columnBuilder, CastFunctionUtils.castTextToDouble(stringValue)); break; case BOOLEAN: - returnType.writeBoolean(columnBuilder, CastFunctionHelper.castTextToBoolean(stringValue)); + returnType.writeBoolean(columnBuilder, CastFunctionUtils.castTextToBoolean(stringValue)); break; case TEXT: case STRING: @@ -372,13 +372,13 @@ protected void castBlob(ColumnBuilder columnBuilder, Binary value) { columnBuilder, DateTimeUtils.convertDatetimeStrToLong(stringValue, zoneId)); break; case FLOAT: - returnType.writeFloat(columnBuilder, CastFunctionHelper.castTextToFloat(stringValue)); + returnType.writeFloat(columnBuilder, CastFunctionUtils.castTextToFloat(stringValue)); break; case DOUBLE: - returnType.writeDouble(columnBuilder, CastFunctionHelper.castTextToDouble(stringValue)); + returnType.writeDouble(columnBuilder, CastFunctionUtils.castTextToDouble(stringValue)); break; case BOOLEAN: - returnType.writeBoolean(columnBuilder, CastFunctionHelper.castTextToBoolean(stringValue)); + returnType.writeBoolean(columnBuilder, CastFunctionUtils.castTextToBoolean(stringValue)); break; case TEXT: case STRING: diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java index 08eb47691668f..2a73aaf1061fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AcosColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AcosColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java index 1808e147fbd1a..e813525a74970 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AcosColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AsinColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AsinColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java index 8a73986f897d5..aa97f3ed1414f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AsinColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AtanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AtanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java index 8f86f838474c1..251a07538590f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/AtanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java index 04ffea29c63c9..df774bee52ab9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java index 87a928ef16b8b..1bd5abaf85567 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java index 3be14f412b3cd..c0b806a490986 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java index 57676824bb976..c7db0f0b6a15d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java index 8c42d788878a1..a84be5643af2c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java index 40651076dfc08..d06272e867836 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java index 8649cdbdb6b49..dfb1e4e8a4b7a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java index d54ff7b1607a0..ce56a1f49ae23 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java index e6be0927f4643..9008d5da18de2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java index 8d717c6c883d5..f24ea131c00c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java index 402d38d40c858..796c9ebd50721 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java index 5042d83d4c0f8..5f9c7e240dd91 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java index 5f77af2e87c89..a78b7d73aff9e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java index 8ab1c754f286b..a2872acf457d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java index 0d648b3e26ee9..8274633fcd16c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java index bce18fb059718..dde6d8676c952 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java index e62fdfcbe2375..873cdacc328a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToDoubleColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java index 15af6deed2dfd..5c52f3578afb8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToFloatColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java index 0e42a3a713afd..9c24539c3b6a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToIntColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java index dcf0e4a086531..d90087c9c18c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; /** A transformer that converts byte array representations to long values */ public class BytesToLongColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CRC32Transformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CRC32Transformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java index d7e9dccb62a92..9b264bd0e5420 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CRC32Transformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java index 624eabadc62d6..d0aef9220440a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CeilColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CeilColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java index 31cb8df744813..d62ad279ea535 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CeilColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java index 18c59344be8a0..f8408d38cd7e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ConcatColumnTransformer.concat; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ConcatColumnTransformer.concat; public class Concat2ColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java index 47dd6866a33b7..36c6e482f3976 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java index ec053fe2ad9e9..81f8a791e0d99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CosColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CosColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java index 4d731965b6846..6dec7b5ae41e8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CosColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CoshColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CoshColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java index 2079f1659c5dd..25d4230a96125 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/CoshColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java index 93ef9dff3a2d4..be6b8f89732e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java index b1921aa1be473..5e19e93c4b993 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java index 0d316a6c40093..8eff8f2daa192 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java index ce6f7ebf8bfdd..c0db3b53b0e55 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java index 7b9c06147a53b..a9e91bf523793 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java index c81d83fbda779..00720ba4ebb20 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class EndsWith2ColumnTransformer extends BinaryColumnTransformer { public EndsWith2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java index afa1e4dff8630..3394bac2b20d4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class EndsWithColumnTransformer extends UnaryColumnTransformer { private final byte[] suffix; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExpColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExpColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java index b804869867afc..f48653cac7052 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExpColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java index 201b4bc099bf0..c43f872cb21e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java index 7d4d4795c721a..dd3118034b54d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloorColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloorColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java index 9912df4dacd99..d2d4d043c3b8b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FloorColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FormatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FormatColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java index b47b46a636d80..c20f32b315254 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/FormatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java index f387b8850e4fe..6d00611411c50 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.inteface.CodecStrategy; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.inteface.CodecStrategy; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; /** * A generic, reusable column converter for handling all codec-based encoding/decoding functions. It diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java index daa5868b938de..a62ae950b0f1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java index 5c25a949c8f62..d72dddb8176e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java index 4643c3a6ec45d..3a92ac4044c2d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LTrimColumnTransformer.ltrim; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LTrimColumnTransformer.ltrim; public class LTrim2ColumnTransformer extends BinaryColumnTransformer { public LTrim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java index aa67b782c0754..ba653ba5fb4c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; public class LTrimColumnTransformer extends UnaryColumnTransformer { private final byte[] character; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java index c94530c83d403..46fa4a8f060d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LnColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LnColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java index 3bccb13eb6a27..8fd17ecd4eda2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LnColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java index fa6c021ea550a..ecac92c65661a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java index 72c3a5b2404ab..4f01fb256e318 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LowerColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LowerColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java index d4c8fbad01117..d9eed5e398391 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/LowerColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java index 5d39c6f6af3ca..1776979a7c285 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.utils.ObjectTypeUtils; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java index 2d04dce84e491..2124828051972 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RTrimColumnTransformer.rtrim; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RTrimColumnTransformer.rtrim; public class RTrim2ColumnTransformer extends BinaryColumnTransformer { public RTrim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java index 18c4311d5246d..27dbbe9cddcc0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; public class RTrimColumnTransformer extends UnaryColumnTransformer { private final byte[] character; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java index b8d7cbab88f3c..36f6f46659213 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java index 67c2c2624c53a..df2574b198061 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java index e85e1b9724254..3a9cfc811cda9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java index 5a44243206de2..1173b0974ac89 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java index c5133c5e39034..a7cb23c779a81 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java index d2efd3483db84..750e12339c8c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java index 4e66aeb7b96aa..7ff7c00b8e8f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java index 7817fcd1c7d22..88e8f85088d67 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SignColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SignColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java index b2796eaad1fc0..cec8dad1afb57 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SignColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java index f1f2a4da27744..b12187e3c36ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinhColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinhColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java index c6faf22c838ea..a5484df4807fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SinhColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java index bcd6b97eb3485..847196f07a79e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java index b181603ca44e9..2272c58b8d093 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class StartsWith2ColumnTransformer extends BinaryColumnTransformer { public StartsWith2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java index cf44d3ec0fc67..3f39a0aeb8985 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java index c432738952d74..382e1d772c0ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java index c9541fe170181..222e8c75fbaae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java index 692f088a59969..c933babd73aaf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrposColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrposColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java index cd4459bd33362..d864ad822736c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/StrposColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java index b085976c2ed53..76ec24f8ba71c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java index 7a1dba3e08aa1..89ee4c235dabf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.TernaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -29,7 +29,7 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.BytesUtils; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; public class SubString3ColumnTransformer extends TernaryColumnTransformer { public SubString3ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java index 59cc8cb43694b..16476fc7513fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java index a4c07da38d3f9..9000cd9b31b6c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanhColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanhColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java index b0d2271698544..4db1709974b5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TanhColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java index c6788c95b632b..c2296c903e542 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer.trim; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer.trim; public class Trim2ColumnTransformer extends BinaryColumnTransformer { public Trim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TrimColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TrimColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java index 8e75c5e700741..6efddf3f647f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TrimColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java index 419d1bbabf3be..bc6d22a889693 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/UpperColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/UpperColumnTransformer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java index dee529093dda2..a803c03af91fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/UpperColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java index 546a8286d0414..ba1a7ab0d052e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.inteface.CodecStrategy; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.HexUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.SpookyHashV2Utils; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.inteface.CodecStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.HexUtils; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util.SpookyHashV2Utils; import com.google.common.hash.Hashing; import com.google.common.io.BaseEncoding; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java index 60d1e77f78b2a..5b9fb4c19f996 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java index 7c2fd4833a139..c59ea014f61a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.inteface; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.inteface; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/HexUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/HexUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java index 15ed2b9d342d8..c8350102a0ec1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/HexUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java index e6ef386827e46..1313a38f4359a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java index 2ad8e6a29a887..aa3e642720b90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.util; +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBlobType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; /** * A utility class for generating user-friendly debug information during the execution of diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/BitwiseUtils.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/BitwiseUtils.java index 97038b20e0e73..75c289c6cd425 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/BitwiseUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.util; +package org.apache.iotdb.db.calc_commons.transformation.dag.util; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java new file mode 100644 index 0000000000000..434ffdade7991 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java @@ -0,0 +1,349 @@ +/* + * 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.calc_commons.transformation.dag.util; + +import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.utils.DateTimeUtils; + +import org.apache.tsfile.common.conf.TSFileConfig; +import org.apache.tsfile.read.common.type.Type; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.BytesUtils; +import org.apache.tsfile.utils.DateUtils; + +import javax.annotation.Nonnull; + +import java.time.ZoneId; +import java.time.format.DateTimeParseException; + +public class CastFunctionUtils { + public static final String ERROR_MSG = "Unsupported target dataType: %s"; + + public static int castLongToInt(long value) { + if (value > Integer.MAX_VALUE || value < Integer.MIN_VALUE) { + throw new SemanticException( + String.format("long value %d is out of range of integer value.", value)); + } + return (int) value; + } + + public static int castFloatToInt(float value) { + if (value > Integer.MAX_VALUE || value < Integer.MIN_VALUE) { + throw new SemanticException( + String.format("Float value %f is out of range of integer value.", value)); + } + return Math.round(value); + } + + public static long castFloatToLong(float value) { + if (value > Long.MAX_VALUE || value < Long.MIN_VALUE) { + throw new SemanticException( + String.format("Float value %f is out of range of long value.", value)); + } + return Math.round((double) value); + } + + public static int castDoubleToInt(double value) { + if (value > Integer.MAX_VALUE || value < Integer.MIN_VALUE) { + throw new SemanticException( + String.format("Double value %f is out of range of integer value.", value)); + } + return Math.round((float) value); + } + + public static long castDoubleToLong(double value) { + if (value > Long.MAX_VALUE || value < Long.MIN_VALUE) { + throw new SemanticException( + String.format("Double value %f is out of range of long value.", value)); + } + return Math.round(value); + } + + public static float castDoubleToFloat(double value) { + if (value > Float.MAX_VALUE || value < -Float.MAX_VALUE) { + throw new SemanticException( + String.format("Double value %f is out of range of float value.", value)); + } + return (float) value; + } + + public static float castTextToFloat(String value) { + float f = Float.parseFloat(value); + if (f == Float.POSITIVE_INFINITY || f == Float.NEGATIVE_INFINITY) { + throw new SemanticException( + String.format("Text value %s is out of range of float value.", value)); + } + return f; + } + + public static double castTextToDouble(String value) { + double d = Double.parseDouble(value); + if (d == Double.POSITIVE_INFINITY || d == Double.NEGATIVE_INFINITY) { + throw new SemanticException( + String.format("Text value %s is out of range of double value.", value)); + } + return d; + } + + public static boolean castTextToBoolean(String value) { + String lowerCase = value.toLowerCase(); + if (lowerCase.equals("true")) { + return true; + } else if (lowerCase.equals("false")) { + return false; + } else { + throw new SemanticException(String.format("Invalid text input for boolean type: %s", value)); + } + } + + // used by IrExpressionInterpreter to do constant folding + public static Object cast( + @Nonnull Object value, Type sourceType, Type targetType, SessionInfo session) { + switch (sourceType.getTypeEnum()) { + case INT32: + int intV = value instanceof Integer ? (int) value : ((Long) value).intValue(); + return castInt(intV, targetType); + case DATE: + int dateV = value instanceof Integer ? (int) value : ((Long) value).intValue(); + return castDate(dateV, targetType, session.getZoneId()); + case INT64: + long longV = (Long) value; + return castLong(longV, targetType); + case TIMESTAMP: + long timestampV = (Long) value; + return castTimestamp(timestampV, targetType, session.getZoneId()); + case FLOAT: + float floatV = value instanceof Float ? (float) value : ((Double) value).floatValue(); + return castFloat(floatV, targetType); + case DOUBLE: + double doubleV = (Double) value; + return castDouble(doubleV, targetType); + case BOOLEAN: + boolean boolV = (Boolean) value; + return castBool(boolV, targetType); + case TEXT: + case STRING: + case BLOB: + Binary binaryV = (Binary) value; + return castBinary(binaryV, targetType, session.getZoneId()); + default: + throw new UnsupportedOperationException( + String.format("Unsupported source dataType: %s", sourceType.getTypeEnum())); + } + } + + private static Object castInt(int value, Type targetType) { + switch (targetType.getTypeEnum()) { + case INT32: + case DATE: + return value; + case INT64: + case TIMESTAMP: + return (long) value; + case FLOAT: + return (float) value; + case DOUBLE: + return (double) value; + case BOOLEAN: + return value != 0; + case TEXT: + case STRING: + return BytesUtils.valueOf(String.valueOf(value)); + case BLOB: + return new Binary(BytesUtils.intToBytes(value)); + default: + throw new UnsupportedOperationException(String.format(ERROR_MSG, targetType.getTypeEnum())); + } + } + + private static Object castDate(int value, Type targetType, ZoneId zoneId) { + switch (targetType.getTypeEnum()) { + case INT32: + case DATE: + return value; + case INT64: + return (long) value; + case TIMESTAMP: + return DateTimeUtils.correctPrecision(DateUtils.parseIntToTimestamp(value, zoneId)); + case FLOAT: + return (float) value; + case DOUBLE: + return (double) value; + case BOOLEAN: + return value != 0; + case TEXT: + case STRING: + return BytesUtils.valueOf(DateUtils.formatDate(value)); + case BLOB: + return new Binary(BytesUtils.intToBytes(value)); + default: + throw new UnsupportedOperationException(String.format(ERROR_MSG, targetType.getTypeEnum())); + } + } + + private static Object castLong(long value, Type targetType) { + switch (targetType.getTypeEnum()) { + case INT32: + case DATE: + return castLongToInt(value); + case INT64: + case TIMESTAMP: + return value; + case FLOAT: + return (float) value; + case DOUBLE: + return (double) value; + case BOOLEAN: + return value != 0L; + case TEXT: + case STRING: + return BytesUtils.valueOf(String.valueOf(value)); + case BLOB: + return new Binary(BytesUtils.longToBytes(value)); + default: + throw new UnsupportedOperationException(String.format(ERROR_MSG, targetType.getTypeEnum())); + } + } + + private static Object castTimestamp(long value, Type targetType, ZoneId zoneId) { + switch (targetType.getTypeEnum()) { + case INT32: + return castLongToInt(value); + case DATE: + return DateUtils.parseDateExpressionToInt(DateTimeUtils.convertToLocalDate(value, zoneId)); + case INT64: + case TIMESTAMP: + return value; + case FLOAT: + return (float) value; + case DOUBLE: + return (double) value; + case BOOLEAN: + return value != 0L; + case TEXT: + case STRING: + return BytesUtils.valueOf(DateTimeUtils.convertLongToDate(value, zoneId)); + case BLOB: + return new Binary(BytesUtils.longToBytes(value)); + default: + throw new UnsupportedOperationException(String.format(ERROR_MSG, targetType.getTypeEnum())); + } + } + + private static Object castFloat(float value, Type targetType) { + switch (targetType.getTypeEnum()) { + case INT32: + case DATE: + return castFloatToInt(value); + case INT64: + case TIMESTAMP: + return castFloatToLong(value); + case FLOAT: + return value; + case DOUBLE: + return (double) value; + case BOOLEAN: + return value != 0.0f; + case TEXT: + case STRING: + return BytesUtils.valueOf(String.valueOf(value)); + case BLOB: + return new Binary(BytesUtils.floatToBytes(value)); + default: + throw new UnsupportedOperationException(String.format(ERROR_MSG, targetType.getTypeEnum())); + } + } + + private static Object castDouble(double value, Type targetType) { + switch (targetType.getTypeEnum()) { + case INT32: + case DATE: + return castDoubleToInt(value); + case INT64: + case TIMESTAMP: + return castDoubleToLong(value); + case FLOAT: + return castDoubleToFloat(value); + case DOUBLE: + return value; + case BOOLEAN: + return value != 0.0d; + case TEXT: + case STRING: + return BytesUtils.valueOf(String.valueOf(value)); + case BLOB: + return new Binary(BytesUtils.doubleToBytes(value)); + default: + throw new UnsupportedOperationException(String.format(ERROR_MSG, targetType.getTypeEnum())); + } + } + + private static Object castBool(boolean value, Type targetType) { + switch (targetType.getTypeEnum()) { + case INT32: + case DATE: + return value ? 1 : 0; + case INT64: + case TIMESTAMP: + return value ? 1L : 0L; + case FLOAT: + return value ? 1.0f : 0.0f; + case DOUBLE: + return value ? 1.0d : 0.0d; + case BOOLEAN: + return value; + case TEXT: + case STRING: + return BytesUtils.valueOf(String.valueOf(value)); + case BLOB: + return new Binary(BytesUtils.boolToBytes(value)); + default: + throw new UnsupportedOperationException(String.format(ERROR_MSG, targetType.getTypeEnum())); + } + } + + private static Object castBinary(Binary value, Type targetType, ZoneId zoneId) { + String stringValue = value.getStringValue(TSFileConfig.STRING_CHARSET); + try { + switch (targetType.getTypeEnum()) { + case INT32: + return Integer.parseInt(stringValue); + case DATE: + return DateUtils.parseDateExpressionToInt(stringValue); + case INT64: + return Long.parseLong(stringValue); + case TIMESTAMP: + return DateTimeUtils.convertDatetimeStrToLong(stringValue, zoneId); + case FLOAT: + return castTextToFloat(stringValue); + case DOUBLE: + return castTextToDouble(stringValue); + case BOOLEAN: + return castTextToBoolean(stringValue); + case TEXT: + case STRING: + case BLOB: + return value; + default: + throw new UnsupportedOperationException( + String.format(ERROR_MSG, targetType.getTypeEnum())); + } + } catch (DateTimeParseException | NumberFormatException e) { + throw new SemanticException( + String.format("Cannot cast %s to %s type", stringValue, targetType.getDisplayName())); + } + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java new file mode 100644 index 0000000000000..07772699854de --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java @@ -0,0 +1,40 @@ +/* + * 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.calc_commons.transformation.dag.util; + +import org.apache.iotdb.db.exception.sql.SemanticException; + +import org.apache.tsfile.utils.Binary; + +import java.util.Objects; +import java.util.Optional; + +public class CommonTransformUtils { + public static int compare(Binary first, Binary second) { + if (Objects.requireNonNull(first) == Objects.requireNonNull(second)) { + return 0; + } + + return first.compareTo(second); + } + + public static Optional getEscapeCharacter(String escape) { + if (escape.length() == 1) { + return Optional.of(escape.charAt(0)); + } else { + throw new SemanticException("Escape string must be a single character"); + } + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java index d79fc2848043c..bdfb4198cd5c5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.tsfile.read.common.TimeRange; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java index 92beafd3ab379..d659addd37214 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.AbstractCaseWhenThenColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MappableUDFColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.transformation.dag.column.AbstractCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MappableUDFColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.TernaryColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java index c3eb335521153..6d36e7e1b50ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; // with month interval public class GapFillWGroupWMoOperator extends AbstractGapFillWGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java index 40cb5fef8cbb4..718540f62f001 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWGroupWoMoOperator extends AbstractGapFillWGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java index 738e35cd5cf52..7c25403297644 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java @@ -27,7 +27,7 @@ import java.time.ZoneId; import java.util.List; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWoGroupWMoOperator extends AbstractGapFillWoGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java index d4f8b86abef5d..19bbd1b6a1f86 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java @@ -26,7 +26,7 @@ import java.util.List; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWoGroupWoMoOperator extends AbstractGapFillWoGroupOperator { 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 cc883bc7ad6f7..dbbd7e5972842 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -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.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo; 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 ef71258c7c9d9..fa0a05c07bf6d 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -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.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.rescon.MemSchemaRegionStatistics; 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/DevicePredicateFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateFilter.java index 42c87b944998d..017752874024c 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 @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -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.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import java.util.Iterator; 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 9cd6102c1be76..7a14018eb2e3c 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.utils.PathUtils; -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.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; 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 06716c91e3624..91d45f4742575 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -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.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.impl.ShowDevicesResult; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java index d9f773405f03e..54b8ca1027d9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java @@ -21,6 +21,129 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.TableCaseWhenThenColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticColumnTransformerApi; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessThanColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.Like2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.NullColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.AbstractGreatestLeastColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.CoalesceColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.InBinaryMultiColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.InBooleanMultiColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.InDoubleMultiColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.InFloatMultiColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.InInt32MultiColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.InInt64MultiColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.InMultiColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.LogicalAndMultiColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.LogicalOrMultiColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.BetweenColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.Like3ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.LpadColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.RpadColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.udf.UserDefineScalarFunctionTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LikeColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.AbsColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.AcosColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.AsinColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.AtanColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitCount2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitCountColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseAnd2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseAndColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseLeftShift2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseLeftShiftColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseNotColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseOr2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseOrColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShift2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmetic2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmeticColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShiftColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseXor2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseXorColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BlobLengthColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CRC32Transformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CeilColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.Concat2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ConcatColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ConcatMultiColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CosColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CoshColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DegreesColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DiffColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.EndsWith2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.EndsWithColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ExpColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ExtractTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.FloorColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.FormatColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LTrim2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LTrimColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LengthColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LnColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.Log10ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LowerColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ObjectLengthColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RTrim2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RTrimColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RadiansColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RegexpLike2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RegexpLikeColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.Replace2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.Replace3ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RoundColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SignColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SinColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SinhColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SqrtColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.StartsWith2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.Strcmp2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.StrcmpColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.Strpos2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.StrposColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SubString2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SubString3ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SubStringColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.TanColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.TanhColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.Trim2ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.TryCastFunctionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.UpperColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; @@ -74,129 +197,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.TableCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticColumnTransformerApi; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessThanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.Like2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.NullColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.TimeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.AbstractGreatestLeastColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.CoalesceColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InBinaryMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InBooleanMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InDoubleMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InFloatMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InInt32MultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InInt64MultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.InMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.LogicalAndMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.LogicalOrMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.BetweenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.Like3ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.LpadColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.RpadColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.udf.UserDefineScalarFunctionTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LikeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AbsColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AcosColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AsinColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.AtanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitCount2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitCountColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseAnd2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseAndColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseLeftShift2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseLeftShiftColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseNotColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseOr2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseOrColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShift2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmetic2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmeticColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseRightShiftColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseXor2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BitwiseXorColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BlobLengthColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CRC32Transformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CeilColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Concat2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ConcatColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ConcatMultiColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CosColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CoshColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DegreesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DiffColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.EndsWith2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.EndsWithColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ExpColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ExtractTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FloorColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FormatColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LTrim2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LTrimColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LengthColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LnColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Log10ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LowerColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ObjectLengthColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RTrim2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RTrimColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RadiansColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RegexpLike2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RegexpLikeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Replace2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Replace3ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RoundColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SignColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SinColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SinhColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SqrtColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWith2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StartsWithColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Strcmp2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StrcmpColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Strpos2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.StrposColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubString2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubString3ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubStringColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TanhColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.Trim2ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TrimColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.TryCastFunctionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.UpperColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.ScalarFunction; @@ -230,17 +230,17 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; -import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoMetadataChecker.isStringLiteral; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBlobType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java index 621b06660a886..d416b1c1e370a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java index e112c4a2e58e7..09d5eb752d235 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java @@ -19,37 +19,25 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.CastFunctionTransformer; -import org.apache.iotdb.db.utils.DateTimeUtils; -import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.enums.TSDataType; -import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeFactory; -import org.apache.tsfile.utils.Binary; -import org.apache.tsfile.utils.BytesUtils; -import org.apache.tsfile.utils.DateUtils; - -import javax.annotation.Nonnull; import java.time.ZoneId; -import java.time.format.DateTimeParseException; import java.util.Map; import static org.apache.iotdb.db.utils.constant.SqlConstant.CAST_TYPE; public class CastFunctionHelper implements BuiltInScalarFunctionHelper { - public static final String ERROR_MSG = "Unsupported target dataType: %s"; - @Override public void checkBuiltInScalarFunctionInputDataType(TSDataType tsDataType) throws SemanticException { @@ -88,319 +76,4 @@ public void appendFunctionAttributes( builder.append(" AS "); builder.append(functionAttributes.entrySet().iterator().next().getValue()); } - - public static int castLongToInt(long value) { - if (value > Integer.MAX_VALUE || value < Integer.MIN_VALUE) { - throw new SemanticException( - String.format("long value %d is out of range of integer value.", value)); - } - return (int) value; - } - - public static int castFloatToInt(float value) { - if (value > Integer.MAX_VALUE || value < Integer.MIN_VALUE) { - throw new SemanticException( - String.format("Float value %f is out of range of integer value.", value)); - } - return Math.round(value); - } - - public static long castFloatToLong(float value) { - if (value > Long.MAX_VALUE || value < Long.MIN_VALUE) { - throw new SemanticException( - String.format("Float value %f is out of range of long value.", value)); - } - return Math.round((double) value); - } - - public static int castDoubleToInt(double value) { - if (value > Integer.MAX_VALUE || value < Integer.MIN_VALUE) { - throw new SemanticException( - String.format("Double value %f is out of range of integer value.", value)); - } - return Math.round((float) value); - } - - public static long castDoubleToLong(double value) { - if (value > Long.MAX_VALUE || value < Long.MIN_VALUE) { - throw new SemanticException( - String.format("Double value %f is out of range of long value.", value)); - } - return Math.round(value); - } - - public static float castDoubleToFloat(double value) { - if (value > Float.MAX_VALUE || value < -Float.MAX_VALUE) { - throw new SemanticException( - String.format("Double value %f is out of range of float value.", value)); - } - return (float) value; - } - - public static float castTextToFloat(String value) { - float f = Float.parseFloat(value); - if (f == Float.POSITIVE_INFINITY || f == Float.NEGATIVE_INFINITY) { - throw new SemanticException( - String.format("Text value %s is out of range of float value.", value)); - } - return f; - } - - public static double castTextToDouble(String value) { - double d = Double.parseDouble(value); - if (d == Double.POSITIVE_INFINITY || d == Double.NEGATIVE_INFINITY) { - throw new SemanticException( - String.format("Text value %s is out of range of double value.", value)); - } - return d; - } - - public static boolean castTextToBoolean(String value) { - String lowerCase = value.toLowerCase(); - if (lowerCase.equals("true")) { - return true; - } else if (lowerCase.equals("false")) { - return false; - } else { - throw new SemanticException(String.format("Invalid text input for boolean type: %s", value)); - } - } - - // used by IrExpressionInterpreter to do constant folding - public static Object cast( - @Nonnull Object value, Type sourceType, Type targetType, SessionInfo session) { - switch (sourceType.getTypeEnum()) { - case INT32: - int intV = value instanceof Integer ? (int) value : ((Long) value).intValue(); - return castInt(intV, targetType); - case DATE: - int dateV = value instanceof Integer ? (int) value : ((Long) value).intValue(); - return castDate(dateV, targetType, session.getZoneId()); - case INT64: - long longV = (Long) value; - return castLong(longV, targetType); - case TIMESTAMP: - long timestampV = (Long) value; - return castTimestamp(timestampV, targetType, session.getZoneId()); - case FLOAT: - float floatV = value instanceof Float ? (float) value : ((Double) value).floatValue(); - return castFloat(floatV, targetType); - case DOUBLE: - double doubleV = (Double) value; - return castDouble(doubleV, targetType); - case BOOLEAN: - boolean boolV = (Boolean) value; - return castBool(boolV, targetType); - case TEXT: - case STRING: - case BLOB: - Binary binaryV = (Binary) value; - return castBinary(binaryV, targetType, session.getZoneId()); - default: - throw new UnsupportedOperationException( - String.format("Unsupported source dataType: %s", sourceType.getTypeEnum())); - } - } - - private static Object castInt(int value, Type targetType) { - switch (targetType.getTypeEnum()) { - case INT32: - case DATE: - return value; - case INT64: - case TIMESTAMP: - return (long) value; - case FLOAT: - return (float) value; - case DOUBLE: - return (double) value; - case BOOLEAN: - return value != 0; - case TEXT: - case STRING: - return BytesUtils.valueOf(String.valueOf(value)); - case BLOB: - return new Binary(BytesUtils.intToBytes(value)); - default: - throw new UnsupportedOperationException(String.format(ERROR_MSG, targetType.getTypeEnum())); - } - } - - private static Object castDate(int value, Type targetType, ZoneId zoneId) { - switch (targetType.getTypeEnum()) { - case INT32: - case DATE: - return value; - case INT64: - return (long) value; - case TIMESTAMP: - return DateTimeUtils.correctPrecision(DateUtils.parseIntToTimestamp(value, zoneId)); - case FLOAT: - return (float) value; - case DOUBLE: - return (double) value; - case BOOLEAN: - return value != 0; - case TEXT: - case STRING: - return BytesUtils.valueOf(DateUtils.formatDate(value)); - case BLOB: - return new Binary(BytesUtils.intToBytes(value)); - default: - throw new UnsupportedOperationException(String.format(ERROR_MSG, targetType.getTypeEnum())); - } - } - - private static Object castLong(long value, Type targetType) { - switch (targetType.getTypeEnum()) { - case INT32: - case DATE: - return CastFunctionHelper.castLongToInt(value); - case INT64: - case TIMESTAMP: - return value; - case FLOAT: - return (float) value; - case DOUBLE: - return (double) value; - case BOOLEAN: - return value != 0L; - case TEXT: - case STRING: - return BytesUtils.valueOf(String.valueOf(value)); - case BLOB: - return new Binary(BytesUtils.longToBytes(value)); - default: - throw new UnsupportedOperationException(String.format(ERROR_MSG, targetType.getTypeEnum())); - } - } - - private static Object castTimestamp(long value, Type targetType, ZoneId zoneId) { - switch (targetType.getTypeEnum()) { - case INT32: - return CastFunctionHelper.castLongToInt(value); - case DATE: - return DateUtils.parseDateExpressionToInt(DateTimeUtils.convertToLocalDate(value, zoneId)); - case INT64: - case TIMESTAMP: - return value; - case FLOAT: - return (float) value; - case DOUBLE: - return (double) value; - case BOOLEAN: - return value != 0L; - case TEXT: - case STRING: - return BytesUtils.valueOf(DateTimeUtils.convertLongToDate(value, zoneId)); - case BLOB: - return new Binary(BytesUtils.longToBytes(value)); - default: - throw new UnsupportedOperationException(String.format(ERROR_MSG, targetType.getTypeEnum())); - } - } - - private static Object castFloat(float value, Type targetType) { - switch (targetType.getTypeEnum()) { - case INT32: - case DATE: - return CastFunctionHelper.castFloatToInt(value); - case INT64: - case TIMESTAMP: - return CastFunctionHelper.castFloatToLong(value); - case FLOAT: - return value; - case DOUBLE: - return (double) value; - case BOOLEAN: - return value != 0.0f; - case TEXT: - case STRING: - return BytesUtils.valueOf(String.valueOf(value)); - case BLOB: - return new Binary(BytesUtils.floatToBytes(value)); - default: - throw new UnsupportedOperationException(String.format(ERROR_MSG, targetType.getTypeEnum())); - } - } - - private static Object castDouble(double value, Type targetType) { - switch (targetType.getTypeEnum()) { - case INT32: - case DATE: - return CastFunctionHelper.castDoubleToInt(value); - case INT64: - case TIMESTAMP: - return CastFunctionHelper.castDoubleToLong(value); - case FLOAT: - return CastFunctionHelper.castDoubleToFloat(value); - case DOUBLE: - return value; - case BOOLEAN: - return value != 0.0d; - case TEXT: - case STRING: - return BytesUtils.valueOf(String.valueOf(value)); - case BLOB: - return new Binary(BytesUtils.doubleToBytes(value)); - default: - throw new UnsupportedOperationException(String.format(ERROR_MSG, targetType.getTypeEnum())); - } - } - - private static Object castBool(boolean value, Type targetType) { - switch (targetType.getTypeEnum()) { - case INT32: - case DATE: - return value ? 1 : 0; - case INT64: - case TIMESTAMP: - return value ? 1L : 0L; - case FLOAT: - return value ? 1.0f : 0.0f; - case DOUBLE: - return value ? 1.0d : 0.0d; - case BOOLEAN: - return value; - case TEXT: - case STRING: - return BytesUtils.valueOf(String.valueOf(value)); - case BLOB: - return new Binary(BytesUtils.boolToBytes(value)); - default: - throw new UnsupportedOperationException(String.format(ERROR_MSG, targetType.getTypeEnum())); - } - } - - private static Object castBinary(Binary value, Type targetType, ZoneId zoneId) { - String stringValue = value.getStringValue(TSFileConfig.STRING_CHARSET); - try { - switch (targetType.getTypeEnum()) { - case INT32: - return Integer.parseInt(stringValue); - case DATE: - return DateUtils.parseDateExpressionToInt(stringValue); - case INT64: - return Long.parseLong(stringValue); - case TIMESTAMP: - return DateTimeUtils.convertDatetimeStrToLong(stringValue, zoneId); - case FLOAT: - return CastFunctionHelper.castTextToFloat(stringValue); - case DOUBLE: - return CastFunctionHelper.castTextToDouble(stringValue); - case BOOLEAN: - return CastFunctionHelper.castTextToBoolean(stringValue); - case TEXT: - case STRING: - case BLOB: - return value; - default: - throw new UnsupportedOperationException( - String.format(ERROR_MSG, targetType.getTypeEnum())); - } - } catch (DateTimeParseException | NumberFormatException e) { - throw new SemanticException( - String.format("Cannot cast %s to %s type", stringValue, targetType.getDisplayName())); - } - } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java index 858d21ecad8bb..ab8998f34ab16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.DiffFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java index af28d6cc857f8..16016f285813a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.ReplaceFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java index 0a4a8bf4a738d..fe0d26bb46f84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.RoundFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java index 7d9490ac75983..d811e696aec2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.SubStringFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar.SubStringFunctionTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java index 9a58bfdc46b6c..fcf43f21c1a44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; @@ -149,12 +148,4 @@ public long ramBytesUsed() { + MemoryEstimationHelper.getEstimatedSizeOfAccountableObject(expression) + RamUsageEstimator.sizeOf(pattern); } - - public static Optional getEscapeCharacter(String escape) { - if (escape.length() == 1) { - return Optional.of(escape.charAt(0)); - } else { - throw new SemanticException("Escape string must be a single character"); - } - } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java index 8e7bb0a129e51..02cc6f5882206 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java @@ -19,6 +19,36 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.TreeCaseWhenThenColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticDivisionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticModuloColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessThanColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.LogicAndColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.LogicOrColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.LongDivisionLongColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.LongModulusLongColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.NullColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MappableUDFColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.BetweenColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.ArithmeticNegationColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.InColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LikeColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.RegularColumnTransformer; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; @@ -39,36 +69,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.TreeCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticDivisionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticModuloColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessThanColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LogicAndColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LogicOrColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LongDivisionLongColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.LongModulusLongColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.NullColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.TimeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.multi.MappableUDFColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ternary.BetweenColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.ArithmeticNegationColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.InColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LikeColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.RegularColumnTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; 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 3b020a9463896..9fb77d2298e28 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 @@ -308,7 +308,7 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; -import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.canPushDownLimitOffsetToGroupByTime; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.pushDownLimitOffsetToTimeParameter; import static org.apache.iotdb.db.queryengine.plan.relational.sql.parser.AstBuilder.lowerIdentifier; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 81514efbffd17..82fc54055a5c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -24,6 +24,8 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; @@ -118,8 +120,6 @@ 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.statement.component.Ordering; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index 6407bf676315e..fd5a73de56fa9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -28,6 +28,8 @@ 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.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.node_commons.common.NodeRef; @@ -265,8 +267,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; import org.apache.iotdb.db.queryengine.plan.statement.literal.Literal; -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.queryengine.transformation.dag.udf.UDTFContext; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSourceType; import org.apache.iotdb.db.utils.columngenerator.ColumnGenerator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 26c1fef2d9372..710b550ed2ca0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; @@ -96,7 +97,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; 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.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; @@ -142,6 +142,9 @@ import static java.util.Collections.unmodifiableSet; import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression.isQualifiedAllFieldsReference; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.FOLLOWING; @@ -153,9 +156,6 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.ROWS; import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.ExpressionTreeUtils.extractExpressions; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isNumericType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isTwoTypeComparable; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; @@ -640,7 +640,7 @@ protected Type visitDereferenceExpression( return handleResolvedField(node, resolvedField.get(), context); } if (!scope.isColumnReference(qualifiedName)) { - TableMetadataImpl.throwColumnNotExistsException(qualifiedName); + CommonMetadataUtils.throwColumnNotExistsException(qualifiedName); } } @@ -670,7 +670,7 @@ protected Type visitDereferenceExpression( } if (rowFieldType == null) { - TableMetadataImpl.throwColumnNotExistsException(qualifiedName); + CommonMetadataUtils.throwColumnNotExistsException(qualifiedName); } return setExpressionType(node, rowFieldType); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index 312b3888a3445..0f48aef0a83e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; +import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; @@ -107,7 +108,6 @@ 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.metadata.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware; @@ -272,6 +272,7 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.schema.table.TsTable.TABLE_ALLOWED_PROPERTIES; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTimestampType; import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ForecastTableFunction.TIMECOL_PARAMETER_NAME; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression.getQualifiedName; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.FULL; @@ -288,7 +289,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.ExpressionTreeUtils.extractWindowFunctions; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope.BasisType.TABLE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.MetadataUtil.createQualifiedObjectName; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isTimestampType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.AstUtil.preOrder; @@ -666,7 +666,7 @@ protected Scope visitInsert(Insert insert, Optional scope) { QualifiedObjectName targetTable = createQualifiedObjectName(sessionContext, insert.getTarget()); if (!metadata.tableExists(targetTable)) { - TableMetadataImpl.throwTableNotExistsException( + CommonMetadataUtils.throwTableNotExistsException( targetTable.getDatabaseName(), targetTable.getObjectName()); } // verify access privileges @@ -676,7 +676,7 @@ protected Scope visitInsert(Insert insert, Optional scope) { // verify the insert destination columns match the query Optional tableSchema = metadata.getTableSchema(sessionContext, targetTable); if (!tableSchema.isPresent()) { - TableMetadataImpl.throwTableNotExistsException( + CommonMetadataUtils.throwTableNotExistsException( targetTable.getDatabaseName(), targetTable.getObjectName()); } List columns = @@ -3154,7 +3154,7 @@ protected Scope visitTable(Table table, Optional scope) { // This can only be a table if (!tableSchema.isPresent()) { - TableMetadataImpl.throwTableNotExistsException( + CommonMetadataUtils.throwTableNotExistsException( name.getDatabaseName(), name.getObjectName()); } analysis.addEmptyColumnReferencesForTable(accessControl, sessionContext.getIdentity(), name); @@ -4623,7 +4623,7 @@ private TranslationMap analyzeTraverseDevice( } if (!metadata.tableExists(new QualifiedObjectName(database, tableName))) { - TableMetadataImpl.throwTableNotExistsException(database, tableName); + CommonMetadataUtils.throwTableNotExistsException(database, tableName); } node.setColumnHeaderList(); @@ -4633,7 +4633,7 @@ private TranslationMap analyzeTraverseDevice( final Optional tableSchema = metadata.getTableSchema(sessionContext, name); // This can only be a table if (!tableSchema.isPresent()) { - TableMetadataImpl.throwTableNotExistsException(database, tableName); + CommonMetadataUtils.throwTableNotExistsException(database, tableName); } final TableSchema originalSchema = tableSchema.get(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java index cafb9b92411fd..1eac2aaaf9b0d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java @@ -76,7 +76,7 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.ConvertPredicateToTimeFilterVisitor.getLongValue; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java index f761134be9393..49725a3abaaa3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java @@ -62,7 +62,7 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression.getEscapeCharacter; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference; /** 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 4340b78e9716a..ac8f4d725e55c 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 @@ -19,8 +19,6 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; -import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.commons.exception.table.TableNotExistsException; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.SchemaPartition; @@ -30,6 +28,7 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; +import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; @@ -55,7 +54,6 @@ import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.utils.constant.SqlConstant; -import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.customizer.analysis.AggregateFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; @@ -65,7 +63,6 @@ import org.apache.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.read.common.type.ObjectType; -import org.apache.tsfile.read.common.type.StringType; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeFactory; @@ -77,11 +74,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; -import static org.apache.tsfile.read.common.type.BinaryType.TEXT; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; -import static org.apache.tsfile.read.common.type.DateType.DATE; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; import static org.apache.tsfile.read.common.type.FloatType.FLOAT; import static org.apache.tsfile.read.common.type.IntType.INT32; @@ -139,7 +134,7 @@ public Type getOperatorReturnType(OperatorType operatorType, List arg // builtin scalar function if (TableBuiltinScalarFunction.DIFF.getFunctionName().equalsIgnoreCase(functionName)) { - if (!isOneNumericType(argumentTypes) + if (!CommonMetadataUtils.isOneNumericType(argumentTypes) && !(argumentTypes.size() == 2 - && isNumericType(argumentTypes.get(0)) + && CommonMetadataUtils.isNumericType(argumentTypes.get(0)) && BOOLEAN.equals(argumentTypes.get(1)))) { throw new SemanticException( "Scalar function " @@ -227,8 +223,8 @@ && isNumericType(argumentTypes.get(0)) } return DOUBLE; } else if (TableBuiltinScalarFunction.ROUND.getFunctionName().equalsIgnoreCase(functionName)) { - if (!isOneSupportedMathNumericType(argumentTypes) - && !isTwoSupportedMathNumericType(argumentTypes)) { + if (!CommonMetadataUtils.isOneSupportedMathNumericType(argumentTypes) + && !CommonMetadataUtils.isTwoSupportedMathNumericType(argumentTypes)) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -239,7 +235,8 @@ && isNumericType(argumentTypes.get(0)) .getFunctionName() .equalsIgnoreCase(functionName)) { - if (!isTwoCharType(argumentTypes) && !isThreeCharType(argumentTypes)) { + if (!CommonMetadataUtils.isTwoCharType(argumentTypes) + && !CommonMetadataUtils.isThreeCharType(argumentTypes)) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -250,12 +247,12 @@ && isNumericType(argumentTypes.get(0)) .getFunctionName() .equalsIgnoreCase(functionName)) { if (!(argumentTypes.size() == 2 - && isCharType(argumentTypes.get(0)) - && isIntegerNumber(argumentTypes.get(1))) + && CommonMetadataUtils.isCharType(argumentTypes.get(0)) + && CommonMetadataUtils.isIntegerNumber(argumentTypes.get(1))) && !(argumentTypes.size() == 3 - && isCharType(argumentTypes.get(0)) - && isIntegerNumber(argumentTypes.get(1)) - && isIntegerNumber(argumentTypes.get(2)))) { + && CommonMetadataUtils.isCharType(argumentTypes.get(0)) + && CommonMetadataUtils.isIntegerNumber(argumentTypes.get(1)) + && CommonMetadataUtils.isIntegerNumber(argumentTypes.get(2)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -264,9 +261,9 @@ && isIntegerNumber(argumentTypes.get(2)))) { return STRING; } else if (TableBuiltinScalarFunction.LENGTH.getFunctionName().equalsIgnoreCase(functionName)) { if (!(argumentTypes.size() == 1 - && (isCharType(argumentTypes.get(0)) - || isBlobType(argumentTypes.get(0)) - || isObjectType(argumentTypes.get(0))))) { + && (CommonMetadataUtils.isCharType(argumentTypes.get(0)) + || CommonMetadataUtils.isBlobType(argumentTypes.get(0)) + || CommonMetadataUtils.isObjectType(argumentTypes.get(0))))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -274,7 +271,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return INT64; } else if (TableBuiltinScalarFunction.UPPER.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isCharType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 && CommonMetadataUtils.isCharType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -282,7 +279,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return STRING; } else if (TableBuiltinScalarFunction.LOWER.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isCharType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 && CommonMetadataUtils.isCharType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -290,8 +287,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return STRING; } else if (TableBuiltinScalarFunction.TRIM.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isCharType(argumentTypes.get(0))) - && !(argumentTypes.size() == 2 && isTwoCharType(argumentTypes))) { + if (!(argumentTypes.size() == 1 && CommonMetadataUtils.isCharType(argumentTypes.get(0))) + && !(argumentTypes.size() == 2 && CommonMetadataUtils.isTwoCharType(argumentTypes))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -299,8 +296,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return STRING; } else if (TableBuiltinScalarFunction.LTRIM.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isCharType(argumentTypes.get(0))) - && !(argumentTypes.size() == 2 && isTwoCharType(argumentTypes))) { + if (!(argumentTypes.size() == 1 && CommonMetadataUtils.isCharType(argumentTypes.get(0))) + && !(argumentTypes.size() == 2 && CommonMetadataUtils.isTwoCharType(argumentTypes))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -308,8 +305,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return STRING; } else if (TableBuiltinScalarFunction.RTRIM.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isCharType(argumentTypes.get(0))) - && !(argumentTypes.size() == 2 && isTwoCharType(argumentTypes))) { + if (!(argumentTypes.size() == 1 && CommonMetadataUtils.isCharType(argumentTypes.get(0))) + && !(argumentTypes.size() == 2 && CommonMetadataUtils.isTwoCharType(argumentTypes))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -319,7 +316,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.REGEXP_LIKE .getFunctionName() .equalsIgnoreCase(functionName)) { - if (!isTwoCharType(argumentTypes)) { + if (!CommonMetadataUtils.isTwoCharType(argumentTypes)) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -327,7 +324,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return BOOLEAN; } else if (TableBuiltinScalarFunction.STRPOS.getFunctionName().equalsIgnoreCase(functionName)) { - if (!isTwoCharType(argumentTypes)) { + if (!CommonMetadataUtils.isTwoCharType(argumentTypes)) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -337,7 +334,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.STARTS_WITH .getFunctionName() .equalsIgnoreCase(functionName)) { - if (!isTwoCharType(argumentTypes)) { + if (!CommonMetadataUtils.isTwoCharType(argumentTypes)) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -347,7 +344,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.ENDS_WITH .getFunctionName() .equalsIgnoreCase(functionName)) { - if (!isTwoCharType(argumentTypes)) { + if (!CommonMetadataUtils.isTwoCharType(argumentTypes)) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -356,7 +353,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { return BOOLEAN; } else if (TableBuiltinScalarFunction.CONCAT.getFunctionName().equalsIgnoreCase(functionName)) { if (!(argumentTypes.size() >= 2 - && argumentTypes.stream().allMatch(TableMetadataImpl::isCharType))) { + && argumentTypes.stream().allMatch(CommonMetadataUtils::isCharType))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -364,7 +361,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return STRING; } else if (TableBuiltinScalarFunction.STRCMP.getFunctionName().equalsIgnoreCase(functionName)) { - if (!isTwoCharType(argumentTypes)) { + if (!CommonMetadataUtils.isTwoCharType(argumentTypes)) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -372,7 +369,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return INT32; } else if (TableBuiltinScalarFunction.SIN.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -380,7 +378,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return DOUBLE; } else if (TableBuiltinScalarFunction.COS.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -388,7 +387,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return DOUBLE; } else if (TableBuiltinScalarFunction.TAN.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -396,7 +396,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return DOUBLE; } else if (TableBuiltinScalarFunction.ASIN.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -404,7 +405,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return DOUBLE; } else if (TableBuiltinScalarFunction.ACOS.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -412,7 +414,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return DOUBLE; } else if (TableBuiltinScalarFunction.ATAN.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -420,7 +423,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return DOUBLE; } else if (TableBuiltinScalarFunction.SINH.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -428,7 +432,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return DOUBLE; } else if (TableBuiltinScalarFunction.COSH.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -436,7 +441,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return DOUBLE; } else if (TableBuiltinScalarFunction.TANH.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -446,7 +452,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.DEGREES .getFunctionName() .equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -456,7 +463,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.RADIANS .getFunctionName() .equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -464,7 +472,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return DOUBLE; } else if (TableBuiltinScalarFunction.ABS.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -472,7 +481,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return argumentTypes.get(0); } else if (TableBuiltinScalarFunction.SIGN.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -480,7 +490,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return argumentTypes.get(0); } else if (TableBuiltinScalarFunction.CEIL.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -488,7 +499,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return DOUBLE; } else if (TableBuiltinScalarFunction.FLOOR.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -496,7 +508,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return DOUBLE; } else if (TableBuiltinScalarFunction.EXP.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -504,7 +517,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return DOUBLE; } else if (TableBuiltinScalarFunction.LN.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -512,7 +526,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return DOUBLE; } else if (TableBuiltinScalarFunction.LOG10.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -520,7 +535,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return DOUBLE; } else if (TableBuiltinScalarFunction.SQRT.getFunctionName().equalsIgnoreCase(functionName)) { - if (!(argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)))) { + if (!(argumentTypes.size() == 1 + && CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0)))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -546,7 +562,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.DATE_BIN .getFunctionName() .equalsIgnoreCase(functionName)) { - if (!isTimestampType(argumentTypes.get(2))) { + if (!CommonMetadataUtils.isTimestampType(argumentTypes.get(2))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -554,7 +570,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } return TIMESTAMP; } else if (TableBuiltinScalarFunction.FORMAT.getFunctionName().equalsIgnoreCase(functionName)) { - if (argumentTypes.size() < 2 || !isCharType(argumentTypes.get(0))) { + if (argumentTypes.size() < 2 || !CommonMetadataUtils.isCharType(argumentTypes.get(0))) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -565,7 +581,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { return UNKNOWN; } else if (TableBuiltinScalarFunction.GREATEST.getFunctionName().equalsIgnoreCase(functionName) || TableBuiltinScalarFunction.LEAST.getFunctionName().equalsIgnoreCase(functionName)) { - if (argumentTypes.size() < 2 || !areAllTypesSameAndComparable(argumentTypes)) { + if (argumentTypes.size() < 2 + || !CommonMetadataUtils.areAllTypesSameAndComparable(argumentTypes)) { throw new SemanticException( "Scalar function " + functionName.toLowerCase(Locale.ENGLISH) @@ -579,7 +596,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { .getFunctionName() .equalsIgnoreCase(functionName)) { if (argumentTypes.size() != 2 - || !(isIntegerNumber(argumentTypes.get(0)) && isIntegerNumber(argumentTypes.get(1)))) { + || !(CommonMetadataUtils.isIntegerNumber(argumentTypes.get(0)) + && CommonMetadataUtils.isIntegerNumber(argumentTypes.get(1)))) { throw new SemanticException( String.format( "Scalar function %s only accepts two arguments and they must be Int32 or Int64 data type.", @@ -589,7 +607,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.BITWISE_NOT .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isIntegerNumber(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isIntegerNumber(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be Int32 or Int64 data type.", @@ -606,7 +624,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { .getFunctionName() .equalsIgnoreCase(functionName)) { if (argumentTypes.size() != 2 - || !(isIntegerNumber(argumentTypes.get(0)) && isIntegerNumber(argumentTypes.get(1)))) { + || !(CommonMetadataUtils.isIntegerNumber(argumentTypes.get(0)) + && CommonMetadataUtils.isIntegerNumber(argumentTypes.get(1)))) { throw new SemanticException( String.format( "Scalar function %s only accepts two arguments and they must be Int32 or Int64 data type.", @@ -617,7 +636,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { .getFunctionName() .equalsIgnoreCase(functionName)) { if (!(argumentTypes.size() == 1 - && (isCharType(argumentTypes.get(0)) || isBlobType(argumentTypes.get(0))))) { + && (CommonMetadataUtils.isCharType(argumentTypes.get(0)) + || CommonMetadataUtils.isBlobType(argumentTypes.get(0))))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BLOB data type.", @@ -627,7 +647,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_BASE64 .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isCharType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isCharType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT or STRING data type.", @@ -638,7 +658,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { .getFunctionName() .equalsIgnoreCase(functionName)) { if (!(argumentTypes.size() == 1 - && (isCharType(argumentTypes.get(0)) || isBlobType(argumentTypes.get(0))))) { + && (CommonMetadataUtils.isCharType(argumentTypes.get(0)) + || CommonMetadataUtils.isBlobType(argumentTypes.get(0))))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BLOB data type.", @@ -648,7 +669,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_BASE64URL .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isCharType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isCharType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT or STRING data type.", @@ -659,7 +680,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { .getFunctionName() .equalsIgnoreCase(functionName)) { if (!(argumentTypes.size() == 1 - && (isCharType(argumentTypes.get(0)) || isBlobType(argumentTypes.get(0))))) { + && (CommonMetadataUtils.isCharType(argumentTypes.get(0)) + || CommonMetadataUtils.isBlobType(argumentTypes.get(0))))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BLOB data type.", @@ -669,7 +691,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_BASE32 .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isCharType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isCharType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT or STRING data type.", @@ -678,7 +700,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { return BLOB; } else if (TableBuiltinScalarFunction.SHA256.getFunctionName().equalsIgnoreCase(functionName)) { if (!(argumentTypes.size() == 1 - && (isCharType(argumentTypes.get(0)) || isBlobType(argumentTypes.get(0))))) { + && (CommonMetadataUtils.isCharType(argumentTypes.get(0)) + || CommonMetadataUtils.isBlobType(argumentTypes.get(0))))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BLOB data type.", @@ -687,7 +710,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { return BLOB; } else if (TableBuiltinScalarFunction.SHA512.getFunctionName().equalsIgnoreCase(functionName)) { if (!(argumentTypes.size() == 1 - && (isCharType(argumentTypes.get(0)) || isBlobType(argumentTypes.get(0))))) { + && (CommonMetadataUtils.isCharType(argumentTypes.get(0)) + || CommonMetadataUtils.isBlobType(argumentTypes.get(0))))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BLOB data type.", @@ -696,7 +720,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { return BLOB; } else if (TableBuiltinScalarFunction.SHA1.getFunctionName().equalsIgnoreCase(functionName)) { if (!(argumentTypes.size() == 1 - && (isCharType(argumentTypes.get(0)) || isBlobType(argumentTypes.get(0))))) { + && (CommonMetadataUtils.isCharType(argumentTypes.get(0)) + || CommonMetadataUtils.isBlobType(argumentTypes.get(0))))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BLOB data type.", @@ -705,7 +730,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { return BLOB; } else if (TableBuiltinScalarFunction.MD5.getFunctionName().equalsIgnoreCase(functionName)) { if (!(argumentTypes.size() == 1 - && (isCharType(argumentTypes.get(0)) || isBlobType(argumentTypes.get(0))))) { + && (CommonMetadataUtils.isCharType(argumentTypes.get(0)) + || CommonMetadataUtils.isBlobType(argumentTypes.get(0))))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BLOB data type.", @@ -716,7 +742,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { .getFunctionName() .equalsIgnoreCase(functionName)) { if (!(argumentTypes.size() == 1 - && (isCharType(argumentTypes.get(0)) || isBlobType(argumentTypes.get(0))))) { + && (CommonMetadataUtils.isCharType(argumentTypes.get(0)) + || CommonMetadataUtils.isBlobType(argumentTypes.get(0))))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BLOB data type.", @@ -727,7 +754,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { .getFunctionName() .equalsIgnoreCase(functionName)) { if (!(argumentTypes.size() == 1 - && (isCharType(argumentTypes.get(0)) || isBlobType(argumentTypes.get(0))))) { + && (CommonMetadataUtils.isCharType(argumentTypes.get(0)) + || CommonMetadataUtils.isBlobType(argumentTypes.get(0))))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BLOB data type.", @@ -736,7 +764,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { return BLOB; } else if (TableBuiltinScalarFunction.TO_HEX.getFunctionName().equalsIgnoreCase(functionName)) { if (!(argumentTypes.size() == 1 - && (isCharType(argumentTypes.get(0)) || isBlobType(argumentTypes.get(0))))) { + && (CommonMetadataUtils.isCharType(argumentTypes.get(0)) + || CommonMetadataUtils.isBlobType(argumentTypes.get(0))))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BLOB data type.", @@ -746,7 +775,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_HEX .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isCharType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isCharType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT or STRING data type.", @@ -757,7 +786,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { .getFunctionName() .equalsIgnoreCase(functionName)) { if (argumentTypes.size() != 1 - || !(isCharType(argumentTypes.get(0)) || isBlobType(argumentTypes.get(0)))) { + || !(CommonMetadataUtils.isCharType(argumentTypes.get(0)) + || CommonMetadataUtils.isBlobType(argumentTypes.get(0)))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BlOB data type.", @@ -771,8 +801,9 @@ && isIntegerNumber(argumentTypes.get(2)))) { .getFunctionName() .equalsIgnoreCase(functionName)) { if (argumentTypes.size() != 2 - || !(isCharType(argumentTypes.get(0)) || isBlobType(argumentTypes.get(0))) - || !isCharType(argumentTypes.get(1))) { + || !(CommonMetadataUtils.isCharType(argumentTypes.get(0)) + || CommonMetadataUtils.isBlobType(argumentTypes.get(0))) + || !CommonMetadataUtils.isCharType(argumentTypes.get(1))) { throw new SemanticException( String.format( "Scalar function %s only accepts two arguments, first argument must be TEXT, STRING, or BlOB type, second argument must be STRING OR TEXT type.", @@ -792,7 +823,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_BIG_ENDIAN_32 .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isBlobType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isBlobType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be BLOB data type.", @@ -812,7 +843,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_BIG_ENDIAN_64 .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isBlobType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isBlobType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be BLOB data type.", @@ -832,7 +863,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_LITTLE_ENDIAN_32 .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isBlobType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isBlobType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be BLOB data type.", @@ -852,7 +883,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_LITTLE_ENDIAN_64 .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isBlobType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isBlobType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be BLOB data type.", @@ -872,7 +903,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_IEEE754_32 .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isBlobType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isBlobType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be BLOB data type.", @@ -892,7 +923,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_IEEE754_64 .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isBlobType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isBlobType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be BLOB data type.", @@ -901,7 +932,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { return DOUBLE; } else if (TableBuiltinScalarFunction.CRC32.getFunctionName().equalsIgnoreCase(functionName)) { if (argumentTypes.size() != 1 - || !(isBlobType(argumentTypes.get(0)) || isCharType(argumentTypes.get(0)))) { + || !(CommonMetadataUtils.isBlobType(argumentTypes.get(0)) + || CommonMetadataUtils.isCharType(argumentTypes.get(0)))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BLOB data type.", @@ -915,7 +947,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { .getFunctionName() .equalsIgnoreCase(functionName)) { if (argumentTypes.size() != 1 - || !(isBlobType(argumentTypes.get(0)) || isCharType(argumentTypes.get(0)))) { + || !(CommonMetadataUtils.isBlobType(argumentTypes.get(0)) + || CommonMetadataUtils.isCharType(argumentTypes.get(0)))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BLOB data type.", @@ -935,7 +968,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_BIG_ENDIAN_32 .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isBlobType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isBlobType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be BLOB data type.", @@ -955,7 +988,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_BIG_ENDIAN_64 .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isBlobType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isBlobType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be BLOB data type.", @@ -975,7 +1008,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_LITTLE_ENDIAN_32 .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isBlobType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isBlobType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be BLOB data type.", @@ -995,7 +1028,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_LITTLE_ENDIAN_64 .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isBlobType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isBlobType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be BLOB data type.", @@ -1015,7 +1048,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_IEEE754_32 .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isBlobType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isBlobType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be BLOB data type.", @@ -1035,7 +1068,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.FROM_IEEE754_64 .getFunctionName() .equalsIgnoreCase(functionName)) { - if (argumentTypes.size() != 1 || !isBlobType(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isBlobType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be BLOB data type.", @@ -1044,7 +1077,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { return DOUBLE; } else if (TableBuiltinScalarFunction.CRC32.getFunctionName().equalsIgnoreCase(functionName)) { if (argumentTypes.size() != 1 - || !(isBlobType(argumentTypes.get(0)) || isCharType(argumentTypes.get(0)))) { + || !(CommonMetadataUtils.isBlobType(argumentTypes.get(0)) + || CommonMetadataUtils.isCharType(argumentTypes.get(0)))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BLOB data type.", @@ -1058,7 +1092,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { .getFunctionName() .equalsIgnoreCase(functionName)) { if (argumentTypes.size() != 1 - || !(isBlobType(argumentTypes.get(0)) || isCharType(argumentTypes.get(0)))) { + || !(CommonMetadataUtils.isBlobType(argumentTypes.get(0)) + || CommonMetadataUtils.isCharType(argumentTypes.get(0)))) { throw new SemanticException( String.format( "Scalar function %s only accepts one argument and it must be TEXT, STRING, or BLOB data type.", @@ -1068,9 +1103,9 @@ && isIntegerNumber(argumentTypes.get(2)))) { } else if (TableBuiltinScalarFunction.LPAD.getFunctionName().equalsIgnoreCase(functionName) || TableBuiltinScalarFunction.RPAD.getFunctionName().equalsIgnoreCase(functionName)) { if (argumentTypes.size() != 3 - || !isBlobType(argumentTypes.get(0)) - || !isIntegerNumber(argumentTypes.get(1)) - || !isBlobType(argumentTypes.get(2))) { + || !CommonMetadataUtils.isBlobType(argumentTypes.get(0)) + || !CommonMetadataUtils.isIntegerNumber(argumentTypes.get(1)) + || !CommonMetadataUtils.isBlobType(argumentTypes.get(2))) { throw new SemanticException( String.format( "Scalar function %s only accepts three arguments, first argument must be BlOB type, " @@ -1098,7 +1133,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { "Aggregate functions [%s] should only have one argument", functionName)); } - if (!isSupportedMathNumericType(argumentTypes.get(0))) { + if (!CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(0))) { throw new SemanticException( String.format( "Aggregate functions [%s] only support numeric data types [INT32, INT64, FLOAT, DOUBLE]", @@ -1115,7 +1150,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } break; case SqlConstant.COUNT_IF: - if (argumentTypes.size() != 1 || !isBool(argumentTypes.get(0))) { + if (argumentTypes.size() != 1 || !CommonMetadataUtils.isBool(argumentTypes.get(0))) { throw new SemanticException( String.format( "Aggregate functions [%s] should only have one boolean expression as argument", @@ -1128,7 +1163,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { throw new SemanticException( String.format( "Aggregate functions [%s] should only have one or two arguments", functionName)); - } else if (!isTimestampType(argumentTypes.get(1))) { + } else if (!CommonMetadataUtils.isTimestampType(argumentTypes.get(1))) { throw new SemanticException( String.format( "Second argument of Aggregate functions [%s] should be orderable", functionName)); @@ -1163,7 +1198,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { "Aggregate functions [%s] should only have two arguments", functionName)); } - if (argumentTypes.size() == 2 && !isSupportedMathNumericType(argumentTypes.get(1))) { + if (argumentTypes.size() == 2 + && !CommonMetadataUtils.isSupportedMathNumericType(argumentTypes.get(1))) { throw new SemanticException( String.format( "Second argument of Aggregate functions [%s] should be numberic type and do not use expression", @@ -1187,7 +1223,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } Type valueColumnType = argumentTypes.get(0); - if (!isNumericType(valueColumnType)) { + if (!CommonMetadataUtils.isNumericType(valueColumnType)) { throw new SemanticException( String.format( "Aggregation functions [%s] should have value column as numeric type [INT32, INT64, FLOAT, DOUBLE, TIMESTAMP]", @@ -1195,7 +1231,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } Type percentageType = argumentTypes.get(argumentSize - 1); - if (!isDecimalType(percentageType)) { + if (!CommonMetadataUtils.isDecimalType(percentageType)) { throw new SemanticException( String.format( "Aggregation functions [%s] should have percentage as decimal type", @@ -1203,7 +1239,7 @@ && isIntegerNumber(argumentTypes.get(2)))) { } if (argumentSize == 3) { Type weightType = argumentTypes.get(1); - if (!INT32.equals(weightType) && !isUnknownType(weightType)) { + if (!INT32.equals(weightType) && !CommonMetadataUtils.isUnknownType(weightType)) { throw new SemanticException( String.format( "Aggregation functions [%s] do not support weight as %s type", @@ -1262,7 +1298,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { } break; case SqlConstant.NTH_VALUE: - if (argumentTypes.size() != 2 || !isIntegerNumber(argumentTypes.get(1))) { + if (argumentTypes.size() != 2 + || !CommonMetadataUtils.isIntegerNumber(argumentTypes.get(1))) { throw new SemanticException( "Window function [nth_value] should only have two argument, and second argument must be integer type"); } @@ -1280,7 +1317,8 @@ && isIntegerNumber(argumentTypes.get(2)))) { String.format( "Window function [%s] should only have one to three argument", functionName)); } - if (argumentTypes.size() >= 2 && !isIntegerNumber(argumentTypes.get(1))) { + if (argumentTypes.size() >= 2 + && !CommonMetadataUtils.isIntegerNumber(argumentTypes.get(1))) { throw new SemanticException( String.format( "Window function [%s]'s second argument must be integer type", functionName)); @@ -1489,150 +1527,4 @@ public TableFunction getTableFunction(String functionName) { throw new SemanticException("Unknown function: " + functionName); } } - - public static boolean isTwoNumericType(List argumentTypes) { - return argumentTypes.size() == 2 - && isNumericType(argumentTypes.get(0)) - && isNumericType(argumentTypes.get(1)); - } - - public static boolean isOneNumericType(List argumentTypes) { - return argumentTypes.size() == 1 && isNumericType(argumentTypes.get(0)); - } - - public static boolean isTwoSupportedMathNumericType(List argumentTypes) { - return argumentTypes.size() == 2 - && isSupportedMathNumericType(argumentTypes.get(0)) - && isSupportedMathNumericType(argumentTypes.get(1)); - } - - public static boolean isOneSupportedMathNumericType(List argumentTypes) { - return argumentTypes.size() == 1 && isSupportedMathNumericType(argumentTypes.get(0)); - } - - public static boolean isOneBooleanType(List argumentTypes) { - return argumentTypes.size() == 1 && BOOLEAN.equals(argumentTypes.get(0)); - } - - public static boolean isOneCharType(List argumentTypes) { - return argumentTypes.size() == 1 && isCharType(argumentTypes.get(0)); - } - - public static boolean isTwoCharType(List argumentTypes) { - return argumentTypes.size() == 2 - && isCharType(argumentTypes.get(0)) - && isCharType(argumentTypes.get(1)); - } - - public static boolean isThreeCharType(List argumentTypes) { - return argumentTypes.size() == 3 - && isCharType(argumentTypes.get(0)) - && isCharType(argumentTypes.get(1)) - && isCharType(argumentTypes.get(2)); - } - - public static boolean isCharType(Type type) { - return TEXT.equals(type) || StringType.STRING.equals(type); - } - - public static boolean isObjectType(Type type) { - return ObjectType.OBJECT.equals(type); - } - - public static boolean isBlobType(Type type) { - return BLOB.equals(type); - } - - public static boolean isBool(Type type) { - return BOOLEAN.equals(type); - } - - public static boolean isDecimalType(Type type) { - return DOUBLE.equals(type) || FLOAT.equals(type); - } - - public static boolean isSupportedMathNumericType(Type type) { - return DOUBLE.equals(type) || FLOAT.equals(type) || INT32.equals(type) || INT64.equals(type); - } - - public static boolean isNumericType(Type type) { - return DOUBLE.equals(type) - || FLOAT.equals(type) - || INT32.equals(type) - || INT64.equals(type) - || TIMESTAMP.equals(type); - } - - public static boolean isTimestampType(Type type) { - return TIMESTAMP.equals(type); - } - - public static boolean isUnknownType(Type type) { - return UNKNOWN.equals(type); - } - - public static boolean isIntegerNumber(Type type) { - return INT32.equals(type) || INT64.equals(type); - } - - public static boolean isTwoTypeComparable(List argumentTypes) { - if (argumentTypes.size() != 2) { - return false; - } - Type left = argumentTypes.get(0); - Type right = argumentTypes.get(1); - if (left.equals(right)) { - return true; - } - - // Boolean type and Binary Type can not be compared with other types - return (isNumericType(left) && isNumericType(right)) - || (isCharType(left) && isCharType(right)) - || (isUnknownType(left) && (isNumericType(right) || isCharType(right))) - || ((isNumericType(left) || isCharType(left)) && isUnknownType(right)); - } - - public static boolean areAllTypesSameAndComparable(List argumentTypes) { - if (argumentTypes == null || argumentTypes.isEmpty()) { - return true; - } - Type firstType = argumentTypes.get(0); - if (!firstType.isComparable()) { - return false; - } - return argumentTypes.stream().allMatch(type -> type.equals(firstType)); - } - - public static boolean isArithmeticType(Type type) { - return INT32.equals(type) - || INT64.equals(type) - || FLOAT.equals(type) - || DOUBLE.equals(type) - || DATE.equals(type) - || TIMESTAMP.equals(type); - } - - public static boolean isTwoTypeCalculable(List argumentTypes) { - if (argumentTypes.size() != 2) { - return false; - } - Type left = argumentTypes.get(0); - Type right = argumentTypes.get(1); - if ((isUnknownType(left) && isArithmeticType(right)) - || (isUnknownType(right) && isArithmeticType(left))) { - return true; - } - return isArithmeticType(left) && isArithmeticType(right); - } - - public static void throwTableNotExistsException(final String database, final String tableName) { - throw new SemanticException(new TableNotExistsException(database, tableName)); - } - - public static void throwColumnNotExistsException(final Object columnName) { - throw new SemanticException( - new IoTDBException( - String.format("Column '%s' cannot be resolved.", columnName), - TSStatusCode.COLUMN_NOT_EXISTS.getStatusCode())); - } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java index 688d7ec168ae8..1a8a6e2fab4b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java @@ -32,6 +32,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.auth.AuthorityChecker; +import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.ColumnCreationFailException; @@ -46,7 +47,6 @@ import org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateTableTask; 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.metadata.TableSchema; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; @@ -136,7 +136,7 @@ public Optional validateTableHeaderSchema4TsFile( "auto create table succeed, but cannot get table schema in current node's DataNodeTableCache, may be caused by concurrently auto creating table"); } } else { - TableMetadataImpl.throwTableNotExistsException(database, tableSchema.getTableName()); + CommonMetadataUtils.throwTableNotExistsException(database, tableSchema.getTableName()); } } else { DataNodeTreeViewSchemaUtils.checkTableInWrite(database, table); @@ -376,7 +376,7 @@ public void validateInsertNodeMeasurements( "auto create table succeed, but cannot get table schema in current node's DataNodeTableCache, may be caused by concurrently auto creating table"); } } else { - TableMetadataImpl.throwTableNotExistsException(database, measurementInfo.getTableName()); + CommonMetadataUtils.throwTableNotExistsException(database, measurementInfo.getTableName()); } } else { DataNodeTreeViewSchemaUtils.checkTableInWrite(database, table); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java index 72ba654cb7631..dc4c105512cdd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.CastFunctionUtils; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; @@ -49,7 +50,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; @@ -77,12 +77,12 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.MINUS; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.PLUS; import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; public class IrExpressionInterpreter { @@ -910,7 +910,7 @@ public Object visitCast(Cast node, Object context) { } try { - return CastFunctionHelper.cast(value, sourceType, targetType, session); + return CastFunctionUtils.cast(value, sourceType, targetType, session); } catch (RuntimeException e) { if (node.isSafe()) { return null; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java index f61f9a838c526..f98a73853f413 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java @@ -44,10 +44,10 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBool; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBlobType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isBool; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isCharType; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; import static org.apache.tsfile.read.common.type.FloatType.FLOAT; import static org.apache.tsfile.read.common.type.IntType.INT32; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index 23fa5c3571ef6..8e7bce995162e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -101,6 +101,7 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.lang.String.format; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.groupingSets; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; @@ -111,7 +112,6 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.ROWS; import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isNumericType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingTranslator.sortItemToSortOrder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware.scopeAwareKey; 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 700f2b30932c0..ccb5cad7f8c60 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 @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; @@ -58,7 +59,6 @@ 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.metadata.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; @@ -279,7 +279,7 @@ private RelationPlan genInsertPlan(final Analysis analysis, final Insert node) { QualifiedObjectName targetTable = createQualifiedObjectName(sessionInfo, table.getName()); Optional tableSchema = metadata.getTableSchema(sessionInfo, targetTable); if (!tableSchema.isPresent()) { - TableMetadataImpl.throwTableNotExistsException( + CommonMetadataUtils.throwTableNotExistsException( targetTable.getDatabaseName(), targetTable.getObjectName()); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java index e95e54bc01363..a4db05cd6a3cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java @@ -34,13 +34,13 @@ import java.time.ZoneId; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; public class GapFillStartAndEndTimeExtractVisitor extends AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index 8c7fc61a66d43..89ed4ac2ec8d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -46,6 +46,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; @@ -56,7 +57,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.LongType.INT64; 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 185c09255283b..888f3f51e815e 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 @@ -24,6 +24,8 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -39,8 +41,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; 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.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.rescon.MemSchemaRegionStatistics; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.storageengine.dataregion.modification.ModEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareEqualToTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareEqualToTransformer.java index 9ae12add71c7f..373633018da9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareEqualToTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareEqualToTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; import org.apache.tsfile.block.column.Column; @@ -43,7 +43,8 @@ protected Evaluator constructNumberEvaluator() { @Override protected Evaluator constructTextEvaluator() { return (Column leftValues, int leftIndex, Column rightValues, int rightIndex) -> - TransformUtils.compare(leftValues.getBinary(leftIndex), rightValues.getBinary(rightIndex)) + CommonTransformUtils.compare( + leftValues.getBinary(leftIndex), rightValues.getBinary(rightIndex)) == 0; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterEqualTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterEqualTransformer.java index 218a82c7f30ec..bf94ee265d0dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterEqualTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterEqualTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; import org.apache.tsfile.block.column.Column; @@ -43,7 +43,8 @@ protected Evaluator constructNumberEvaluator() { @Override protected Evaluator constructTextEvaluator() { return (Column leftValues, int leftIndex, Column rightValues, int rightIndex) -> - TransformUtils.compare(leftValues.getBinary(leftIndex), rightValues.getBinary(rightIndex)) + CommonTransformUtils.compare( + leftValues.getBinary(leftIndex), rightValues.getBinary(rightIndex)) >= 0; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterThanTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterThanTransformer.java index a25560965c117..5954ca2604d1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterThanTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterThanTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; import org.apache.tsfile.block.column.Column; @@ -44,7 +44,8 @@ protected Evaluator constructNumberEvaluator() { @Override protected Evaluator constructTextEvaluator() { return (Column leftValues, int leftIndex, Column rightValues, int rightIndex) -> - TransformUtils.compare(leftValues.getBinary(leftIndex), rightValues.getBinary(rightIndex)) + CommonTransformUtils.compare( + leftValues.getBinary(leftIndex), rightValues.getBinary(rightIndex)) > 0; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessEqualTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessEqualTransformer.java index 9f2783c6d44af..af7b185e73822 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessEqualTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessEqualTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; import org.apache.tsfile.block.column.Column; @@ -43,7 +43,8 @@ protected Evaluator constructNumberEvaluator() { @Override protected Evaluator constructTextEvaluator() { return (Column leftValues, int leftIndex, Column rightValues, int rightIndex) -> - TransformUtils.compare(leftValues.getBinary(leftIndex), rightValues.getBinary(rightIndex)) + CommonTransformUtils.compare( + leftValues.getBinary(leftIndex), rightValues.getBinary(rightIndex)) <= 0; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessThanTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessThanTransformer.java index ceebcb3326543..9f31319c42cd2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessThanTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessThanTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; import org.apache.tsfile.block.column.Column; @@ -44,7 +44,8 @@ protected Evaluator constructNumberEvaluator() { @Override protected Evaluator constructTextEvaluator() { return (Column leftValues, int leftIndex, Column rightValues, int rightIndex) -> - TransformUtils.compare(leftValues.getBinary(leftIndex), rightValues.getBinary(rightIndex)) + CommonTransformUtils.compare( + leftValues.getBinary(leftIndex), rightValues.getBinary(rightIndex)) < 0; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareNonEqualTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareNonEqualTransformer.java index 2bcd252d16330..a04e2c9557ff1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareNonEqualTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareNonEqualTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.write.UnSupportedDataTypeException; @@ -45,7 +45,8 @@ protected Evaluator constructNumberEvaluator() { @Override protected Evaluator constructTextEvaluator() { return (Column leftValues, int leftIndex, Column rightValues, int rightIndex) -> - TransformUtils.compare(leftValues.getBinary(leftIndex), rightValues.getBinary(rightIndex)) + CommonTransformUtils.compare( + leftValues.getBinary(leftIndex), rightValues.getBinary(rightIndex)) != 0; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/BetweenTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/BetweenTransformer.java index 1102976bf73fa..1d9d790a5d0fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/BetweenTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/BetweenTransformer.java @@ -21,8 +21,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.ternary; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; -import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; import org.apache.tsfile.block.column.Column; @@ -68,10 +68,10 @@ protected Evaluator constructTextEvaluator() { int secondIndex, Column thirdValues, int thirdIndex) -> - ((TransformUtils.compare( + ((CommonTransformUtils.compare( firstValues.getBinary(firstIndex), secondValues.getBinary(secondIndex)) >= 0) - && (TransformUtils.compare( + && (CommonTransformUtils.compare( firstValues.getBinary(firstIndex), thirdValues.getBinary(thirdIndex)) <= 0)) ^ isNotBetween; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java index 195acb6de8527..afb3490200770 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.CastFunctionUtils; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper.CastFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.UnaryTransformer; @@ -168,7 +168,7 @@ private Column[] castLongs(Column[] columns) { builder = new IntColumnBuilder(null, count); for (int i = 0; i < count; i++) { if (!isNulls[i]) { - builder.writeInt(CastFunctionHelper.castLongToInt(values[i])); + builder.writeInt(CastFunctionUtils.castLongToInt(values[i])); } else { builder.appendNull(); } @@ -244,7 +244,7 @@ private Column[] castFloats(Column[] columns) { builder = new IntColumnBuilder(null, count); for (int i = 0; i < count; i++) { if (!isNulls[i]) { - builder.writeInt(CastFunctionHelper.castFloatToInt(values[i])); + builder.writeInt(CastFunctionUtils.castFloatToInt(values[i])); } else { builder.appendNull(); } @@ -254,7 +254,7 @@ private Column[] castFloats(Column[] columns) { builder = new LongColumnBuilder(null, count); for (int i = 0; i < count; i++) { if (!isNulls[i]) { - builder.writeLong(CastFunctionHelper.castFloatToLong(values[i])); + builder.writeLong(CastFunctionUtils.castFloatToLong(values[i])); } else { builder.appendNull(); } @@ -320,7 +320,7 @@ private Column[] castDoubles(Column[] columns) { builder = new IntColumnBuilder(null, count); for (int i = 0; i < count; i++) { if (!isNulls[i]) { - builder.writeInt(CastFunctionHelper.castDoubleToInt(values[i])); + builder.writeInt(CastFunctionUtils.castDoubleToInt(values[i])); } else { builder.appendNull(); } @@ -330,7 +330,7 @@ private Column[] castDoubles(Column[] columns) { builder = new LongColumnBuilder(null, count); for (int i = 0; i < count; i++) { if (!isNulls[i]) { - builder.writeLong(CastFunctionHelper.castDoubleToLong(values[i])); + builder.writeLong(CastFunctionUtils.castDoubleToLong(values[i])); } else { builder.appendNull(); } @@ -340,7 +340,7 @@ private Column[] castDoubles(Column[] columns) { builder = new FloatColumnBuilder(null, count); for (int i = 0; i < count; i++) { if (!isNulls[i]) { - builder.writeFloat(CastFunctionHelper.castDoubleToFloat(values[i])); + builder.writeFloat(CastFunctionUtils.castDoubleToFloat(values[i])); } else { builder.appendNull(); } @@ -495,7 +495,7 @@ private Column[] castBinaries(Column[] columns) { for (int i = 0; i < count; i++) { if (!isNulls[i]) { String str = values[i].getStringValue(TSFileConfig.STRING_CHARSET); - builder.writeFloat(CastFunctionHelper.castTextToFloat(str)); + builder.writeFloat(CastFunctionUtils.castTextToFloat(str)); } else { builder.appendNull(); } @@ -506,7 +506,7 @@ private Column[] castBinaries(Column[] columns) { for (int i = 0; i < count; i++) { if (!isNulls[i]) { String str = values[i].getStringValue(TSFileConfig.STRING_CHARSET); - builder.writeDouble(CastFunctionHelper.castTextToDouble(str)); + builder.writeDouble(CastFunctionUtils.castTextToDouble(str)); } else { builder.appendNull(); } @@ -517,7 +517,7 @@ private Column[] castBinaries(Column[] columns) { for (int i = 0; i < count; i++) { if (!isNulls[i]) { String str = values[i].getStringValue(TSFileConfig.STRING_CHARSET); - builder.writeBoolean(CastFunctionHelper.castTextToBoolean(str)); + builder.writeBoolean(CastFunctionUtils.castTextToBoolean(str)); } else { builder.appendNull(); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java index 3ea2cbbce2a2a..238e8b79b096a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java index 71312657ce4c2..08b9af8a987eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java @@ -30,7 +30,7 @@ import org.apache.tsfile.utils.BytesUtils; import org.apache.tsfile.write.UnSupportedDataTypeException; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; public class SubStringFunctionTransformer extends UnaryTransformer { private int beginPosition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java index 015904399c201..2e1eba2fb29f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java @@ -44,14 +44,6 @@ private TransformUtils() { throw new IllegalStateException("TransformUtils should not be instantiated."); } - public static int compare(Binary first, Binary second) { - if (Objects.requireNonNull(first) == Objects.requireNonNull(second)) { - return 0; - } - - return first.compareTo(second); - } - public static Column transformConstantOperandToColumn(ConstantOperand constantOperand) { Objects.requireNonNull(constantOperand); 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 e69cb524d7f8d..82bbf304651f3 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 @@ -37,6 +37,8 @@ import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.consensus.ConsensusFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.metadata.PathNotExistException; @@ -70,8 +72,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableNodeLocationAddNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DeleteDevice; -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.metric.ISchemaRegionMetric; import org.apache.iotdb.db.schemaengine.metric.SchemaRegionMemMetric; import org.apache.iotdb.db.schemaengine.rescon.DataNodeSchemaQuotaManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java index 64fa5f34ac49b..5f58024ea1f30 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java @@ -25,9 +25,9 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.confignode.rpc.thrift.TFetchTableResp; +import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.plan.execution.config.executor.ClusterConfigTaskExecutor; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.tsfile.utils.Pair; @@ -334,7 +334,7 @@ public TsTable getTable(String database, final String tableName, final boolean f } final TsTable table = getTableInCache(database, tableName); if (Objects.isNull(table) && force) { - TableMetadataImpl.throwTableNotExistsException(database, tableName); + CommonMetadataUtils.throwTableNotExistsException(database, tableName); } return table; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java index 9e23f3c6970d4..906a4692749d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java @@ -49,6 +49,7 @@ import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.consensus.iot.IoTConsensus; import org.apache.iotdb.consensus.iot.IoTConsensusServerImpl; +import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.DataRegionConsensusImpl; @@ -87,7 +88,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsOfOneDeviceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.LastCacheLoadStrategy; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceSchemaCache; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; @@ -1637,7 +1637,7 @@ private void registerToTsFile(InsertNode node, TsFileProcessor tsFileProcessor) .borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) { resp = client.describeTable(getDatabaseName(), tableName, false); if (resp == null || resp.tableInfo == null) { - TableMetadataImpl.throwTableNotExistsException(getDatabaseName(), tableName); + CommonMetadataUtils.throwTableNotExistsException(getDatabaseName(), tableName); } // For table schema from ConfigNode, we cannot get version info, // so we don't cache it to avoid version mismatch @@ -1649,7 +1649,7 @@ private void registerToTsFile(InsertNode node, TsFileProcessor tsFileProcessor) logger.error( "Remote request config node failed that judgment if table is exist, occur exception. {}", e.getMessage()); - TableMetadataImpl.throwTableNotExistsException(getDatabaseName(), tableName); + CommonMetadataUtils.throwTableNotExistsException(getDatabaseName(), tableName); return null; // unreachable, throwTableNotExistsException always throws } } else { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index 39eaf7d6be3e0..2e7dfb726d2ea 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -25,6 +25,11 @@ 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.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -82,11 +87,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.TimeColumnTransformer; import com.google.common.collect.Sets; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java index 8d2faf4afc545..2d4f50c3ee282 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java @@ -66,6 +66,9 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isOneNumericType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoNumericType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTSBSDataPartition.T1_DEVICE_1; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTSBSDataPartition.T1_DEVICE_2; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTSBSDataPartition.T1_DEVICE_3; @@ -73,9 +76,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTSBSDataPartition.T2_DEVICE_2; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTSBSDataPartition.T2_DEVICE_3; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.getFunctionType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isOneNumericType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isTwoNumericType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isTwoTypeComparable; 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.DoubleType.DOUBLE; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index e78ff3bb11c65..bbcbfd169afe6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -84,6 +84,9 @@ import java.util.stream.Collectors; import static org.apache.iotdb.commons.schema.table.InformationSchema.INFORMATION_DATABASE; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isOneNumericType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoNumericType; +import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; 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; @@ -97,9 +100,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTableModelDataPartition.DEVICE_6; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTableModelDataPartition.DEVICE_6_ATTRIBUTES; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.getFunctionType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isOneNumericType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isTwoNumericType; -import static org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl.isTwoTypeComparable; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; import static org.apache.tsfile.read.common.type.LongType.INT64; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java index a6d3003e5b00b..d1f7eff55fbd6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java @@ -19,7 +19,18 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticDivisionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticModuloColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java index 7e66638f09f6f..9c98aa7e84af9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java @@ -19,7 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.LogicAndColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.LogicOrColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java index ba6afb33c5a7e..8a4880b8cbf42 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java index e80367f52b9e4..7cfb33382d4de 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java index 73792cabdb90c..edee703f32644 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java index f88604ecaeae9..2892e44caca57 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java index 6640ef79ed18e..00dc61776152a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java @@ -18,8 +18,9 @@ */ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.LpadColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java index 955aa4905b9c3..6657aa2237bb2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java @@ -18,8 +18,9 @@ */ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.RpadColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java index 3d9904d764e7b..19f730a2308b1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java @@ -19,7 +19,14 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; -import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.ArithmeticNegationColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.InColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LikeColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.RegularColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java index 7fbbd6da2fa23..e15369f69c24f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java @@ -19,7 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BlobLengthColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java index db271fdb9a335..28bab41ff3aae 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java @@ -27,7 +27,7 @@ import java.time.ZoneId; import java.util.TimeZone; -import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; +import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; import static org.junit.Assert.assertEquals; public class DateBinFunctionTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java index c4c625e6a5f8b..30ca862f15917 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java index bb3b0165ff037..63af69cd782c6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java index e493bc2deda63..3ea565b9a57b3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java index b764d1d696aaa..6601c096b4de1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java index f6240e3e1d487..2c5fc2ee8a29a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java index 6e3cefa5483fd..c9ce05d2f6fc6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java index e84fd6d2ff86c..b5bd899959b54 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java index 27c4839aaf070..2b45838b668e7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.LongColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java index 835013fde4f24..f63511da804ec 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.FloatColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java index aa70494031a67..2b1a7cecfb301 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.DoubleColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java index 2465a3d81d0b7..b5fff8ac9faca 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java index 941df13280833..d2c62f13f2026 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.LongColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java index 3c3695f32d281..e6d487dffda57 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java index 78197d3d03c3c..73bd2facfaa55 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java @@ -21,10 +21,10 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base32Encoding; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java index 16e795273ffcd..c678025c2c79b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java index 535d222cd4b88..cd21a3e1505ea 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java index f89cf121f6c6f..cccfea51c241a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base32Encoding; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java index 04eae176abf81..c1079d82fe035 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java index db79311f311c8..bb7b4c2cde1cd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java index 78cf7dace0b49..e4779542bee8d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java @@ -21,8 +21,8 @@ // Note: The actual package may vary, adjust if CRC32Transformer is in a different location. package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.CRC32Transformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CRC32Transformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java index ac357616e3648..133277a3e6309 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java index d4d7d675a26fe..9e5d0affbd96c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java index c74f13e89165b..2656de1d2c6a0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java index c0e177d774369..3140c2c59b5a2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java index 9b65799b908cc..8102d3f9e1694 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java index eabf81d1ddba9..7e4f4d2255203 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java @@ -19,9 +19,9 @@ * under the License. */ -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java index aa374a9031de0..eaf470e8d63ba 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java @@ -19,9 +19,9 @@ * under the License. */ -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java index ab00d0105aa33..f20bdee876527 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import net.jpountz.xxhash.XXHash64; import net.jpountz.xxhash.XXHashFactory; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java index ac885515ecab5..1b2745ab53bfe 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.string; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hexEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java index b95ffe32b0868..9ea7a4432bfa0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hexEncoding; -import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java index 04a611f07c40c..2d26a1f231ff3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java @@ -19,19 +19,20 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.iotdb.db.exception.sql.SemanticException; import org.junit.Assert; import org.junit.Test; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitCountCheck; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseAndTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseLeftShiftTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseNotTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseOrTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseRightShiftArithmeticTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseRightShiftTransform; -import static org.apache.iotdb.db.queryengine.transformation.dag.util.BitwiseUtils.bitwiseXorTransform; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitCountCheck; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseAndTransform; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseLeftShiftTransform; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseNotTransform; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseOrTransform; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseRightShiftArithmeticTransform; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseRightShiftTransform; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseXorTransform; public class BitwiseUtilsTest { @Test From 3f9f6930c502606ee899f6620feece68bed70e12 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Wed, 15 Apr 2026 17:00:11 +0800 Subject: [PATCH 19/45] move fill --- .../main/codegen/templates/constantFill.ftl | 6 +- .../src/main/codegen/templates/linearFill.ftl | 4 +- .../main/codegen/templates/previousFill.ftl | 6 +- .../previousFillWithTimeDuration.ftl | 8 +- .../operator/process/fill/IFill.java | 2 +- .../operator/process/fill/IFillFilter.java | 2 +- .../operator/process/fill/ILinearFill.java | 2 +- .../AbstractMonthIntervalFillFilter.java | 4 +- .../fill/filter/FixedIntervalFillFilter.java | 4 +- .../filter/MonthIntervalMSFillFilter.java | 2 +- .../filter/MonthIntervalNSFillFilter.java | 2 +- .../filter/MonthIntervalUSFillFilter.java | 2 +- .../process/fill/identity/IdentityFill.java | 4 +- .../fill/identity/IdentityLinearFill.java | 4 +- .../process/fill/linear/LinearFill.java | 4 +- .../relational/ColumnTransformerBuilder.java | 6 +- .../plan/planner/OperatorGeneratorUtils.java | 174 +++++++++++++++++ .../plan/planner/TableOperatorGenerator.java | 24 +-- .../plan/udf/TableUDFUtils.java | 3 +- .../dag/util/CommonTransformUtils.java | 6 + .../process/AbstractFillOperator.java | 2 +- .../process/AbstractLinearFillOperator.java | 2 +- .../PreviousFillWithGroupOperator.java | 2 +- .../operator/process/TableFillOperator.java | 2 +- .../process/TableLinearFillOperator.java | 2 +- .../TableLinearFillWithGroupOperator.java | 2 +- .../operator/process/TreeFillOperator.java | 2 +- .../process/TreeLinearFillOperator.java | 2 +- .../aggregation/AccumulatorFactory.java | 2 +- .../config/metadata/ShowFunctionsTask.java | 2 +- .../DataNodeTableOperatorGenerator.java | 2 +- .../plan/planner/OperatorGeneratorUtil.java | 2 +- .../plan/planner/OperatorTreeGenerator.java | 176 ++---------------- .../analyzer/ExpressionTreeUtils.java | 2 +- .../PredicatePushIntoMetadataChecker.java | 4 - .../metadata/TableMetadataImpl.java | 2 +- .../plan/relational/sql/ast/DeleteDevice.java | 2 +- .../impl/SchemaRegionMemoryImpl.java | 2 +- .../execution/operator/FillOperatorTest.java | 10 +- .../operator/OperatorMemoryTest.java | 4 +- .../operator/TreeLinearFillOperatorTest.java | 8 +- .../filter/MonthIntervalFillFilterTest.java | 4 + .../relational/analyzer/TestMetadata.java | 2 +- 43 files changed, 272 insertions(+), 237 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/fill/IFill.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/fill/IFillFilter.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/fill/ILinearFill.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/fill/filter/FixedIntervalFillFilter.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/fill/identity/IdentityFill.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/fill/identity/IdentityLinearFill.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/fill/linear/LinearFill.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/relational/ColumnTransformerBuilder.java (99%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/OperatorGeneratorUtils.java rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/udf/TableUDFUtils.java (95%) diff --git a/iotdb-core/datanode/src/main/codegen/templates/constantFill.ftl b/iotdb-core/datanode/src/main/codegen/templates/constantFill.ftl index 9ff15a150620c..d4cb860c34115 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/constantFill.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/constantFill.ftl @@ -20,10 +20,10 @@ <#list allDataTypes.types as type> <#assign className = "${type.dataType?cap_first}ConstantFill"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/queryengine/execution/operator/process/fill/constant/${className}.java" /> -package org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant; + <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/constant/${className}.java" /> +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.tsfile.read.common.block.column.${type.column}; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; diff --git a/iotdb-core/datanode/src/main/codegen/templates/linearFill.ftl b/iotdb-core/datanode/src/main/codegen/templates/linearFill.ftl index f63b40bc3796e..acc3d72f270f0 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/linearFill.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/linearFill.ftl @@ -21,8 +21,8 @@ <#list decimalDataTypes.types as type> <#assign className = "${type.dataType?cap_first}LinearFill"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/queryengine/execution/operator/process/fill/linear/${className}.java" /> -package org.apache.iotdb.db.queryengine.execution.operator.process.fill.linear; + <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/linear/${className}.java" /> +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.${type.column}; diff --git a/iotdb-core/datanode/src/main/codegen/templates/previousFill.ftl b/iotdb-core/datanode/src/main/codegen/templates/previousFill.ftl index 8efa0bd0a7b26..41c5227447a0d 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/previousFill.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/previousFill.ftl @@ -21,10 +21,10 @@ <#list allDataTypes.types as type> <#assign className = "${type.dataType?cap_first}PreviousFill"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/queryengine/execution/operator/process/fill/previous/${className}.java" /> -package org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous; + <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/previous/${className}.java" /> +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.${type.column}; import org.apache.tsfile.read.common.block.column.${type.column}Builder; diff --git a/iotdb-core/datanode/src/main/codegen/templates/previousFillWithTimeDuration.ftl b/iotdb-core/datanode/src/main/codegen/templates/previousFillWithTimeDuration.ftl index 4de0b724357a5..4a740be669ac4 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/previousFillWithTimeDuration.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/previousFillWithTimeDuration.ftl @@ -21,11 +21,11 @@ <#list allDataTypes.types as type> <#assign className = "${type.dataType?cap_first}PreviousFillWithTimeDuration"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/queryengine/execution/operator/process/fill/previous/${className}.java" /> -package org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous; + <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/previous/${className}.java" /> +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFillFilter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFillFilter; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.${type.column}; import org.apache.tsfile.read.common.block.column.${type.column}Builder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/IFill.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/IFill.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/IFill.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/IFill.java index 009c106541a77..ea52a14e1fb4e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/IFill.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/IFill.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.fill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/IFillFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/IFillFilter.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/IFillFilter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/IFillFilter.java index 736be974cabe8..631ceefaeb3aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/IFillFilter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/IFillFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.fill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill; public interface IFillFilter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/ILinearFill.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/ILinearFill.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/ILinearFill.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/ILinearFill.java index 0dccba1054697..e270b572b6b12 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/ILinearFill.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/ILinearFill.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.fill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java index 24a629189ab53..5ec13d39f05c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.fill.filter; +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFillFilter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFillFilter; import java.time.ZoneId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/FixedIntervalFillFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/FixedIntervalFillFilter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java index 840148438a7d2..9ccd6275a912b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/FixedIntervalFillFilter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.fill.filter; +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFillFilter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFillFilter; public class FixedIntervalFillFilter implements IFillFilter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java index c8e56a8cca9f7..1fe26846eef8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.fill.filter; +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter; import java.time.Instant; import java.time.LocalDateTime; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java index b2c389a1d8753..6260c679bb686 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.fill.filter; +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter; import java.time.Instant; import java.time.LocalDateTime; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java index c99ede2702e35..d8af68bb626ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.fill.filter; +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter; import java.time.Instant; import java.time.LocalDateTime; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/identity/IdentityFill.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/identity/IdentityFill.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/identity/IdentityFill.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/identity/IdentityFill.java index 74801480c6448..f3329598b100f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/identity/IdentityFill.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/identity/IdentityFill.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.fill.identity; +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/identity/IdentityLinearFill.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/identity/IdentityLinearFill.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java index 9ccd42ec51e5c..c87820757b39f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/identity/IdentityLinearFill.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.fill.identity; +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/linear/LinearFill.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/linear/LinearFill.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/linear/LinearFill.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/linear/LinearFill.java index 5cd278cc0e7d9..e1813795cadf2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/linear/LinearFill.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/linear/LinearFill.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.fill.linear; +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java index 54b8ca1027d9f..e476a881ccf9a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.relational; +package org.apache.iotdb.db.calc_commons.execution.relational; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; +import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.TableCaseWhenThenColumnTransformer; @@ -196,7 +197,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.ScalarFunction; @@ -238,9 +238,9 @@ import static org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; import static org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; +import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.isStringLiteral; import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; -import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoMetadataChecker.isStringLiteral; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/OperatorGeneratorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/OperatorGeneratorUtils.java new file mode 100644 index 0000000000000..6464ac4814bd7 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/OperatorGeneratorUtils.java @@ -0,0 +1,174 @@ +/* + * 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.calc_commons.plan.planner; + +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFillFilter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.FixedIntervalFillFilter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalMSFillFilter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalNSFillFilter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalUSFillFilter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.DoubleLinearFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.IntLinearFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.LongLinearFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.BinaryPreviousFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.BinaryPreviousFillWithTimeDuration; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.BooleanPreviousFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.BooleanPreviousFillWithTimeDuration; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.DoublePreviousFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.DoublePreviousFillWithTimeDuration; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.FloatPreviousFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.FloatPreviousFillWithTimeDuration; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.IntPreviousFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.LongPreviousFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.LongPreviousFillWithTimeDuration; + +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.utils.TimeDuration; + +import java.time.ZoneId; +import java.util.List; + +import static org.apache.iotdb.db.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; + +public class OperatorGeneratorUtils { + public static final IdentityLinearFill IDENTITY_LINEAR_FILL = new IdentityLinearFill(); + public static final String UNKNOWN_DATATYPE = "Unknown data type: "; + + public static ILinearFill[] getLinearFill(int inputColumns, List inputDataTypes) { + ILinearFill[] linearFill = new ILinearFill[inputColumns]; + for (int i = 0; i < inputColumns; i++) { + switch (inputDataTypes.get(i)) { + case INT32: + case DATE: + linearFill[i] = new IntLinearFill(); + break; + case INT64: + case TIMESTAMP: + linearFill[i] = new LongLinearFill(); + break; + case FLOAT: + linearFill[i] = new FloatLinearFill(); + break; + case DOUBLE: + linearFill[i] = new DoubleLinearFill(); + break; + case BOOLEAN: + case TEXT: + case STRING: + case BLOB: + case OBJECT: + linearFill[i] = IDENTITY_LINEAR_FILL; + break; + default: + throw new IllegalArgumentException(UNKNOWN_DATATYPE + inputDataTypes.get(i)); + } + } + return linearFill; + } + + public static IFill[] getPreviousFill( + int inputColumns, + List inputDataTypes, + TimeDuration timeDurationThreshold, + ZoneId zoneId) { + IFillFilter filter; + if (timeDurationThreshold == null) { + filter = null; + } else if (!timeDurationThreshold.containsMonth()) { + filter = new FixedIntervalFillFilter(timeDurationThreshold.nonMonthDuration); + } else { + switch (TIMESTAMP_PRECISION) { + case "ms": + filter = + new MonthIntervalMSFillFilter( + timeDurationThreshold.monthDuration, + timeDurationThreshold.nonMonthDuration, + zoneId); + break; + case "us": + filter = + new MonthIntervalUSFillFilter( + timeDurationThreshold.monthDuration, + timeDurationThreshold.nonMonthDuration, + zoneId); + break; + case "ns": + filter = + new MonthIntervalNSFillFilter( + timeDurationThreshold.monthDuration, + timeDurationThreshold.nonMonthDuration, + zoneId); + break; + default: + // this case will never reach + throw new UnsupportedOperationException( + "not supported time_precision: " + TIMESTAMP_PRECISION); + } + } + + IFill[] previousFill = new IFill[inputColumns]; + for (int i = 0; i < inputColumns; i++) { + switch (inputDataTypes.get(i)) { + case BOOLEAN: + previousFill[i] = + filter == null + ? new BooleanPreviousFill() + : new BooleanPreviousFillWithTimeDuration(filter); + break; + case TEXT: + case STRING: + case BLOB: + case OBJECT: + previousFill[i] = + filter == null + ? new BinaryPreviousFill() + : new BinaryPreviousFillWithTimeDuration(filter); + break; + case INT32: + case DATE: + previousFill[i] = + filter == null ? new IntPreviousFill() : new IntPreviousFillWithTimeDuration(filter); + break; + case INT64: + case TIMESTAMP: + previousFill[i] = + filter == null + ? new LongPreviousFill() + : new LongPreviousFillWithTimeDuration(filter); + break; + case FLOAT: + previousFill[i] = + filter == null + ? new FloatPreviousFill() + : new FloatPreviousFillWithTimeDuration(filter); + break; + case DOUBLE: + previousFill[i] = + filter == null + ? new DoublePreviousFill() + : new DoublePreviousFillWithTimeDuration(filter); + break; + default: + throw new IllegalArgumentException(UNKNOWN_DATATYPE + inputDataTypes.get(i)); + } + } + return previousFill; + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index ea6eadbf78708..258508823700b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -19,6 +19,15 @@ package org.apache.iotdb.db.calc_commons.plan.planner; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BinaryConstantFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BooleanConstantFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.FloatConstantFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.IntConstantFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.LongConstantFill; +import org.apache.iotdb.db.calc_commons.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -98,14 +107,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.TableStreamSortOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.TableTopKOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.ValuesOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.BinaryConstantFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.BooleanConstantFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.DoubleConstantFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.FloatConstantFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.IntConstantFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.LongConstantFill; import org.apache.iotdb.db.queryengine.execution.operator.process.function.TableFunctionLeafOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.function.TableFunctionOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.gapfill.GapFillWGroupWMoOperator; @@ -152,7 +153,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.StreamingAggregationOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; -import org.apache.iotdb.db.queryengine.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; @@ -210,6 +210,9 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; +import static org.apache.iotdb.db.calc_commons.plan.planner.OperatorGeneratorUtils.UNKNOWN_DATATYPE; +import static org.apache.iotdb.db.calc_commons.plan.planner.OperatorGeneratorUtils.getLinearFill; +import static org.apache.iotdb.db.calc_commons.plan.planner.OperatorGeneratorUtils.getPreviousFill; import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.DEFAULT_GROUP_NUMBER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; @@ -226,9 +229,6 @@ import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory.createBuiltinAccumulator; import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.IDENTITY_FILL; -import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.UNKNOWN_DATATYPE; -import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.getLinearFill; -import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.getPreviousFill; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_AGGREGATION; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TableUDFUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/TableUDFUtils.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TableUDFUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/TableUDFUtils.java index 861bc701a4927..a1e2a69ab7684 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TableUDFUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/TableUDFUtils.java @@ -17,11 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.udf; +package org.apache.iotdb.db.calc_commons.plan.udf; import org.apache.iotdb.common.rpc.thrift.FunctionType; import org.apache.iotdb.common.rpc.thrift.Model; import org.apache.iotdb.commons.udf.UDFInformation; +import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.relational.AggregateFunction; import org.apache.iotdb.udf.api.relational.ScalarFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java index 07772699854de..92b282e9abc93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java @@ -15,6 +15,8 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.util; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.tsfile.utils.Binary; @@ -37,4 +39,8 @@ public static Optional getEscapeCharacter(String escape) { throw new SemanticException("Escape string must be a single character"); } } + + public static boolean isStringLiteral(final Expression expression) { + return expression instanceof StringLiteral; + } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java index 717a8522b1f7f..8fc3f82212149 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java index 5254520cc67df..2f2de6ff711be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.ILinearFill; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java index 1b9059dea536c..c10d73f403b99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableFillOperator.java index dd55e6ca4905d..00edaee90d98d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableFillOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillOperator.java index cb51a26057feb..df72932c5406e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.ILinearFill; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillWithGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillWithGroupOperator.java index b9fb7c095b1b4..95550238fb33d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillWithGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillWithGroupOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java index b2c539533f7d4..12ee422fe2e51 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java index a1e372c7a28e8..6e894c983e04a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.ILinearFill; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java index 1a4b9245cc4be..2d4cb2942fccf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java @@ -21,6 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; +import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.MarkDistinctHash; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; @@ -54,7 +55,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedVarianceAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.IntGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.AggregateFunction; 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 b99e8c6fbf380..0feb6cda37a75 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 @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.udf.UDFType; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction; -import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.db.queryengine.plan.udf.TreeUDFUtils; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 82fc54055a5c8..7659c54c8e759 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -23,6 +23,7 @@ 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.calc_commons.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; @@ -88,7 +89,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeToTableViewAdaptorOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastDescAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.db.queryengine.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java index 071b064c141ad..9815bb4cd44b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.UNKNOWN_DATATYPE; +import static org.apache.iotdb.db.calc_commons.plan.planner.OperatorGeneratorUtils.UNKNOWN_DATATYPE; public class OperatorGeneratorUtil { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index fd5a73de56fa9..52fdb04822eba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -28,6 +28,15 @@ 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.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BinaryConstantFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BooleanConstantFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.FloatConstantFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.IntConstantFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.LongConstantFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity.IdentityFill; +import org.apache.iotdb.db.calc_commons.plan.planner.OperatorGeneratorUtils; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -85,37 +94,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.TreeMergeSortOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeSortOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeTopKOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFillFilter; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.BinaryConstantFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.BooleanConstantFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.DoubleConstantFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.FloatConstantFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.IntConstantFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.LongConstantFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.filter.FixedIntervalFillFilter; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.filter.MonthIntervalMSFillFilter; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.filter.MonthIntervalNSFillFilter; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.filter.MonthIntervalUSFillFilter; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.identity.IdentityFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.identity.IdentityLinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.linear.DoubleLinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.linear.FloatLinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.linear.IntLinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.linear.LongLinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.BinaryPreviousFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.BinaryPreviousFillWithTimeDuration; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.BooleanPreviousFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.BooleanPreviousFillWithTimeDuration; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.DoublePreviousFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.DoublePreviousFillWithTimeDuration; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.FloatPreviousFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.FloatPreviousFillWithTimeDuration; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.IntPreviousFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.LongPreviousFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.LongPreviousFillWithTimeDuration; import org.apache.iotdb.db.queryengine.execution.operator.process.join.FullOuterTimeJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.HorizontallyConcatOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.InnerTimeJoinOperator; @@ -291,7 +269,6 @@ import org.apache.tsfile.read.reader.series.PaginationController; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.Pair; -import org.apache.tsfile.utils.TimeDuration; import org.apache.tsfile.write.schema.IMeasurementSchema; import org.apache.tsfile.write.schema.MeasurementSchema; import org.slf4j.Logger; @@ -328,7 +305,6 @@ import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor.getAggregationTypeByFuncName; import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions.updateFilterUsingTTL; import static org.apache.iotdb.db.queryengine.plan.statement.component.Ordering.ASC; -import static org.apache.iotdb.db.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; /** This Visitor is responsible for transferring PlanNode Tree to Operator Tree. */ public class OperatorTreeGenerator implements PlanVisitor { @@ -347,14 +323,10 @@ public class OperatorTreeGenerator implements PlanVisitor ASC_BINARY_COMPARATOR = Comparator.naturalOrder(); private static final Comparator DESC_BINARY_COMPARATOR = Comparator.reverseOrder(); - public static final String UNKNOWN_DATATYPE = "Unknown data type: "; - @Override public Operator visitPlan(PlanNode node, LocalExecutionPlanContext context) { throw new UnsupportedOperationException("should call the concrete visitXX() method"); @@ -1350,7 +1322,7 @@ private ProcessOperator getFillOperator( case PREVIOUS: return new TreeFillOperator( operatorContext, - getPreviousFill( + OperatorGeneratorUtils.getPreviousFill( inputColumns, inputDataTypes, descriptor.getTimeDurationThreshold(), @@ -1358,7 +1330,9 @@ private ProcessOperator getFillOperator( child); case LINEAR: return new TreeLinearFillOperator( - operatorContext, getLinearFill(inputColumns, inputDataTypes), child); + operatorContext, + OperatorGeneratorUtils.getLinearFill(inputColumns, inputDataTypes), + child); default: throw new IllegalArgumentException("Unknown fill policy: " + fillPolicy); } @@ -1398,133 +1372,13 @@ private IFill[] getConstantFill( constantFill[i] = new DoubleConstantFill(literal.getDouble()); break; default: - throw new IllegalArgumentException(UNKNOWN_DATATYPE + inputDataTypes.get(i)); + throw new IllegalArgumentException( + OperatorGeneratorUtils.UNKNOWN_DATATYPE + inputDataTypes.get(i)); } } return constantFill; } - public static IFill[] getPreviousFill( - int inputColumns, - List inputDataTypes, - TimeDuration timeDurationThreshold, - ZoneId zoneId) { - IFillFilter filter; - if (timeDurationThreshold == null) { - filter = null; - } else if (!timeDurationThreshold.containsMonth()) { - filter = new FixedIntervalFillFilter(timeDurationThreshold.nonMonthDuration); - } else { - switch (TIMESTAMP_PRECISION) { - case "ms": - filter = - new MonthIntervalMSFillFilter( - timeDurationThreshold.monthDuration, - timeDurationThreshold.nonMonthDuration, - zoneId); - break; - case "us": - filter = - new MonthIntervalUSFillFilter( - timeDurationThreshold.monthDuration, - timeDurationThreshold.nonMonthDuration, - zoneId); - break; - case "ns": - filter = - new MonthIntervalNSFillFilter( - timeDurationThreshold.monthDuration, - timeDurationThreshold.nonMonthDuration, - zoneId); - break; - default: - // this case will never reach - throw new UnsupportedOperationException( - "not supported time_precision: " + TIMESTAMP_PRECISION); - } - } - - IFill[] previousFill = new IFill[inputColumns]; - for (int i = 0; i < inputColumns; i++) { - switch (inputDataTypes.get(i)) { - case BOOLEAN: - previousFill[i] = - filter == null - ? new BooleanPreviousFill() - : new BooleanPreviousFillWithTimeDuration(filter); - break; - case TEXT: - case STRING: - case BLOB: - case OBJECT: - previousFill[i] = - filter == null - ? new BinaryPreviousFill() - : new BinaryPreviousFillWithTimeDuration(filter); - break; - case INT32: - case DATE: - previousFill[i] = - filter == null ? new IntPreviousFill() : new IntPreviousFillWithTimeDuration(filter); - break; - case INT64: - case TIMESTAMP: - previousFill[i] = - filter == null - ? new LongPreviousFill() - : new LongPreviousFillWithTimeDuration(filter); - break; - case FLOAT: - previousFill[i] = - filter == null - ? new FloatPreviousFill() - : new FloatPreviousFillWithTimeDuration(filter); - break; - case DOUBLE: - previousFill[i] = - filter == null - ? new DoublePreviousFill() - : new DoublePreviousFillWithTimeDuration(filter); - break; - default: - throw new IllegalArgumentException(UNKNOWN_DATATYPE + inputDataTypes.get(i)); - } - } - return previousFill; - } - - public static ILinearFill[] getLinearFill(int inputColumns, List inputDataTypes) { - ILinearFill[] linearFill = new ILinearFill[inputColumns]; - for (int i = 0; i < inputColumns; i++) { - switch (inputDataTypes.get(i)) { - case INT32: - case DATE: - linearFill[i] = new IntLinearFill(); - break; - case INT64: - case TIMESTAMP: - linearFill[i] = new LongLinearFill(); - break; - case FLOAT: - linearFill[i] = new FloatLinearFill(); - break; - case DOUBLE: - linearFill[i] = new DoubleLinearFill(); - break; - case BOOLEAN: - case TEXT: - case STRING: - case BLOB: - case OBJECT: - linearFill[i] = IDENTITY_LINEAR_FILL; - break; - default: - throw new IllegalArgumentException(UNKNOWN_DATATYPE + inputDataTypes.get(i)); - } - } - return linearFill; - } - @Override public Operator visitTransform(TransformNode node, LocalExecutionPlanContext context) { final OperatorContext operatorContext = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java index e2bd46ffeb618..18a367b010fb0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; +import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; @@ -27,7 +28,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultExpressionTraversalVisitor; -import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java index 9d8992ae3bb11..8d6d716156702 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java @@ -259,8 +259,4 @@ protected Boolean visitIfExpression(final IfExpression node, final Void context) protected Boolean visitNullIfExpression(final NullIfExpression node, final Void context) { return Boolean.FALSE; } - - public static boolean isStringLiteral(final Expression expression) { - return expression instanceof StringLiteral; - } } 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 ac8f4d725e55c..c63519343484a 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 @@ -29,6 +29,7 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; @@ -51,7 +52,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.iotdb.udf.api.customizer.analysis.AggregateFunctionAnalysis; 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 888f3f51e815e..c061fed44055a 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 @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; +import org.apache.iotdb.db.calc_commons.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.node_commons.common.SessionInfo; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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; import org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeUtils; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; 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 82bbf304651f3..25d65f513a535 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 @@ -37,6 +37,7 @@ import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.consensus.ConsensusFactory; +import org.apache.iotdb.db.calc_commons.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.conf.IoTDBConfig; @@ -54,7 +55,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceAttributeUpdater; 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; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java index 3cac464320062..bec4de93bf43d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java @@ -19,6 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.FixedIntervalFillFilter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.IntPreviousFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -27,11 +32,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeFillOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.constant.DoubleConstantFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.filter.FixedIntervalFillFilter; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.IntPreviousFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; import com.google.common.collect.ImmutableList; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index 2e7dfb726d2ea..186677df733b2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -25,6 +25,8 @@ 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.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.LinearFill; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; @@ -52,8 +54,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.TreeIntoOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeSortOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.linear.LinearFill; import org.apache.iotdb.db.queryengine.execution.operator.process.join.FullOuterTimeJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.HorizontallyConcatOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryCollectOperator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java index 778c381a581cc..039db3ded11c7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.LinearFill; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -27,10 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.identity.IdentityLinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.linear.FloatLinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.process.fill.linear.LinearFill; import com.google.common.collect.ImmutableList; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalFillFilterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalFillFilterTest.java index 04c81eb15f77b..2cc5e6bb1722e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalFillFilterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalFillFilterTest.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.fill.filter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalMSFillFilter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalNSFillFilter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalUSFillFilter; + import org.junit.Test; import java.time.Instant; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index bbcbfd169afe6..f152a9edff2e0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; @@ -59,7 +60,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; -import org.apache.iotdb.db.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.db.schemaengine.table.InformationSchemaUtils; import org.apache.iotdb.mpp.rpc.thrift.TRegionRouteReq; import org.apache.iotdb.udf.api.relational.TableFunction; From 9012adee5127f6e83358b222fdd4bf5b1cdfe394 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Wed, 15 Apr 2026 18:19:58 +0800 Subject: [PATCH 20/45] move aggregation --- .../codegen/templates/ModeAccumulator.ftl | 4 +- .../execution/aggregation/Accumulator.java | 2 +- .../aggregation/VarianceAccumulator.java | 2 +- .../execution/operator/AbstractOperator.java | 4 +- .../operator/CommonOperatorUtils.java | 28 ++++++++ .../execution/operator/Operator.java | 4 +- .../operator/process/ProcessOperator.java | 4 +- ...AbstractApproxMostFrequentAccumulator.java | 4 +- .../AbstractApproxPercentileAccumulator.java | 4 +- .../aggregation/AccumulatorFactory.java | 64 +++++++++---------- .../aggregation/AggregationMask.java | 2 +- .../aggregation/AggregationOperator.java | 12 ++-- .../ApproxCountDistinctAccumulator.java | 8 +-- .../ApproxPercentileAccumulator.java | 2 +- ...ApproxPercentileWithWeightAccumulator.java | 2 +- .../aggregation/AvgAccumulator.java | 2 +- .../BinaryApproxMostFrequentAccumulator.java | 8 +-- .../BlobApproxMostFrequentAccumulator.java | 2 +- .../BooleanApproxMostFrequentAccumulator.java | 8 +-- .../aggregation/CountAccumulator.java | 2 +- .../aggregation/CountAllAccumulator.java | 2 +- .../aggregation/CountIfAccumulator.java | 2 +- .../DoubleApproxMostFrequentAccumulator.java | 8 +-- .../aggregation/ExtremeAccumulator.java | 2 +- .../aggregation/FirstAccumulator.java | 4 +- .../aggregation/FirstByAccumulator.java | 4 +- .../aggregation/FirstByDescAccumulator.java | 2 +- .../aggregation/FirstDescAccumulator.java | 2 +- .../FloatApproxMostFrequentAccumulator.java | 8 +-- .../IntApproxMostFrequentAccumulator.java | 8 +-- .../aggregation/LastAccumulator.java | 4 +- .../aggregation/LastByAccumulator.java | 4 +- .../aggregation/LastByDescAccumulator.java | 2 +- .../aggregation/LastDescAccumulator.java | 2 +- .../LongApproxMostFrequentAccumulator.java | 8 +-- .../aggregation/MaskedRecordIterator.java | 2 +- .../aggregation/MaxAccumulator.java | 2 +- .../aggregation/MinAccumulator.java | 2 +- .../aggregation/RecordIterator.java | 2 +- .../aggregation/SumAccumulator.java | 2 +- .../aggregation/TableAccumulator.java | 2 +- .../aggregation/TableAggregator.java | 7 +- .../aggregation/TableMaxByAccumulator.java | 2 +- .../TableMaxMinByBaseAccumulator.java | 6 +- .../aggregation/TableMinByAccumulator.java | 2 +- .../aggregation/TableModeAccumulator.java | 6 +- .../aggregation/TableVarianceAccumulator.java | 4 +- ...erDefinedAggregateFunctionAccumulator.java | 2 +- .../source/relational/aggregation/Utils.java | 2 +- .../ApproxMostFrequentBucketDeserializer.java | 2 +- .../ApproxMostFrequentBucketSerializer.java | 2 +- .../aggregation/approximate/Counter.java | 2 +- .../approximate/DoublyLinkedList.java | 2 +- .../approximate/ExternalizableUtil.java | 2 +- .../aggregation/approximate/HyperLogLog.java | 2 +- .../approximate/HyperLogLogStateFactory.java | 4 +- .../aggregation/approximate/ITopK.java | 2 +- .../aggregation/approximate/ListNode2.java | 2 +- .../aggregation/approximate/Pair.java | 2 +- .../aggregation/approximate/SpaceSaving.java | 2 +- .../SpaceSavingByteCalculator.java | 2 +- .../approximate/SpaceSavingStateFactory.java | 6 +- .../approximate/StreamSummary.java | 2 +- .../aggregation/approximate/TDigest.java | 2 +- ...tGroupedApproxMostFrequentAccumulator.java | 6 +- ...actGroupedApproxPercentileAccumulator.java | 8 +-- ...yGroupedApproxMostFrequentAccumulator.java | 10 +-- ...bGroupedApproxMostFrequentAccumulator.java | 2 +- ...nGroupedApproxMostFrequentAccumulator.java | 10 +-- ...eGroupedApproxMostFrequentAccumulator.java | 10 +-- ...tGroupedApproxMostFrequentAccumulator.java | 10 +-- .../grouped/GroupedAccumulator.java | 4 +- .../grouped/GroupedAggregator.java | 11 ++-- ...GroupedApproxCountDistinctAccumulator.java | 12 ++-- .../GroupedApproxPercentileAccumulator.java | 6 +- ...ApproxPercentileWithWeightAccumulator.java | 6 +- .../grouped/GroupedAvgAccumulator.java | 8 +-- .../grouped/GroupedCountAccumulator.java | 6 +- .../grouped/GroupedCountAllAccumulator.java | 6 +- .../grouped/GroupedCountIfAccumulator.java | 6 +- .../grouped/GroupedExtremeAccumulator.java | 14 ++-- .../grouped/GroupedFirstAccumulator.java | 18 +++--- .../grouped/GroupedFirstByAccumulator.java | 18 +++--- .../grouped/GroupedLastAccumulator.java | 18 +++--- .../grouped/GroupedLastByAccumulator.java | 18 +++--- .../grouped/GroupedMaxAccumulator.java | 18 +++--- .../grouped/GroupedMaxByAccumulator.java | 2 +- .../GroupedMaxMinByBaseAccumulator.java | 18 +++--- .../grouped/GroupedMinAccumulator.java | 18 +++--- .../grouped/GroupedMinByAccumulator.java | 2 +- .../grouped/GroupedModeAccumulator.java | 12 ++-- .../grouped/GroupedSumAccumulator.java | 8 +-- ...roupedUserDefinedAggregateAccumulator.java | 10 +-- .../grouped/GroupedVarianceAccumulator.java | 10 +-- .../grouped/HashAggregationOperator.java | 14 ++-- ...tGroupedApproxMostFrequentAccumulator.java | 10 +-- ...gGroupedApproxMostFrequentAccumulator.java | 10 +-- .../grouped/StreamingAggregationOperator.java | 13 ++-- .../StreamingHashAggregationOperator.java | 16 ++--- .../aggregation/grouped/array/BigArrays.java | 2 +- .../grouped/array/BinaryBigArray.java | 2 +- .../grouped/array/BooleanBigArray.java | 10 +-- .../grouped/array/ByteBigArray.java | 10 +-- .../grouped/array/DoubleBigArray.java | 10 +-- .../grouped/array/FloatBigArray.java | 10 +-- .../grouped/array/HyperLogLogBigArray.java | 4 +- .../grouped/array/IntArrayFIFOQueue.java | 2 +- .../grouped/array/IntBigArray.java | 10 +-- .../grouped/array/IntBigArrays.java | 6 +- .../grouped/array/IntComparator.java | 2 +- .../grouped/array/LongBigArray.java | 10 +-- .../grouped/array/LongBigArrayFIFOQueue.java | 2 +- .../grouped/array/MapBigArray.java | 2 +- .../grouped/array/ObjectBigArray.java | 10 +-- .../grouped/array/ShortBigArray.java | 10 +-- .../grouped/array/SpaceSavingBigArray.java | 10 +-- .../grouped/array/TDigestBigArray.java | 4 +- .../builder/HashAggregationBuilder.java | 2 +- .../InMemoryHashAggregationBuilder.java | 8 +-- .../UnknownExpressionTypeException.java | 4 +- .../plan/planner/TableOperatorGenerator.java | 28 ++++---- .../memory/MemoryReservationManager.java | 2 +- .../ir/GlobalTimePredicateExtractVisitor.java | 9 +-- .../UserDefineScalarFunctionTransformer.java | 2 +- .../queryengine/common/MPPQueryContext.java | 2 +- .../aggregation/AccumulatorFactory.java | 8 +++ .../execution/aggregation/AvgAccumulator.java | 2 + .../aggregation/CountAccumulator.java | 2 + .../aggregation/CountIfAccumulator.java | 2 + .../aggregation/CountTimeAccumulator.java | 2 + .../aggregation/ExtremeAccumulator.java | 2 + .../aggregation/FirstValueAccumulator.java | 2 + .../aggregation/LastValueAccumulator.java | 2 + .../aggregation/MaxMinByBaseAccumulator.java | 2 + .../aggregation/MaxTimeAccumulator.java | 2 + .../aggregation/MaxValueAccumulator.java | 2 + .../aggregation/MinTimeAccumulator.java | 2 + .../aggregation/MinValueAccumulator.java | 2 + .../execution/aggregation/SumAccumulator.java | 2 + .../aggregation/TimeDurationAccumulator.java | 2 + .../execution/aggregation/TreeAggregator.java | 1 + .../aggregation/UDAFAccumulator.java | 1 + .../EmptyQueueSlidingWindowAggregator.java | 2 +- ...MonotonicQueueSlidingWindowAggregator.java | 2 +- .../NormalQueueSlidingWindowAggregator.java | 2 +- .../SlidingWindowAggregator.java | 2 +- .../SlidingWindowAggregatorFactory.java | 2 +- .../SmoothQueueSlidingWindowAggregator.java | 2 +- .../execution/driver/DataDriver.java | 2 +- .../queryengine/execution/driver/Driver.java | 4 +- .../execution/driver/SchemaDriver.java | 2 +- .../fragment/FragmentInstanceContext.java | 2 +- .../execution/operator/EmptyDataOperator.java | 1 + .../operator/ExplainAnalyzeOperator.java | 3 +- .../GroupedTopNRowNumberAccumulator.java | 4 +- .../operator/GroupedTopNRowNumberBuilder.java | 4 +- .../execution/operator/IdRegistry.java | 2 +- .../execution/operator/OperatorContext.java | 3 +- .../operator/RowReferenceTsBlockManager.java | 4 +- .../process/AbstractConsumeAllOperator.java | 5 +- .../process/AbstractFillOperator.java | 3 +- .../process/AbstractIntoOperator.java | 3 +- .../process/AbstractLinearFillOperator.java | 3 +- .../process/AbstractSortOperator.java | 3 +- .../process/AbstractTreeIntoOperator.java | 2 +- .../ActiveRegionScanMergeOperator.java | 2 +- .../process/AggregationMergeSortOperator.java | 4 +- .../operator/process/AggregationOperator.java | 2 +- .../process/AssignUniqueIdOperator.java | 3 +- .../operator/process/CollectOperator.java | 3 +- .../process/ColumnInjectOperator.java | 3 +- .../process/DeviceViewIntoOperator.java | 2 +- .../operator/process/DeviceViewOperator.java | 3 +- .../process/EnforceSingleRowOperator.java | 3 +- .../process/FilterAndProjectOperator.java | 3 +- .../operator/process/LimitOperator.java | 3 +- .../process/MappingCollectOperator.java | 6 +- .../operator/process/MergeSortOperator.java | 2 +- .../operator/process/OffsetOperator.java | 3 +- .../process/PatternRecognitionOperator.java | 9 +-- .../PreviousFillWithGroupOperator.java | 3 +- .../operator/process/ProjectOperator.java | 3 +- .../process/RawDataAggregationOperator.java | 2 +- .../process/SingleDeviceViewOperator.java | 3 +- .../SingleInputAggregationOperator.java | 3 +- .../SlidingWindowAggregationOperator.java | 2 +- .../operator/process/SortOperator.java | 2 +- .../operator/process/TableFillOperator.java | 2 +- .../operator/process/TableIntoOperator.java | 2 +- .../process/TableLinearFillOperator.java | 2 +- .../TableLinearFillWithGroupOperator.java | 8 +-- .../process/TableMergeSortOperator.java | 8 +-- .../operator/process/TableSortOperator.java | 8 +-- .../process/TableStreamSortOperator.java | 8 +-- .../operator/process/TableTopKOperator.java | 9 +-- .../process/TagAggregationOperator.java | 2 +- .../operator/process/TopKOperator.java | 3 +- .../operator/process/TransformOperator.java | 3 +- .../operator/process/TreeFillOperator.java | 2 +- .../operator/process/TreeIntoOperator.java | 2 +- .../process/TreeLinearFillOperator.java | 2 +- .../process/TreeMergeSortOperator.java | 2 +- .../operator/process/TreeSortOperator.java | 2 +- .../operator/process/TreeTopKOperator.java | 2 +- .../operator/process/ValuesOperator.java | 2 +- .../process/ai/InferenceOperator.java | 4 +- .../process/copyto/TableCopyToOperator.java | 4 +- .../function/TableFunctionLeafOperator.java | 8 +-- .../function/TableFunctionOperator.java | 10 +-- .../process/function/partition/Slice.java | 2 +- .../gapfill/AbstractGapFillOperator.java | 12 ++-- .../AbstractGapFillWGroupOperator.java | 2 +- .../AbstractGapFillWoGroupOperator.java | 2 +- .../gapfill/GapFillWGroupWMoOperator.java | 2 +- .../gapfill/GapFillWGroupWoMoOperator.java | 2 +- .../gapfill/GapFillWoGroupWMoOperator.java | 2 +- .../gapfill/GapFillWoGroupWoMoOperator.java | 2 +- .../join/FullOuterTimeJoinOperator.java | 2 +- .../join/HorizontallyConcatOperator.java | 2 +- .../process/join/InnerTimeJoinOperator.java | 4 +- .../join/LeftOuterTimeJoinOperator.java | 4 +- .../SimpleNestedLoopCrossJoinOperator.java | 12 ++-- .../join/TableLeftOuterTimeJoinOperator.java | 2 +- .../last/AbstractUpdateLastCacheOperator.java | 4 +- .../last/AlignedUpdateLastCacheOperator.java | 2 +- ...lignedUpdateViewPathLastCacheOperator.java | 2 +- .../last/LastQueryCollectOperator.java | 4 +- .../process/last/LastQueryMergeOperator.java | 4 +- .../process/last/LastQueryOperator.java | 4 +- .../process/last/LastQuerySortOperator.java | 4 +- .../last/LastQueryTransformOperator.java | 4 +- .../process/last/UpdateLastCacheOperator.java | 2 +- .../last/UpdateViewPathLastCacheOperator.java | 2 +- .../process/rowpattern/PatternAggregator.java | 6 +- .../process/window/RowNumberOperator.java | 6 +- .../process/window/TableWindowOperator.java | 13 ++-- .../process/window/TopKRankingOperator.java | 4 +- .../function/aggregate/WindowAggregator.java | 16 +++-- .../CountGroupByLevelMergeOperator.java | 4 +- .../operator/schema/CountMergeOperator.java | 4 +- .../schema/NodeManageMemoryMergeOperator.java | 4 +- .../schema/NodePathsConvertOperator.java | 4 +- .../schema/NodePathsCountOperator.java | 4 +- .../schema/SchemaFetchMergeOperator.java | 4 +- .../schema/SchemaQueryMergeOperator.java | 4 +- .../SchemaQueryOrderByHeatOperator.java | 4 +- .../operator/sink/IdentitySinkOperator.java | 2 +- .../operator/sink/ShuffleHelperOperator.java | 2 +- .../execution/operator/sink/SinkOperator.java | 2 +- .../source/AbstractSourceOperator.java | 2 +- .../operator/source/SourceOperator.java | 2 +- .../AbstractAggTableScanOperator.java | 15 +++-- .../AbstractAsofMergeSortJoinOperator.java | 2 +- .../AbstractDefaultAggTableScanOperator.java | 2 +- .../AbstractMergeSortJoinOperator.java | 13 ++-- .../relational/AbstractTableScanOperator.java | 11 ++-- .../AsofMergeSortInnerJoinOperator.java | 2 +- .../AsofMergeSortLeftJoinOperator.java | 2 +- .../DeviceIteratorScanOperator.java | 8 +-- ...formationSchemaContentSupplierFactory.java | 4 +- .../LastQueryAggTableScanOperator.java | 10 +-- .../relational/MarkDistinctOperator.java | 8 +-- .../MeasurementToTableViewAdaptorUtils.java | 2 +- .../MergeSortFullOuterJoinOperator.java | 7 +- .../MergeSortInnerJoinOperator.java | 2 +- .../relational/MergeSortLeftJoinOperator.java | 2 +- .../relational/MergeSortSemiJoinOperator.java | 2 +- ...gnedDeviceViewAggregationScanOperator.java | 6 +- .../TreeToTableViewAdaptorOperator.java | 4 +- .../plan/analyze/ExpressionAnalyzer.java | 2 +- .../plan/analyze/ExpressionUtils.java | 2 +- .../plan/analyze/PredicateUtils.java | 2 +- .../DataNodeTableOperatorGenerator.java | 8 +-- .../planner/LocalExecutionPlanContext.java | 2 +- .../plan/planner/LocalExecutionPlanner.java | 2 +- .../plan/planner/OperatorTreeGenerator.java | 6 +- .../plan/planner/PipelineDriverFactory.java | 2 +- ...umeAllChildrenPipelineMemoryEstimator.java | 2 +- ...ildrenOneByOnePipelineMemoryEstimator.java | 2 +- .../memory/FakedMemoryReservationManager.java | 2 + ...NotThreadSafeMemoryReservationManager.java | 1 + .../memory/PipelineMemoryEstimator.java | 2 +- .../PipelineMemoryEstimatorFactory.java | 2 +- .../planner/plan/node/PlanGraphPrinter.java | 3 - .../ConvertPredicateToFilterVisitor.java | 4 +- .../relational/planner/PredicateUtils.java | 2 +- .../PushPredicateIntoTableScan.java | 2 +- .../dag/input/TsBlockInputDataSet.java | 2 +- .../utils/ResourceByPathUtils.java | 2 +- .../memtable/AbstractWritableMemChunk.java | 2 +- .../reader/common/PriorityMergeReader.java | 2 +- .../DataRegionTableSizeQueryContext.java | 2 +- .../iotdb/db/utils/sort/TableDiskSpiller.java | 7 +- .../aggregation/AccumulatorTest.java | 1 + .../AggregationMergeSortOperatorTest.java | 2 +- .../operator/AggregationOperatorTest.java | 3 +- .../DeviceIteratorScanOperatorTest.java | 1 + .../operator/DeviceViewIntoOperatorTest.java | 1 + .../operator/DeviceViewOperatorTest.java | 1 + .../execution/operator/FillOperatorTest.java | 1 + .../operator/LastQueryMergeOperatorTest.java | 1 + .../operator/MergeTreeSortOperatorTest.java | 1 + ...nedTreeDeviceViewScanOperatorTreeTest.java | 3 +- .../operator/OperatorMemoryTest.java | 1 + .../RawDataAggregationOperatorTest.java | 2 +- .../operator/SortOperatorSortBranchTest.java | 1 + .../operator/TransformOperatorTest.java | 1 + .../operator/TreeIntoOperatorTest.java | 1 + .../operator/TreeLinearFillOperatorTest.java | 1 + .../operator/TreeSortOperatorTest.java | 1 + .../operator/TreeTopKOperatorTest.java | 1 + .../ViewFromTreeAdaptorOperatorTest.java | 1 + .../process/TableStreamSortOperatorTest.java | 7 +- .../operator/process/ValuesOperatorTest.java | 5 +- .../gapfill/GapFillWGroupWMoOperatorTest.java | 7 +- .../GapFillWGroupWoMoOperatorTest.java | 7 +- .../GapFillWoGroupWMoOperatorTest.java | 10 +-- .../GapFillWoGroupWoMoOperatorTest.java | 10 +-- .../join/InnerTimeJoinOperatorTest.java | 2 +- .../join/LeftOuterTimeJoinOperatorTest.java | 2 +- .../tvf/TableFunctionOperatorTest.java | 4 +- .../process/window/RowNumberOperatorTest.java | 7 +- .../window/TableWindowOperatorTest.java | 7 +- .../window/TableWindowOperatorTestUtils.java | 22 ++++--- .../window/TopKRankingOperatorTest.java | 7 +- .../window/function/FunctionTestUtils.java | 4 +- .../AggregationWindowFunctionTest.java | 15 +++-- .../function/rank/CumeDistFunctionTest.java | 6 +- .../function/rank/DenseRankFunctionTest.java | 6 +- .../function/rank/NTileFunctionTest.java | 15 +++-- .../rank/PercentRankFunctionTest.java | 6 +- .../function/rank/RankFunctionTest.java | 6 +- .../function/rank/RowNumberFunctionTest.java | 6 +- .../value/FirstValueFunctionTest.java | 9 +-- .../function/value/LagFunctionTest.java | 21 +++--- .../function/value/LastValueFunctionTest.java | 9 +-- .../function/value/LeadFunctionTest.java | 21 +++--- .../function/value/NthValueFunctionTest.java | 15 +++-- .../SinkOperatorDownStreamNodeIdTest.java | 2 +- .../plan/planner/PipelineBuilderTest.java | 2 +- .../AggregationTableScanTest.java | 20 +++--- .../analyzer/AggregationCornerCaseTest.java | 12 ++-- .../analyzer/AsofInnerJoinOperatorTest.java | 4 +- .../plan/relational/analyzer/JoinTest.java | 4 +- .../builder/EvaluationDAGBuilderTest.java | 2 +- .../memtable/PrimitiveMemTableTest.java | 2 +- 346 files changed, 962 insertions(+), 799 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/aggregation/Accumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/aggregation/VarianceAccumulator.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/AbstractOperator.java (96%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorUtils.java rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/Operator.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/ProcessOperator.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/AccumulatorFactory.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/AggregationMask.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/AggregationOperator.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/AvgAccumulator.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/CountAccumulator.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/CountAllAccumulator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/CountIfAccumulator.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/ExtremeAccumulator.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/FirstAccumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/FirstByAccumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/FirstDescAccumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/LastAccumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/LastByAccumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/LastByDescAccumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/LastDescAccumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/MaskedRecordIterator.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/MaxAccumulator.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/MinAccumulator.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/RecordIterator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/SumAccumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/TableAccumulator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/TableAggregator.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/TableMinByAccumulator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/TableModeAccumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/Utils.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/Counter.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/ITopK.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/ListNode2.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/Pair.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/StreamSummary.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/approximate/TDigest.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java (80%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/expression/UnknownExpressionTypeException.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/planner/memory/MemoryReservationManager.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java (97%) diff --git a/iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl b/iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl index cb920508ffeb7..4b1097dfd1dc0 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl @@ -21,9 +21,9 @@ <#list allDataTypes.types as type> <#assign className = "${type.dataType?cap_first}ModeAccumulator"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/queryengine/execution/aggregation/${className}.java" /> + <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/aggregation/${className}.java" /> -package org.apache.iotdb.db.queryengine.execution.aggregation; +package org.apache.iotdb.db.calc_commons.execution.aggregation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.external.commons.collections4.comparators.ComparatorChain; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/Accumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/aggregation/Accumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/Accumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/aggregation/Accumulator.java index a2599bc811eca..4f6ab0909f96a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/Accumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/aggregation/Accumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.aggregation; +package org.apache.iotdb.db.calc_commons.execution.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/VarianceAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/aggregation/VarianceAccumulator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/VarianceAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/aggregation/VarianceAccumulator.java index 8d27f1497e06d..9057e61254eda 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/VarianceAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/aggregation/VarianceAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.aggregation; +package org.apache.iotdb.db.calc_commons.execution.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AbstractOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/AbstractOperator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AbstractOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/AbstractOperator.java index 41d1f163f81ce..801265e94a38d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AbstractOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/AbstractOperator.java @@ -17,7 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator; +package org.apache.iotdb.db.calc_commons.execution.operator; + +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.common.conf.TSFileDescriptor; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorUtils.java new file mode 100644 index 0000000000000..df3f315cc38ab --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorUtils.java @@ -0,0 +1,28 @@ +/* + * 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.calc_commons.execution.operator; + +import org.apache.tsfile.read.common.block.column.LongColumn; + +import java.util.Optional; + +public class CommonOperatorUtils { + public static final String CURRENT_DEVICE_INDEX_STRING = "CurrentDeviceIndex"; + public static final LongColumn TIME_COLUMN_TEMPLATE = + new LongColumn(1, Optional.empty(), new long[] {0}); + public static final String CURRENT_USED_MEMORY = "CurrentUsedMemory"; + public static final String MAX_USED_MEMORY = "MaxUsedMemory"; + public static final String MAX_RESERVED_MEMORY = "MaxReservedMemory"; +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/Operator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/Operator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/Operator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/Operator.java index c0aeeb967b1b7..1fd73b6d3b9f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/Operator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/Operator.java @@ -17,7 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator; +package org.apache.iotdb.db.calc_commons.execution.operator; + +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProcessOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ProcessOperator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProcessOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ProcessOperator.java index 55c61f33f8af2..b5afe991e457e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProcessOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ProcessOperator.java @@ -17,8 +17,8 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; public interface ProcessOperator extends Operator {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java index 68128c94f58c5..c193f726e7864 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import com.google.gson.Gson; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java index df8b723638281..1fe167e1cc710 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.TDigest; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java index 2d4cb2942fccf..85ae0b7dfb6e0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java @@ -17,44 +17,44 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; +import org.apache.iotdb.db.calc_commons.execution.aggregation.VarianceAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.BinaryGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.BlobGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.BooleanGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.DoubleGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.FloatGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedApproxCountDistinctAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedApproxPercentileAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedApproxPercentileWithWeightAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAvgAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedCountAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedCountAllAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedCountIfAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedExtremeAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedFirstAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedFirstByAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedLastAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedLastByAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMaxAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMaxByAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMinAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMinByAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedModeAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedSumAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedUserDefinedAggregateAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedVarianceAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.IntGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.MarkDistinctHash; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.execution.aggregation.VarianceAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.BinaryGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.BlobGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.BooleanGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.DoubleGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.FloatGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedApproxCountDistinctAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedApproxPercentileAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedApproxPercentileWithWeightAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedAvgAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedCountAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedCountAllAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedCountIfAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedExtremeAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedFirstAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedFirstByAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedLastAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedLastByAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedMaxAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedMaxByAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedMinAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedMinByAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedModeAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedSumAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedUserDefinedAggregateAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedVarianceAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.IntGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.AggregateFunction; @@ -82,8 +82,8 @@ import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.FIRST_BY; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST_BY; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isMeasurementColumn; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; +import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isMeasurementColumn; +import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; import static org.apache.tsfile.read.common.type.IntType.INT32; public class AccumulatorFactory { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AggregationMask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AggregationMask.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java index 8b439f5d0d746..d98a8237b6fc5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AggregationMask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AggregationOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java index 2883b3b02e1c2..08fa0a54de4b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; @@ -111,7 +111,7 @@ public TsBlock next() throws Exception { finished = true; return TsBlock.wrapBlocksWithoutCopy( - 1, new RunLengthEncodedColumn(TableScanOperator.TIME_COLUMN_TEMPLATE, 1), valueColumns); + 1, new RunLengthEncodedColumn(CommonOperatorUtils.TIME_COLUMN_TEMPLATE, 1), valueColumns); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java index ef31759ee677b..5e3431041542a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.HyperLogLog; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.HyperLogLogStateFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLogStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -27,7 +27,7 @@ import org.apache.tsfile.write.UnSupportedDataTypeException; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.HyperLogLog.DEFAULT_STANDARD_ERROR; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog.DEFAULT_STANDARD_ERROR; public class ApproxCountDistinctAccumulator implements TableAccumulator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java index 2f95942caa4a1..866d08d340b4e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java index f52165472f7ec..5270e56d5fc31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AvgAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AvgAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java index 7bb03faadeb7d..c1e8f2f3e9987 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/AvgAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java index 1fe0370a4dba4..3e3410083c2bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java index 67ce419e2839c..156aa9b7d15e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import com.google.gson.Gson; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java index f080157e82f94..6effa8f8fc7c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/CountAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/CountAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java index ce85c22363232..0cde3980d3388 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/CountAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/CountAllAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/CountAllAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java index f72cea243580d..970ab6c97b72a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/CountAllAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/CountIfAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/CountIfAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java index 1aff9106c7284..1791475015851 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/CountIfAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java index 52444a88d9a27..434f755b45341 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/ExtremeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/ExtremeAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java index f2fdf2439bae3..759b427f7b458 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/ExtremeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java index d1f04cfdc920f..e77cd07d8e381 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -36,7 +36,7 @@ import java.nio.charset.StandardCharsets; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; public class FirstAccumulator implements TableAccumulator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstByAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstByAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java index 90057390a9b25..6df04956c51f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstByAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -35,7 +35,7 @@ import java.nio.charset.StandardCharsets; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; public class FirstByAccumulator implements TableAccumulator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java index c6f310048adb0..da721bfd3b645 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstDescAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstDescAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java index 17103ab683898..fbd88495cbd5c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FirstDescAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java index 5515158516628..7814079616fab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java index 283cbd18d6997..9149a1f23b8dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java index 4da324e8b0372..27ce31f42e3ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -36,7 +36,7 @@ import java.nio.charset.StandardCharsets; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; public class LastAccumulator implements TableAccumulator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastByAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastByAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java index 711b5efd13a2e..c7b1d5daebb05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastByAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -33,7 +33,7 @@ import org.apache.tsfile.write.UnSupportedDataTypeException; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; public class LastByAccumulator implements TableAccumulator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastByDescAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastByDescAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java index d664f2286d6a8..16531c5eb524c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastByDescAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastDescAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastDescAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java index 80c1227056f49..e8e8727c6a56f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LastDescAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java index 348a6aeb646ef..072ca84bc8e98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MaskedRecordIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MaskedRecordIterator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java index 48095927eda56..0148c950d379d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MaskedRecordIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MaxAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MaxAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java index 373fc9bd26437..f749e766ad994 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MaxAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MinAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MinAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java index 8f2a7113b7bcc..97b76de2b0534 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/MinAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/RecordIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/RecordIterator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java index fcb0bf93cfd9b..2dbda97411a3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/RecordIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.utils.ObjectTypeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/SumAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/SumAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java index 6f42e1a9995f3..d2f4ee99adba5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/SumAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java index 7858c53c0331b..1df3575839953 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableAggregator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java index 9c18dd1b42d56..3baf1a915afcf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java @@ -17,8 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import com.google.common.primitives.Ints; @@ -35,7 +36,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator.QUERY_EXECUTION_METRICS; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet.AGGREGATION_FROM_RAW_DATA; public class TableAggregator { @@ -74,7 +74,8 @@ public void processBlock(TsBlock block) { if (arguments.length == 0) { arguments = new Column[] { - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, block.getPositionCount()) + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, block.getPositionCount()) }; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java index ef0ebbb2b7955..37ca08186e672 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java index c6002304b1070..f42c8403d5358 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -35,8 +35,8 @@ import java.util.Collections; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.Utils.calcTypeSize; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.Utils.serializeValue; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.calcTypeSize; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeValue; /** max(x,y) returns the value of x associated with the maximum value of y over all input values. */ public abstract class TableMaxMinByBaseAccumulator implements TableAccumulator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableMinByAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableMinByAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java index d4fbadae512e2..4bffe0cfc9f70 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableMinByAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableModeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableModeAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java index adb47e41231a7..01c3609d1580f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableModeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -36,8 +36,8 @@ import java.util.Map; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.Utils.UNSUPPORTED_TYPE_MESSAGE; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.Utils.serializeBinaryValue; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.UNSUPPORTED_TYPE_MESSAGE; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeBinaryValue; import static org.apache.tsfile.utils.BytesUtils.bytesToBool; import static org.apache.tsfile.utils.BytesUtils.bytesToLongFromOffset; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java index 92ea803f2d0ac..249832afcf8c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.db.queryengine.execution.aggregation.VarianceAccumulator; +import org.apache.iotdb.db.calc_commons.execution.aggregation.VarianceAccumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java index 70e1c0c5d4432..1a586744213e8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.udf.api.State; import org.apache.iotdb.udf.api.customizer.analysis.AggregateFunctionAnalysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/Utils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/Utils.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/Utils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/Utils.java index c6c4b365637ca..41998b9510c41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/Utils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/Utils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java index 6a2b4ad4d2b7a..311ffefbf2a0e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java index 87377252bf3a1..74c3669918b0c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/Counter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/Counter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java index 319c8bc8e31c5..5c5d1634d62da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/Counter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.io.Externalizable; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java index 2aa2e47efcdae..9f0219e165eb1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.util.ConcurrentModificationException; import java.util.Iterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java index e0de4b6e66ffe..6c289948a0aea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.io.ByteArrayOutputStream; import java.io.Externalizable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java index e4ffb4a71880c..248a326fd6da6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java index b7e88d0c3a79a..c2f13423ff3a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.HyperLogLogBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.HyperLogLogBigArray; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ITopK.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ITopK.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java index 8624551aa5415..a14129ef2baba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ITopK.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ListNode2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ListNode2.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java index 09c5c7d449730..054e2bf0ce7be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/ListNode2.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; public class ListNode2 { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/Pair.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/Pair.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java index 3bb4d8000f0be..e0a845aeda32f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/Pair.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; public class Pair { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java index 5f5cddf574725..c6412bfd7ac79 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; import com.google.common.collect.ImmutableMap; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java index a2388cf02c236..333615e3024c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java index 4a13fc316c610..e2aaa1cce89da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java @@ -12,14 +12,14 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.utils.RamUsageEstimator; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSaving.getDefaultEstimatedSize; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving.getDefaultEstimatedSize; public class SpaceSavingStateFactory { public static SingleSpaceSavingState createSingleState() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/StreamSummary.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/StreamSummary.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java index afd1c7468ced6..5a706733d54dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/StreamSummary.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.io.ByteArrayInputStream; import java.io.Externalizable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/TDigest.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/TDigest.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java index f240c156c5234..d6e85d0ebe6a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/approximate/TDigest.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java index 30542c0e87586..6ec7a24d21951 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import com.google.gson.Gson; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java index 4350c7a7aed2f..fa9005921c057 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.TDigest; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.TDigestBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.TDigestBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java index 85a39f1b51432..51c249df83938 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java @@ -12,13 +12,13 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.BinaryApproxMostFrequentAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.BinaryApproxMostFrequentAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java index 1fb15d57444b6..b6469834a15d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; import com.google.gson.Gson; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java index 59e01206d4364..89093e271aac9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java @@ -12,13 +12,13 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.BooleanApproxMostFrequentAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.BooleanApproxMostFrequentAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java index 94fbc900855fc..5eee963c441d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java @@ -12,13 +12,13 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.DoubleApproxMostFrequentAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.DoubleApproxMostFrequentAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java index d463f7c280802..0a2005a3ad503 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java @@ -12,13 +12,13 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.FloatApproxMostFrequentAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.FloatApproxMostFrequentAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java index c9c0c73d5c22d..26fb7f0bae2a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java index 50034a9dfbace..5d58a2bc61d57 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; @@ -34,7 +35,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; public class GroupedAggregator { private final GroupedAccumulator accumulator; @@ -70,7 +70,10 @@ public void processBlock(int groupCount, int[] groupIds, TsBlock block) { // process count(*) if (arguments.length == 0) { arguments = - new Column[] {new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, block.getPositionCount())}; + new Column[] { + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, block.getPositionCount()) + }; } if (step.isInputRaw()) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java index 9fac50c2ad24c..06de04d0ca8ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.HyperLogLog; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.HyperLogLogStateFactory; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.HyperLogLogBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLogStateFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.HyperLogLogBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -26,7 +26,7 @@ import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.write.UnSupportedDataTypeException; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.HyperLogLog.DEFAULT_STANDARD_ERROR; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog.DEFAULT_STANDARD_ERROR; public class GroupedApproxCountDistinctAccumulator implements GroupedAccumulator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java index 9a2bfedf4eaf0..fd39f3677d8c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java index b7c587df0d0b4..a54cc656465a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.TDigest; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java index 4e177c352b7de..4bcecc1349d25 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java index 7ffc10a08a4f4..4a3fcc03943a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java index afa5c1e34e057..38ff56d2a2159 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java index b7ab8b3882c85..cd41ced42066f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java index f53ea59314231..47806eb1ddf43 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java index 456b46c24ac19..a974ab90ee95b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java index fa713d07c9cb6..615808f3e6f1d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java index 632e9fdb50ee0..c7826f456aeea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java index cb628858d63ca..9e98baeaf2297 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java index ed47c96d25137..59b292e6649f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java index d46ad3ce41172..8757b3724d43b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java index b9b25f6271552..fd204747a4de8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java index 8fa9b4d8fa018..37bf836d9395b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java index 3b8d48bbd4955..ad08f997d59cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java index a5bf82c5f409b..6697117e3bcc1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.MapBigArray; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.MapBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -39,8 +39,8 @@ import java.util.Map; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.Utils.UNSUPPORTED_TYPE_MESSAGE; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.Utils.serializeBinaryValue; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.UNSUPPORTED_TYPE_MESSAGE; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeBinaryValue; import static org.apache.tsfile.utils.BytesUtils.bytesToBool; import static org.apache.tsfile.utils.BytesUtils.bytesToLongFromOffset; import static org.apache.tsfile.utils.TsPrimitiveType.getByType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java index 0c0325ebd0b30..19f6c31aa315e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java index 9ac6b48db7cc4..034e6193faf62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.MaskedRecordIterator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.RecordIterator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.ObjectBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.MaskedRecordIterator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.RecordIterator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.ObjectBigArray; import org.apache.iotdb.udf.api.State; import org.apache.iotdb.udf.api.relational.AggregateFunction; import org.apache.iotdb.udf.api.utils.ResultValue; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java index cb6123b636f33..d04991791556e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.queryengine.execution.aggregation.VarianceAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.db.calc_commons.execution.aggregation.VarianceAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java index 25c38676bf6b3..43096b6bded3d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -38,8 +38,8 @@ import java.util.Optional; import static com.google.common.base.Preconditions.checkState; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.CURRENT_USED_MEMORY; import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; -import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter.CURRENT_USED_MEMORY; public class HashAggregationOperator extends AbstractOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java index 42ea037aecf9e..191730fd699f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java @@ -12,13 +12,13 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.IntApproxMostFrequentAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.IntApproxMostFrequentAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java index 2e2d3dfb3c6ea..2a3155d6026db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java @@ -12,13 +12,13 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LongApproxMostFrequentAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LongApproxMostFrequentAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java index fc8f91b4307c1..922ab0503e3ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.primitives.Ints; @@ -206,8 +206,7 @@ private void evaluateAndFlushGroup(TsBlock page, int position, boolean lastCalcu outputs.add( resultBuilder.build( new RunLengthEncodedColumn( - AbstractTableScanOperator.TIME_COLUMN_TEMPLATE, - resultBuilder.getPositionCount()))); + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount()))); resultBuilder.reset(); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java index 3ace018383d34..b13231c27c538 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.primitives.Ints; @@ -45,9 +45,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.CURRENT_USED_MEMORY; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.MAX_USED_MEMORY; import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; -import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter.CURRENT_USED_MEMORY; -import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter.MAX_USED_MEMORY; public class StreamingHashAggregationOperator extends AbstractOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java index ffc84077341fa..4b763d7b11d5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; // Note: this code was forked from fastutil (http://fastutil.di.unimi.it/) // Copyright (C) 2010-2013 Sebastiano Vigna diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java index f008e704618c0..acbd46d80e706 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java index 9439cf84020b6..326776c84512f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java index aeea9f985e698..cec56569d6114 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfByteArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java index df6b42005543c..a59f524a6dce2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfDoubleArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java index e10c1a26710cc..a237134ad6121 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfFloatArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java index eeca4f849ee99..e687e56ff9520 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.HyperLogLog; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java index b80b33ccde37e..1c518d59f0f48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java index e124612b721ce..bda05818ea3f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfIntArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java index fbc2a4f185276..96339f6028cc9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SHIFT; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SHIFT; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; // Note: this code was forked from fastutil (http://fastutil.di.unimi.it/) // Copyright (C) 2010-2013 Sebastiano Vigna diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java index e562d49b0ed6a..7fd4c8ff425bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; // Note: this code was forked from fastutil (http://fastutil.di.unimi.it/) // Copyright (C) 2010-2013 Sebastiano Vigna diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java index 5f35525d1e4af..a4ed5c7148a69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfLongArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java index 24c25dfb62c63..141920ef489eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.NoSuchElementException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java index 1be73705b31a3..c169d335b377c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import org.apache.tsfile.utils.TsPrimitiveType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java index b5585824e431d..a005c5d487348 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; import java.util.function.Consumer; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfObjectArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java index 38bdb76b7331d..42e69a96c06d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import com.google.common.primitives.Shorts; import java.util.Arrays; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfShortArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java similarity index 80% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java index 1c120271d95ea..d20e1ad4a5f6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.ApproxMostFrequentBucketDeserializer; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.ApproxMostFrequentBucketSerializer; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.SpaceSavingByteCalculator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.ApproxMostFrequentBucketDeserializer; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.ApproxMostFrequentBucketSerializer; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingByteCalculator; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java index 81ab7cf92141a..704b571fdad9e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java index 0fc8ab0a4d9b3..644b62b22986d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.builder; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java index 55ab475d9ff81..005c5943f5616 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.builder; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; @@ -252,7 +252,7 @@ private TsBlock buildResult(Iterator groupIds) { return TsBlock.wrapBlocksWithoutCopy( pageBuilder.getPositionCount(), new RunLengthEncodedColumn( - TableScanOperator.TIME_COLUMN_TEMPLATE, pageBuilder.getPositionCount()), + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, pageBuilder.getPositionCount()), Arrays.stream(pageBuilder.getValueColumnBuilders()) .map(ColumnBuilder::build) .toArray(Column[]::new)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/expression/UnknownExpressionTypeException.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/expression/UnknownExpressionTypeException.java index 459f19680d66f..f56a02db6bdba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/expression/UnknownExpressionTypeException.java @@ -17,7 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.expression; +package org.apache.iotdb.db.calc_commons.plan.expression; + +import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; public class UnknownExpressionTypeException extends IllegalArgumentException { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 258508823700b..6ddd813e2367c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.calc_commons.plan.planner; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BinaryConstantFill; @@ -27,6 +28,16 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.FloatConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.IntConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.LongConstantFill; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingAggregationOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; import org.apache.iotdb.db.calc_commons.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; @@ -88,7 +99,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.AssignUniqueIdOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.CollectOperator; @@ -143,16 +153,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.MergeSortInnerJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.MergeSortLeftJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.MergeSortSemiJoinOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastByDescAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastDescAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.StreamingAggregationOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; @@ -210,6 +210,9 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createAccumulator; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createBuiltinAccumulator; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; import static org.apache.iotdb.db.calc_commons.plan.planner.OperatorGeneratorUtils.UNKNOWN_DATATYPE; import static org.apache.iotdb.db.calc_commons.plan.planner.OperatorGeneratorUtils.getLinearFill; import static org.apache.iotdb.db.calc_commons.plan.planner.OperatorGeneratorUtils.getPreviousFill; @@ -225,9 +228,6 @@ import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; import static org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory.createAccumulator; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory.createBuiltinAccumulator; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.IDENTITY_FILL; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/MemoryReservationManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/memory/MemoryReservationManager.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/MemoryReservationManager.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/memory/MemoryReservationManager.java index 6239367312015..f7e77df2a7ac5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/MemoryReservationManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/memory/MemoryReservationManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.planner.memory; +package org.apache.iotdb.db.calc_commons.plan.planner.memory; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java index ed3f8c85e97f5..c19cc2be15a75 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java @@ -17,10 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +package org.apache.iotdb.db.calc_commons.plan.relational.planner.ir; +import org.apache.iotdb.db.calc_commons.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; @@ -37,8 +39,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.tsfile.utils.Pair; @@ -52,7 +52,8 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; public class GlobalTimePredicateExtractVisitor - extends AstVisitor, GlobalTimePredicateExtractVisitor.Context> { + extends CommonQueryAstVisitor< + Pair, GlobalTimePredicateExtractVisitor.Context> { private static final String NOT_SUPPORTED = "visit() not implemented for %s in GlobalTimePredicateExtract."; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java index 66d3da3ec5348..48d37be899396 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.udf; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.RecordIterator; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.RecordIterator; import org.apache.iotdb.udf.api.relational.ScalarFunction; import org.apache.iotdb.udf.api.relational.access.Record; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java index 3fc29d3ad003b..bc18bb75375fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.audit.IAuditEntity; import org.apache.iotdb.commons.auth.entity.PrivilegeType; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.analyze.lock.SchemaLockType; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.plan.planner.memory.NotThreadSafeMemoryReservationManager; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.statistics.QueryPlanStatistics; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java index fb7938309af09..875b3428f6bce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java @@ -21,6 +21,14 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.db.calc_commons.execution.aggregation.BinaryModeAccumulator; +import org.apache.iotdb.db.calc_commons.execution.aggregation.BooleanModeAccumulator; +import org.apache.iotdb.db.calc_commons.execution.aggregation.DoubleModeAccumulator; +import org.apache.iotdb.db.calc_commons.execution.aggregation.FloatModeAccumulator; +import org.apache.iotdb.db.calc_commons.execution.aggregation.IntModeAccumulator; +import org.apache.iotdb.db.calc_commons.execution.aggregation.LongModeAccumulator; +import org.apache.iotdb.db.calc_commons.execution.aggregation.VarianceAccumulator; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AvgAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AvgAccumulator.java index 6549a7a6748e9..62d18e42625b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AvgAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AvgAccumulator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountAccumulator.java index ad002f10a87ab..bce369a83718f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountAccumulator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountIfAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountIfAccumulator.java index 6c2fb9bc84eca..34896d529118e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountIfAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountIfAccumulator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountTimeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountTimeAccumulator.java index 23544d82a8af0..0580250fef3b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountTimeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountTimeAccumulator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/ExtremeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/ExtremeAccumulator.java index 13bdb9fecdd3e..07fcc81d99344 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/ExtremeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/ExtremeAccumulator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/FirstValueAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/FirstValueAccumulator.java index f375ca954f344..dcb9855656e52 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/FirstValueAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/FirstValueAccumulator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/LastValueAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/LastValueAccumulator.java index ede59373461b4..5fa014b569992 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/LastValueAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/LastValueAccumulator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxMinByBaseAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxMinByBaseAccumulator.java index ebbd1aa6dc149..aa53098f4a2e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxMinByBaseAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxMinByBaseAccumulator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxTimeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxTimeAccumulator.java index e4b45a012e968..3d9881ba736dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxTimeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxTimeAccumulator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxValueAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxValueAccumulator.java index e507d533fa63e..617136b6bf710 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxValueAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxValueAccumulator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinTimeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinTimeAccumulator.java index 84d2a53ddc397..8d2159ac7c98e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinTimeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinTimeAccumulator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinValueAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinValueAccumulator.java index 58f6da51401c1..1c1ee17ff177e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinValueAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinValueAccumulator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/SumAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/SumAccumulator.java index 066d8cd4fc5d3..115c643597f44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/SumAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/SumAccumulator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TimeDurationAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TimeDurationAccumulator.java index eebd8151e786f..88a502a7faee4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TimeDurationAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TimeDurationAccumulator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; + import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java index 578c8825e881e..b7d3e7e9c0741 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java index 73ec966b84b64..d0f6dfa5ff90f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDFParametersFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java index c0225f2bf2636..65e7a499f70fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java index e2cfe3aaa0d6a..bde7e1ee38a07 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java index 6011b7e40e567..693620b94652d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java index 1021297155273..ceb691a4bdb04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java index 7e041e8551a76..55bd3d967dd58 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java index 68fca4e36782e..a1ad4f5ecb8a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java index c9c41f5b993ab..9632ba6a4a8ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.driver; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.source.DataSourceOperator; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java index ad5eba152292e..e0a06ae2ae73f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.utils.FileUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.schedule.task.DriverTaskId; import org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet; @@ -55,7 +55,7 @@ import static com.google.common.base.Verify.verify; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static java.lang.Boolean.TRUE; -import static org.apache.iotdb.db.queryengine.execution.operator.Operator.NOT_BLOCKED; +import static org.apache.iotdb.db.calc_commons.execution.operator.Operator.NOT_BLOCKED; import static org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet.DRIVER_INTERNAL_PROCESS; public abstract class Driver implements IDriver { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/SchemaDriver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/SchemaDriver.java index e3230b7ff7f33..b86aeb13e6b4a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/SchemaDriver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/SchemaDriver.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.driver; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import com.google.common.util.concurrent.SettableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java index 66f98ff4f6e68..c50c1720b23fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.PatternTreeMap; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; @@ -38,7 +39,6 @@ import org.apache.iotdb.db.queryengine.metric.QueryRelatedResourceMetricSet; import org.apache.iotdb.db.queryengine.metric.QueryResourceMetricSet; import org.apache.iotdb.db.queryengine.metric.SeriesScanCostMetricSet; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.plan.planner.memory.ThreadSafeMemoryReservationManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.TimePredicate; import org.apache.iotdb.db.storageengine.StorageEngine; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java index 0e902bdd4f483..9653b4a39cfbb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java index f3115ff03d27e..b9fdd7a495f83 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java @@ -24,12 +24,13 @@ import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.execution.QueryExecution; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberAccumulator.java index 81a489dccc0b1..245071da905fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberAccumulator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; import org.apache.iotdb.db.utils.HeapTraversal; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberBuilder.java index 03e955d791bfe..15a3ad259b328 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberBuilder.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableList; @@ -35,7 +35,7 @@ import java.util.Iterator; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class GroupedTopNRowNumberBuilder implements GroupedTopNBuilder { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/IdRegistry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/IdRegistry.java index 35661335ca9cf..ad87c4fe25f39 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/IdRegistry.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/IdRegistry.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.IntArrayFIFOQueue; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntArrayFIFOQueue; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java index aa6201d83433d..fafaa47f0b2e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java @@ -37,7 +37,8 @@ import java.util.concurrent.TimeUnit; /** - * Contains information about {@link Operator} execution. + * Contains information about {@link org.apache.iotdb.db.calc_commons.execution.operator.Operator} + * execution. * *

    Not thread-safe. */ diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowReferenceTsBlockManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowReferenceTsBlockManager.java index ce6868eb55c75..d56257a00b03a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowReferenceTsBlockManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowReferenceTsBlockManager.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractConsumeAllOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractConsumeAllOperator.java index 636102a015af4..6d02d885c3cd9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractConsumeAllOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractConsumeAllOperator.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java index 8fc3f82212149..86ae28d27fd04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java index 425449469b8bd..4df031d59a8e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java @@ -21,10 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.IntoProcessException; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java index 2f2de6ff711be..03fd0c432c905 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractSortOperator.java index 73aea0e32e688..2a1539bb36c80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractSortOperator.java @@ -20,8 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java index a576c6b134fd6..371aaea226dc6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java index 85ffb93493e00..cd495cff980ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationMergeSortOperator.java index 686a627d30787..ba85b4f8d5522 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationMergeSortOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java index 2c59982bd8d55..040f4f56cfdf2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AssignUniqueIdOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AssignUniqueIdOperator.java index 6134beec2fb7e..c025a1485ba50 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AssignUniqueIdOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AssignUniqueIdOperator.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.schedule.task.DriverTaskId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/CollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/CollectOperator.java index ebe44170109f1..8cb9eeadb4d2b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/CollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/CollectOperator.java @@ -20,8 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java index 34c9aa60eef10..37a89a9db0f03 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.columngenerator.ColumnGenerator; 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 7f1bf08cbc146..efd2514790324 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 @@ -22,12 +22,12 @@ 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.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.IntoProcessException; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java index 58f226955e20b..8d4b779c2b66c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/EnforceSingleRowOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/EnforceSingleRowOperator.java index 9c785ef426ea9..45f41e09ca3b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/EnforceSingleRowOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/EnforceSingleRowOperator.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java index d659addd37214..ed1d3b54fa8fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.transformation.dag.column.AbstractCaseWhenThenColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; @@ -30,7 +32,6 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/LimitOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/LimitOperator.java index 99f01907bb452..f95b4a1aeea1d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/LimitOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/LimitOperator.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MappingCollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MappingCollectOperator.java index 886dba305b7b3..1f77429b3d689 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MappingCollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MappingCollectOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; @@ -61,7 +61,7 @@ public TsBlock next() throws Exception { return TsBlock.wrapBlocksWithoutCopy( tsBlock.getPositionCount(), new RunLengthEncodedColumn( - TableScanOperator.TIME_COLUMN_TEMPLATE, tsBlock.getPositionCount()), + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlock.getPositionCount()), columns); } } else { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MergeSortOperator.java index a1078f5506ff6..1c80854e4e42f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MergeSortOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/OffsetOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/OffsetOperator.java index b28428e30c7b3..76600e65b96c9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/OffsetOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/OffsetOperator.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PatternRecognitionOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PatternRecognitionOperator.java index 1282ce4ce8248..5dfae6eca9711 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PatternRecognitionOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PatternRecognitionOperator.java @@ -19,10 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.LogicalIndexNavigation; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternAggregator; @@ -31,7 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression.PatternExpressionComputation; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.Matcher; import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.RowComparator; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -50,8 +51,8 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; -import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter.MAX_RESERVED_MEMORY; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.MAX_RESERVED_MEMORY; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class PatternRecognitionOperator implements ProcessOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java index c10d73f403b99..005ee99540215 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java index d4a85adad8011..768bbbad6768b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java index b9c7e46c7a939..ca0715b3c3eda 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.window.IWindow; import org.apache.iotdb.db.queryengine.execution.operator.window.IWindowManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java index a66312d0b28e2..2069bce5012ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java index 1f36586653e91..da80d054d4484 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java index 42aca2ccf85e4..aa3b0ac29450a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow.SlidingWindowAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SortOperator.java index e8d77cb59d0fc..73f32d417c111 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SortOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.db.utils.sort.DiskSpiller; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableFillOperator.java index 00edaee90d98d..bb1d5a5815632 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableFillOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java index 95f0e4ca0bd61..35a5ef1f06c3b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillOperator.java index df72932c5406e..79c561dfaa603 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillWithGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillWithGroupOperator.java index 95550238fb33d..8b638fd0c1fac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillWithGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillWithGroupOperator.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -35,8 +36,6 @@ import java.util.Comparator; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class TableLinearFillWithGroupOperator extends TableLinearFillOperator { private final List groupSplitter; @@ -86,7 +85,8 @@ TsBlock buildFinalResult(TsBlock tempResult) { TsBlock result = null; if (!resultBuilder.isEmpty()) { Column timeColumn = - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount()); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount()); result = resultBuilder.build(timeColumn); resultBuilder.reset(); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableMergeSortOperator.java index 0a7616db38ead..c9e4667a59af3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableMergeSortOperator.java @@ -19,7 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -32,8 +33,6 @@ import java.util.Comparator; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class TableMergeSortOperator extends MergeSortOperator { public TableMergeSortOperator( OperatorContext operatorContext, @@ -51,6 +50,7 @@ protected void appendTime(TimeColumnBuilder timeBuilder, long time) { @Override protected TsBlock buildResult(TsBlockBuilder resultBuilder) { return resultBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableSortOperator.java index 6d01819e756d2..fb4795847101a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableSortOperator.java @@ -19,7 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.db.utils.sort.TableDiskSpiller; @@ -33,8 +34,6 @@ import java.util.Comparator; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class TableSortOperator extends SortOperator { public TableSortOperator( OperatorContext operatorContext, @@ -58,6 +57,7 @@ protected void appendTime(TimeColumnBuilder timeBuilder, long time) { @Override protected TsBlock buildFinalResult(TsBlockBuilder resultBuilder) { return resultBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperator.java index 6de85f87c762c..e1f4f62d8ae37 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperator.java @@ -20,8 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.db.utils.sort.TableDiskSpiller; @@ -35,8 +36,6 @@ import java.util.Comparator; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class TableStreamSortOperator extends AbstractSortOperator { private static final long INSTANCE_SIZE = @@ -94,7 +93,8 @@ public TsBlock next() throws Exception { if (tsBlockBuilder.isFull() || consumedUp()) { int rowCount = tsBlockBuilder.getPositionCount(); TsBlock res = - tsBlockBuilder.build(new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, rowCount)); + tsBlockBuilder.build( + new RunLengthEncodedColumn(CommonOperatorUtils.TIME_COLUMN_TEMPLATE, rowCount)); remainingCount -= rowCount; tsBlockBuilder.reset(); return res; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableTopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableTopKOperator.java index ca4a5ad5bebef..983f5f6db200c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableTopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableTopKOperator.java @@ -19,7 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -31,8 +32,6 @@ import java.util.Comparator; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class TableTopKOperator extends TopKOperator { public TableTopKOperator( OperatorContext operatorContext, @@ -46,7 +45,9 @@ public TableTopKOperator( @Override protected TsBlock constrcutResultTsBlock(int positionCount, Column[] columns) { - return new TsBlock(new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, positionCount), columns); + return new TsBlock( + new RunLengthEncodedColumn(CommonOperatorUtils.TIME_COLUMN_TEMPLATE, positionCount), + columns); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java index 46bd64419c303..8edbcd7a8eafe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TopKOperator.java index f6efe39a4c0c6..1c943548d01c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TopKOperator.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java index eb75b8edd5a11..ef6406a226e7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java @@ -21,12 +21,13 @@ import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java index 12ee422fe2e51..bd1db31fb2563 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java index 333961e6845ac..d4998c9015c1f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java @@ -22,9 +22,9 @@ 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.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java index 6e894c983e04a..3c21c93864b6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java index c5ba949ad3749..5260ba393f662 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java index 25cc7ffa3fe21..55863e9b8e360 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.db.utils.sort.TreeDiskSpiller; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java index bef0b47819e3d..773c036302454 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperator.java index 9df9006e4e6d8..31703b553b629 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java index 96f0f1f545012..f55c38c645cb5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java @@ -22,15 +22,15 @@ import org.apache.iotdb.ainode.rpc.thrift.TInferenceReq; import org.apache.iotdb.ainode.rpc.thrift.TInferenceResp; import org.apache.iotdb.commons.client.exception.ClientManagerException; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; import org.apache.iotdb.db.exception.runtime.ModelInferenceProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.protocol.client.an.AINodeClient; import org.apache.iotdb.db.protocol.client.an.AINodeClientManager; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.model.ModelInferenceDescriptor; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java index c3010f753a783..6971475c4316d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.copyto; import org.apache.iotdb.commons.schema.column.ColumnHeader; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.CopyToTsFileOptions; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.TsFileFormatCopyToWriter; import org.apache.iotdb.db.storageengine.rescon.disk.TierManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionLeafOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionLeafOperator.java index 4a8e4d88b8834..7b3c12386fc89 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionLeafOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionLeafOperator.java @@ -20,8 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.function; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; import org.apache.iotdb.udf.api.relational.table.processor.TableFunctionLeafProcessor; @@ -38,8 +39,6 @@ import java.util.Arrays; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - // only one input source is supported now public class TableFunctionLeafOperator implements ProcessOperator { private static final Logger LOGGER = LoggerFactory.getLogger(TableFunctionLeafOperator.class); @@ -94,7 +93,8 @@ private List getOutputColumnBuilders() { private TsBlock buildTsBlock(List columnBuilders) { int positionCount = columnBuilders.get(0).getPositionCount(); blockBuilder.declarePositions(positionCount); - return blockBuilder.build(new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, positionCount)); + return blockBuilder.build( + new RunLengthEncodedColumn(CommonOperatorUtils.TIME_COLUMN_TEMPLATE, positionCount)); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionOperator.java index fbefec01b83e7..edac5810d9d9a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionOperator.java @@ -19,11 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.function; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.AggregationMergeSortOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.PartitionCache; import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.PartitionState; import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.Slice; @@ -52,8 +53,6 @@ import java.util.Optional; import java.util.Queue; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - // only one input source is supported now public class TableFunctionOperator implements ProcessOperator { @@ -216,7 +215,8 @@ private List buildTsBlock( } properBlockBuilder.declarePositions(positionCount); TsBlock properBlock = - properBlockBuilder.build(new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, positionCount)); + properBlockBuilder.build( + new RunLengthEncodedColumn(CommonOperatorUtils.TIME_COLUMN_TEMPLATE, positionCount)); List result = new ArrayList<>(); if (needPassThrough) { // handle pass through column only if needed diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/partition/Slice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/partition/Slice.java index f8f002d5e19d2..f504ec0da52d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/partition/Slice.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/partition/Slice.java @@ -39,7 +39,7 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.RecordIterator.OBJECT_ERR_MSG; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.RecordIterator.OBJECT_ERR_MSG; import static org.apache.iotdb.udf.api.type.Type.OBJECT; /** Parts of partition. */ diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java index fbb6386e846ab..8605dc8c8a028 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java @@ -19,10 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; @@ -37,7 +38,6 @@ import java.util.List; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; abstract class AbstractGapFillOperator implements ProcessOperator { @@ -86,7 +86,8 @@ public TsBlock next() throws Exception { resultBuilder.reset(); fillGaps(lastGroupKey.tsBlock, lastGroupKey.rowIndex, endTime); return resultBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); } else { return null; } @@ -130,7 +131,8 @@ public TsBlock next() throws Exception { } lastGroupKey = new SortKey(block, size - 1); return resultBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); } private void resetTimeIterator() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java index 455202cc166c4..186c5964d83d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java index 7145af495f44c..ceb791ba11c9b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java index 6d36e7e1b50ba..1a1a17593b692 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java index 718540f62f001..2920a5fd5982c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java @@ -21,7 +21,7 @@ // without month interval -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java index 7c25403297644..39ddc57f3e82e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java index 19bbd1b6a1f86..149add5b4dee7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java index d7d9d6e86618b..7ccb9648a8917 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.ColumnMerger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java index 80bb423a884be..01d741861fdd6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.AbstractConsumeAllOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java index 3905ffb45df59..df0473a03041c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java index 9ddb482d80a27..99dcbf2e560f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java index 029fc16c95709..7a8a2517b15aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java @@ -19,11 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; +import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; @@ -37,8 +38,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - /** * This Operator is used to implement the simple nested loop join algorithm for Cartesian product. * It is used to join two tables, one is the probe table and the other is the build table. For now, @@ -138,7 +137,8 @@ public TsBlock next() throws Exception { resultTsBlock = resultBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); resultBuilder.reset(); return checkTsBlockSizeAndGetResult(); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java index a2ea748c7ea69..6a5ec86cc2aa7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java index ac0ddf0e30b72..08d7e71cf9fa4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java index 3a8a2f4c6dfe4..6c159e2672746 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java @@ -22,8 +22,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.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java index aaa285c4d5cb9..832300f4f5771 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java index f5a86a1d14f34..d5a7f92aff957 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java index 7c10defa5cd1b..276e62d08960b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java index 5d8a169a5d81d..09e69af85c1ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java index fa3ca3346cf32..d573f9a234fea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java index c8cd70931f868..a80bccfed9cdb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java index 12a63c2df2ccf..26e960db04093 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java index b97998273d141..996508364fb9d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java index 7d80cbdb46e04..7afe5cb171d8e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.ArrayView; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAccumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -33,7 +33,7 @@ import java.util.List; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; /** * This class computes an aggregate function result in row pattern recognition context. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java index cae0462521e22..998d436ab01e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java @@ -18,13 +18,13 @@ */ package org.apache.iotdb.db.queryengine.execution.operator.process.window; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -44,8 +44,8 @@ import java.util.Map; import java.util.Optional; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.createGroupByHash; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; public class RowNumberOperator implements ProcessOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperator.java index d3e0566108053..0d2f3ea860fb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperator.java @@ -19,10 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.function.PartitionRecognizer; import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.PartitionCache; import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.PartitionState; @@ -31,7 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -48,8 +49,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; -import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter.MAX_RESERVED_MEMORY; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.MAX_RESERVED_MEMORY; public class TableWindowOperator implements ProcessOperator { private static final long INSTANCE_SIZE = @@ -245,7 +245,8 @@ private TsBlock transform(long startTime) { private TsBlock getTsBlockFromTsBlockBuilder() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); tsBlockBuilder.reset(); return result; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java index 1c10f2c80916f..355e1903c76bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash; @@ -28,11 +30,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.execution.operator.GroupedTopNBuilder; import org.apache.iotdb.db.queryengine.execution.operator.GroupedTopNRowNumberBuilder; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.SimpleTsBlockWithPositionComparator; import org.apache.iotdb.db.queryengine.execution.operator.TsBlockWithPositionComparator; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/WindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/WindowAggregator.java index 5d540db574425..4b428de77d6e0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/WindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/WindowAggregator.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAccumulator; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; @@ -33,7 +34,6 @@ import java.util.List; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; public class WindowAggregator { private final TableAccumulator accumulator; @@ -67,7 +67,10 @@ public void addInput(Column[] columns) { // Process count(*) int count = columns[0].getPositionCount(); if (arguments.length == 0) { - arguments = new Column[] {new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, count)}; + arguments = + new Column[] { + new RunLengthEncodedColumn(CommonOperatorUtils.TIME_COLUMN_TEMPLATE, count) + }; } AggregationMask mask = AggregationMask.createSelectAll(count); @@ -90,7 +93,10 @@ private void removeInput(Column[] columns) { // Process count(*) int count = columns[0].getPositionCount(); if (arguments.length == 0) { - arguments = new Column[] {new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, count)}; + arguments = + new Column[] { + new RunLengthEncodedColumn(CommonOperatorUtils.TIME_COLUMN_TEMPLATE, count) + }; } accumulator.removeInput(arguments); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java index f9e22be38a34b..6b73ede4a6f6b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java index 37c7e5fe3f78d..8fe4604ea907d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.enums.TSDataType; 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 e713c851adbcf..314a931cc524e 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 @@ -23,10 +23,10 @@ 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.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; 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 035fd8f8d8bd4..e2a08deaa6830 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 @@ -23,10 +23,10 @@ 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.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; 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 82bb8c6fbaa1c..7b1fa1f9385ff 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 @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java index ae0736c8f223c..18c7a2bf9eae8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java index e3076cc9073f6..3f7d49ab588b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; 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 4989d55eed7c9..e9fccdfedf974 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 @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java index f394dc11f3213..b4abb30ef0fa0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java index 86d7d8e98db3c..e0b62aa5d3d2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperator.java index 084b8f558b268..947cf7f12dce8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java index fec84b8517b4e..1ff2f70bee025 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; public abstract class AbstractSourceOperator extends AbstractOperator implements SourceOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java index 45c9ace8f2722..f42ddd4ce6bd8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; public interface SourceOperator extends Operator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java index f0984a25bf053..1730fe33dba24 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java @@ -21,6 +21,8 @@ import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; @@ -28,7 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanUtil; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanUtil; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.queryengine.execution.operator.window.IWindow; import org.apache.iotdb.db.queryengine.execution.operator.window.TimeWindow; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; @@ -63,8 +64,6 @@ import java.util.stream.Collectors; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.satisfiedTimeRange; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.CURRENT_DEVICE_INDEX_STRING; -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.plan.planner.plan.node.PlanGraphPrinter.DEVICE_NUMBER; import static org.apache.tsfile.read.common.block.TsBlockUtil.skipPointsOutOfTimeRange; @@ -141,7 +140,8 @@ protected AbstractAggTableScanOperator(AbstractAggTableScanOperatorParameter par .map(IMeasurementSchema::getType) .collect(Collectors.toList()); this.currentDeviceIndex = 0; - this.operatorContext.recordSpecifiedInfo(CURRENT_DEVICE_INDEX_STRING, Integer.toString(0)); + this.operatorContext.recordSpecifiedInfo( + CommonOperatorUtils.CURRENT_DEVICE_INDEX_STRING, Integer.toString(0)); this.aggregatorInputChannels = parameter.aggregatorInputChannels; this.timeIterator = parameter.tableTimeRangeIterator; this.dateBinSize = @@ -166,7 +166,7 @@ protected void buildResultTsBlock() { resultTsBlock = resultTsBlockBuilder.build( new RunLengthEncodedColumn( - TIME_COLUMN_TEMPLATE, resultTsBlockBuilder.getPositionCount())); + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, resultTsBlockBuilder.getPositionCount())); resultTsBlockBuilder.reset(); } @@ -342,7 +342,8 @@ private TsBlock process(TsBlock inputTsBlock, TimeRange curTimeRange) { TsBlock tsBlock = new TsBlock( inputRegion.getPositionCount(), - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, inputRegion.getPositionCount()), + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, inputRegion.getPositionCount()), valueColumns); for (TableAggregator aggregator : tableAggregators) { @@ -733,7 +734,7 @@ protected void checkIfAllAggregatorHasFinalResult() throws Exception { protected void nextDevice() throws Exception { currentDeviceIndex++; this.operatorContext.recordSpecifiedInfo( - CURRENT_DEVICE_INDEX_STRING, Integer.toString(currentDeviceIndex)); + CommonOperatorUtils.CURRENT_DEVICE_INDEX_STRING, Integer.toString(currentDeviceIndex)); } protected void resetTableAggregators() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java index 0f880ba2f8886..eb7f07d2a8e74 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java index 9f384237348e9..61be8d4942a3a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java @@ -30,7 +30,7 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public abstract class AbstractDefaultAggTableScanOperator extends AbstractAggTableScanOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractMergeSortJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractMergeSortJoinOperator.java index 1f41ddaeb8150..3b1fe191e8453 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractMergeSortJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractMergeSortJoinOperator.java @@ -19,11 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.queryengine.execution.operator.AbstractOperator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; @@ -37,8 +38,7 @@ import java.util.concurrent.TimeUnit; import static com.google.common.util.concurrent.Futures.successfulAsList; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; -import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter.MAX_RESERVED_MEMORY; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.MAX_RESERVED_MEMORY; public abstract class AbstractMergeSortJoinOperator extends AbstractOperator { protected boolean leftFinished; @@ -564,7 +564,8 @@ protected void appendOneLeftRowWithEmptyRight() { protected void buildResultTsBlock() { resultTsBlock = resultBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); resultBuilder.reset(); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java index 06fd903d0b3e9..e1fb6b83c5aa9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; @@ -36,7 +37,6 @@ 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.LongColumn; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.write.schema.IMeasurementSchema; @@ -56,10 +56,6 @@ public abstract class AbstractTableScanOperator extends AbstractSeriesScanOperat private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(TableScanOperator.class); - public static final String CURRENT_DEVICE_INDEX_STRING = "CurrentDeviceIndex"; - public static final LongColumn TIME_COLUMN_TEMPLATE = - new LongColumn(1, Optional.empty(), new long[] {0}); - private final List columnSchemas; private final int[] columnsIndexArray; @@ -108,7 +104,8 @@ public AbstractTableScanOperator(AbstractTableScanOperatorParameter parameter) { .map(IMeasurementSchema::getType) .collect(Collectors.toList()); this.currentDeviceIndex = 0; - this.operatorContext.recordSpecifiedInfo(CURRENT_DEVICE_INDEX_STRING, Integer.toString(0)); + this.operatorContext.recordSpecifiedInfo( + CommonOperatorUtils.CURRENT_DEVICE_INDEX_STRING, Integer.toString(0)); // allSensors include time and all field columns this.maxReturnSize = @@ -263,7 +260,7 @@ private void prepareForNextDevice() { queryDataSource.reset(); this.seriesScanUtil.initQueryDataSource(queryDataSource); this.operatorContext.recordSpecifiedInfo( - CURRENT_DEVICE_INDEX_STRING, Integer.toString(currentDeviceIndex)); + CommonOperatorUtils.CURRENT_DEVICE_INDEX_STRING, Integer.toString(currentDeviceIndex)); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java index 9d93713788efb..84475f1c89a48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java index 0684850ba2c2e..a4a1b21581fbf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java index db76eaab55d60..9510a2a8c3e2c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; @@ -64,7 +65,7 @@ public DeviceIteratorScanOperator( this.currentDeviceIndex = 0; this.currentDeviceInit = false; this.operatorContext.recordSpecifiedInfo( - AbstractTableScanOperator.CURRENT_DEVICE_INDEX_STRING, Integer.toString(0)); + CommonOperatorUtils.CURRENT_DEVICE_INDEX_STRING, Integer.toString(0)); constructCurrentDeviceOperatorTree(); } @@ -100,8 +101,7 @@ private void nextDevice() throws Exception { queryDataSource.reset(); initQueryDataSource(queryDataSource); this.operatorContext.recordSpecifiedInfo( - AbstractTableScanOperator.CURRENT_DEVICE_INDEX_STRING, - Integer.toString(currentDeviceIndex)); + CommonOperatorUtils.CURRENT_DEVICE_INDEX_STRING, Integer.toString(currentDeviceIndex)); } private void constructCurrentDeviceOperatorTree() { 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 index d40b570433ff0..5f788b68ca06c 100644 --- 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 @@ -63,6 +63,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowTopicReq; import org.apache.iotdb.confignode.rpc.thrift.TTableInfo; import org.apache.iotdb.db.auth.AuthorityChecker; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.ConnectionInfo; import org.apache.iotdb.db.node_commons.common.SqlDialect; @@ -1540,8 +1541,7 @@ public TsBlock next() { final TsBlock result = resultBuilder.build( new RunLengthEncodedColumn( - AbstractTableScanOperator.TIME_COLUMN_TEMPLATE, - resultBuilder.getPositionCount())); + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); resultBuilder.reset(); return result; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java index 2d8284aef9156..e593d94eabf92 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastByDescAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastDescAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; @@ -51,8 +51,8 @@ import java.util.concurrent.TimeUnit; import static com.google.common.base.Preconditions.checkState; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_PRIMITIVE_TYPE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_TIME_VALUE_PAIR; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MarkDistinctOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MarkDistinctOperator.java index 554a23dff56ff..b41cdd98865f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MarkDistinctOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MarkDistinctOperator.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.MarkDistinctHash; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; @@ -40,7 +40,7 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter.CURRENT_USED_MEMORY; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.CURRENT_USED_MEMORY; public class MarkDistinctOperator implements ProcessOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java index 0088b2a0956d5..f3cfb903ef6d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class MeasurementToTableViewAdaptorUtils { private MeasurementToTableViewAdaptorUtils() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java index 8360e5e59d9a3..04e20c9b28202 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; @@ -33,8 +34,6 @@ import java.util.List; import java.util.function.BiFunction; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class MergeSortFullOuterJoinOperator extends AbstractMergeSortJoinOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(MergeSortFullOuterJoinOperator.class); @@ -190,7 +189,7 @@ protected void recordsWhenDataMatches() { .get(i) .apply(leftBlock.getColumn(leftJoinKeyPositions[i]), leftIndex); } - lastMatchedRightBlock = new TsBlock(1, TIME_COLUMN_TEMPLATE, valueColumns); + lastMatchedRightBlock = new TsBlock(1, CommonOperatorUtils.TIME_COLUMN_TEMPLATE, valueColumns); } private void buildUseRemainingBlocks() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortInnerJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortInnerJoinOperator.java index 36938655f9a11..76eb04e06c08e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortInnerJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortInnerJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortLeftJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortLeftJoinOperator.java index 4e50a097fcd1a..b78da19254bc2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortLeftJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortLeftJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortSemiJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortSemiJoinOperator.java index 6400d4452db57..28b5bdcc4dbdb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortSemiJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortSemiJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java index 5fd3e0c658123..d7a1cbdd75e9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; @@ -38,8 +38,8 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.CURRENT_DEVICE_INDEX_STRING; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.CURRENT_DEVICE_INDEX_STRING; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class TreeNonAlignedDeviceViewAggregationScanOperator extends AbstractDefaultAggTableScanOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java index 103b85dca9130..952a1b802c256 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; 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/analyze/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzer.java index 9a847a9ebd132..f1a36aa71d064 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 @@ -24,11 +24,11 @@ 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.db.calc_commons.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java index 1d9bb7838d5f9..69b309a58203c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.analyze; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.calc_commons.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java index 55cfd18f16f48..7f0315097a679 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.calc_commons.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; -import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 7659c54c8e759..9318885eceac1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -23,6 +23,9 @@ 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.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.calc_commons.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; @@ -52,7 +55,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.queryengine.execution.operator.EmptyDataOperator; import org.apache.iotdb.db.queryengine.execution.operator.ExplainAnalyzeOperator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.FilterAndProjectOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.LimitOperator; @@ -87,8 +89,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeAlignedDeviceViewScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeNonAlignedDeviceViewAggregationScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeToTableViewAdaptorOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastDescAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; @@ -168,6 +168,7 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; +import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.common.DataNodeEndPoints.isSameNode; import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DELIMITER_BETWEEN_ID; @@ -178,7 +179,6 @@ import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.isFilterGtOrGe; import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions.updateFilterUsingTTL; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_PRIMITIVE_TYPE; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; import static org.apache.iotdb.db.utils.constant.SqlConstant.AVG; import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT; import static org.apache.iotdb.db.utils.constant.SqlConstant.EXTREME; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java index e06f90fa2548f..1f930344ca76a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.queryengine.plan.planner; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.source.ExchangeOperator; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java index 89a6da3901d1a..65fe16b1df435 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.memory.IMemoryBlock; import org.apache.iotdb.commons.memory.MemoryBlockType; import org.apache.iotdb.commons.path.IFullPath; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.metric.QueryRelatedResourceMetricSet; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.memory.PipelineMemoryEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index 52fdb04822eba..84455be5b13fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -28,6 +28,9 @@ 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.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BinaryConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BooleanConstantFill; @@ -50,7 +53,6 @@ import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; -import org.apache.iotdb.db.queryengine.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow.SlidingWindowAggregatorFactory; @@ -69,7 +71,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil; import org.apache.iotdb.db.queryengine.execution.operator.ExplainAnalyzeOperator; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ActiveRegionScanMergeOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.AggregationMergeSortOperator; @@ -81,7 +82,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.FilterAndProjectOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.LimitOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.OffsetOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.ProjectOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.RawDataAggregationOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.SingleDeviceViewOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java index 1f5ef929fd26b..3ef0946559ce6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.driver.DataDriver; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; import org.apache.iotdb.db.queryengine.execution.driver.Driver; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriver; import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.source.ExchangeOperator; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java index 9585bffd53bd9..f3f1b21d20c62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; public class ConsumeAllChildrenPipelineMemoryEstimator extends PipelineMemoryEstimator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java index 0462dde544303..1f6c463f1504b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; public class ConsumeChildrenOneByOnePipelineMemoryEstimator extends PipelineMemoryEstimator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/FakedMemoryReservationManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/FakedMemoryReservationManager.java index 35ded4d625211..8248ba580ea0c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/FakedMemoryReservationManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/FakedMemoryReservationManager.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; + import org.apache.tsfile.utils.Pair; public class FakedMemoryReservationManager implements MemoryReservationManager { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/NotThreadSafeMemoryReservationManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/NotThreadSafeMemoryReservationManager.java index 4fa97f368adf1..dfee67c01bd6b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/NotThreadSafeMemoryReservationManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/NotThreadSafeMemoryReservationManager.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java index 42c2586f70898..d19799642082b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import java.util.LinkedList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java index 115eaa8fc6b03..f64272fa728a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; public class PipelineMemoryEstimatorFactory { 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 5beb295214b86..4a16287c2dc37 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 @@ -132,9 +132,6 @@ public class PlanGraphPrinter implements PlanVisitor, PlanGraphPrin private static final String REGION_NOT_ASSIGNED = "Not Assigned"; public static final String DEVICE_NUMBER = "DeviceNumber"; public static final String CACHED_DEVICE_NUMBER = "CachedDeviceNumber"; - public static final String CURRENT_USED_MEMORY = "CurrentUsedMemory"; - public static final String MAX_USED_MEMORY = "MaxUsedMemory"; - public static final String MAX_RESERVED_MEMORY = "MaxReservedMemory"; public static final String REGIONS_OF_CURRENT_SUB_TASK = "RegionsOfCurrentSubTask"; public static final String PREPARE_CACHE_READER_COST = "PrepareCacheReaderCost"; public static final String LOAD_OBJECT_FILE_COST = "LoadObjectFileCost"; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java index 1eac2aaaf9b0d..5374a575858b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java @@ -76,12 +76,12 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isExtractTimeColumn; +import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.ConvertPredicateToTimeFilterVisitor.getLongValue; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isExtractTimeColumn; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; import static org.apache.tsfile.enums.TSDataType.INT32; import static org.apache.tsfile.enums.TSDataType.INT64; import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java index 0fb65377d9a5e..2f0eb92ec3c28 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.db.calc_commons.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; import org.apache.tsfile.utils.Pair; 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 c439f6df96ede..781c3db37b95e 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 @@ -108,6 +108,7 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ATTRIBUTE; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; +import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.extractGlobalTimeFilter; import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; @@ -123,7 +124,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor.extractUnique; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.extractGlobalTimeFilter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.filterDeterministicConjuncts; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/TsBlockInputDataSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/TsBlockInputDataSet.java index 5cc8b083210be..469b7ee4b6d11 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/TsBlockInputDataSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/TsBlockInputDataSet.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.input; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java index adb76d9bbddc3..2ed23c4aa4bba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java @@ -22,11 +22,11 @@ import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.storageengine.dataregion.memtable.AlignedReadOnlyMemChunk; import org.apache.iotdb.db.storageengine.dataregion.memtable.AlignedWritableMemChunk; import org.apache.iotdb.db.storageengine.dataregion.memtable.AlignedWritableMemChunkGroup; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java index 7a3233d58b638..b0bc6b8a76a29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.IWALByteBufferView; import org.apache.iotdb.db.utils.datastructure.BatchEncodeInfo; import org.apache.iotdb.db.utils.datastructure.TVList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReader.java index 2f9cda7f30f76..740f423b7ff3b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReader.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.read.reader.common; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.tsfile.read.TimeValuePair; import org.apache.tsfile.read.reader.IPointReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/tableDiskUsageIndex/DataRegionTableSizeQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/tableDiskUsageIndex/DataRegionTableSizeQueryContext.java index 6a8551ea147c3..f07841588846c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/tableDiskUsageIndex/DataRegionTableSizeQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/tableDiskUsageIndex/DataRegionTableSizeQueryContext.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.utils.tableDiskUsageIndex; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileID; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/TableDiskSpiller.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/TableDiskSpiller.java index 0208edc6a9329..da22b44999f38 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/TableDiskSpiller.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/TableDiskSpiller.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.utils.sort; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; + import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; @@ -27,8 +29,6 @@ import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class TableDiskSpiller extends DiskSpiller { public TableDiskSpiller(String folderPath, String filePrefix, List dataTypeList) { super(folderPath, filePrefix, dataTypeList); @@ -37,7 +37,8 @@ public TableDiskSpiller(String folderPath, String filePrefix, List d @Override protected TsBlock buildSortedTsBlock(TsBlockBuilder resultBuilder) { return resultBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount())); } @Override diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java index 45ea1ddc9cdc5..d44966ca015cf 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java index d3f7d67a0ef01..6fdfc9370202d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.CountAccumulator; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.operator.process.AggregationMergeSortOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java index ac1b27b4e41ef..edf7131b09995 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java @@ -24,12 +24,13 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; 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.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java index f5082267a6cce..063ed39432a0e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.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.AlignedFullPath; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java index 007cd5123d8d8..719cfbdc77b05 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java index 71ec08672b14a..d880cbf7aaaa5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java @@ -21,6 +21,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.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java index bec4de93bf43d..6649a6f6ebede 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.FixedIntervalFillFilter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java index 139fd668f4d20..802655c8307e7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java @@ -20,6 +20,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; 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 e492ead8be0f0..067bc7839bdd4 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 @@ -21,6 +21,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.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java index 6e45015297e09..2bc2dcdce92ad 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.schema.table.column.TagColumnSchema; import org.apache.iotdb.commons.schema.table.column.TimeColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; @@ -85,8 +86,8 @@ import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; +import static org.apache.iotdb.db.calc_commons.execution.operator.Operator.NOT_BLOCKED; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; -import static org.apache.iotdb.db.queryengine.execution.operator.Operator.NOT_BLOCKED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index 186677df733b2..283ed9aac707c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -25,6 +25,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.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.LinearFill; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java index 1aa48077f1145..12e8010c42102 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java @@ -25,12 +25,12 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; 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.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java index c949dc504c9de..4a03822d96ab0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java index 0fd29b76e539c..2aca46bbadcd3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java index adf360090ac0e..08fd4a88ba93f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java index 039db3ded11c7..74cd3dd52720d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java index f211d9ec22414..9f843467c46dc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.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.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java index 1bbb85a17b2af..7b70fdc2cf947 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java index 721af0d3db69a..9de4baad159b4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java index 2ea092cb819bb..7040f6f16f249 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; @@ -29,7 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -55,7 +56,6 @@ import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; 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.TableScanOperator.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.utils.EnvironmentUtils.cleanDir; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -520,7 +520,8 @@ public TsBlock next() { builder.declarePositions(timeArray[index].length); index++; return builder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, builder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, builder.getPositionCount())); } @Override diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java index 730b4fb99f98c..1376b0a0c0285 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -41,7 +42,6 @@ import java.util.concurrent.ExecutorService; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -187,7 +187,8 @@ private TsBlock createIntTsBlock(int[] values) { } builder.declarePositions(values.length); return builder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, builder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, builder.getPositionCount())); } private ValuesOperator genValuesOperator(java.util.List tsBlocks) { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java index bddfd690cacb9..5838768a49743 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -28,7 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -53,7 +54,6 @@ import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; 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.TableScanOperator.TIME_COLUMN_TEMPLATE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; @@ -339,7 +339,8 @@ public TsBlock next() { builder.declarePositions(timeArray[index].length); index++; return builder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, builder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, builder.getPositionCount())); } @Override diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java index 9d76d8a392182..777a38b3d50f2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -28,7 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -52,7 +53,6 @@ import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; 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.TableScanOperator.TIME_COLUMN_TEMPLATE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; @@ -314,7 +314,8 @@ public TsBlock next() { builder.declarePositions(timeArray[index].length); index++; return builder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, builder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, builder.getPositionCount())); } @Override diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java index 0621dd3291c1c..a96be31069736 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -27,7 +29,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.MergeSortOperator; @@ -44,7 +45,6 @@ import java.util.concurrent.ExecutorService; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; @@ -157,7 +157,8 @@ public TsBlock next() { builder.declarePositions(timeArray[index].length); index++; return builder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, builder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, builder.getPositionCount())); } @Override @@ -319,7 +320,8 @@ public TsBlock next() { builder.declarePositions(timeArray[index].length); index++; return builder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, builder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, builder.getPositionCount())); } @Override diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java index 27d87edee18c7..6a502a09ba640 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -27,7 +29,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.MergeSortOperator; @@ -43,7 +44,6 @@ import java.util.concurrent.ExecutorService; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; @@ -156,7 +156,8 @@ public TsBlock next() { builder.declarePositions(timeArray[index].length); index++; return builder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, builder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, builder.getPositionCount())); } @Override @@ -317,7 +318,8 @@ public TsBlock next() { builder.declarePositions(timeArray[index].length); index++; return builder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, builder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, builder.getPositionCount())); } @Override diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java index 2f3ebbccc70b5..59dba2b9147d5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java index 3970d0a636831..b3a7dd0678309 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java index e011020525e29..9b4f676649a19 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.tvf; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; 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.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.function.PartitionRecognizer; import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.PartitionState; @@ -49,8 +49,8 @@ import java.util.List; import java.util.concurrent.ExecutorService; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java index f03968167cd1a..963b6f3547ad7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -27,7 +29,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; @@ -48,7 +49,6 @@ import java.util.concurrent.ExecutorService; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -320,7 +320,8 @@ public TsBlock next() { builder.declarePositions(timeArray[index].length); index++; return builder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, builder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, builder.getPositionCount())); } @Override diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java index 5c5a19845866f..55be8fa2b737b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -27,7 +29,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.WindowFunction; @@ -50,7 +51,6 @@ import java.util.concurrent.ExecutorService; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -289,7 +289,8 @@ public TsBlock next() throws Exception { builder.declarePositions(timeArray[index].length); index++; return builder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, builder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, builder.getPositionCount())); } @Override diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java index 3cdaa0fdb1f6d..9e2e22845e3d4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; + import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; @@ -28,8 +30,6 @@ import java.util.Arrays; import java.util.Collections; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class TableWindowOperatorTestUtils { public static TsBlock createIntsTsBlockWithoutNulls(int[] inputs) { TsBlockBuilder tsBlockBuilder = new TsBlockBuilder(Collections.singletonList(TSDataType.INT32)); @@ -40,7 +40,8 @@ public static TsBlock createIntsTsBlockWithoutNulls(int[] inputs) { } return tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); } public static TsBlock createIntsTsBlockWithoutNulls(int[] inputs, int offset) { @@ -54,7 +55,8 @@ public static TsBlock createIntsTsBlockWithoutNulls(int[] inputs, int offset) { } return tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); } public static TsBlock createIntsTsBlockWithoutNulls( @@ -70,7 +72,8 @@ public static TsBlock createIntsTsBlockWithoutNulls( } return tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); } public static TsBlock createIntsTsBlockWithNulls(int[] inputs) { @@ -87,7 +90,8 @@ public static TsBlock createIntsTsBlockWithNulls(int[] inputs) { } return tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); } public static TsBlock createIntsTsBlockWithNulls(int[] inputs, int offset) { @@ -106,7 +110,8 @@ public static TsBlock createIntsTsBlockWithNulls(int[] inputs, int offset) { } return tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); } public static TsBlock createIntsTsBlockWithNulls(int[] inputs, int startOffset, int endOffset) { @@ -126,6 +131,7 @@ public static TsBlock createIntsTsBlockWithNulls(int[] inputs, int startOffset, } return tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); } } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java index 1e92a413fbb47..81ae5fa943fc9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; @@ -29,7 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; @@ -51,7 +52,6 @@ import java.util.concurrent.ExecutorService; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -416,7 +416,8 @@ public TsBlock next() { builder.declarePositions(timeArray[index].length); index++; return builder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, builder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, builder.getPositionCount())); } @Override diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java index bad56bba9b85d..b299f62686012 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function; import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate.AggregationWindowFunction; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate.WindowAggregator; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAccumulator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java index 4c0cd05acda44..63b4822ec0633 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate; import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; @@ -38,8 +39,6 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - // For aggregator that supports removeInputs, only SUM is tested, others are similar public class AggregationWindowFunctionTest { private final List inputDataTypes = Collections.singletonList(TSDataType.INT32); @@ -69,7 +68,8 @@ public void testFrameExpansion() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -105,7 +105,8 @@ public void testNotRemovableAggregationReComputation() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -141,7 +142,8 @@ public void testAggregationNoReComputation() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -183,7 +185,8 @@ public void testAggregationReComputation() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java index 5962c44a4b3d7..39fc6fe39069b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; @@ -35,8 +36,6 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class CumeDistFunctionTest { private final List inputDataTypes = Collections.singletonList(TSDataType.INT32); private final int[] inputs = {1, 1, 2, 2, 3}; @@ -60,7 +59,8 @@ public void testCumeDistFunction() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java index 576ea56e931cb..db2f298a6b3ce 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; @@ -35,8 +36,6 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class DenseRankFunctionTest { private final List inputDataTypes = Collections.singletonList(TSDataType.INT32); private final int[] inputs = {0, 1, 1, 1, 2, 2, 3, 4, 4, 5}; @@ -60,7 +59,8 @@ public void testDenseRankFunction() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java index 3d08daeef551c..d6ba0ec1e3063 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; @@ -35,8 +36,6 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class NTileFunctionTest { private final List inputDataTypes = Collections.singletonList(TSDataType.INT32); private final List outputDataTypes = @@ -61,7 +60,8 @@ public void testNTileFunctionWhenNIsLarge() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -89,7 +89,8 @@ public void testNTileFunctionUniform() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -117,7 +118,8 @@ public void testNTileFunctionNonUniform() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -137,6 +139,7 @@ private static TsBlock createTsBlockWithN(int[] inputs, int n) { } return tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); } } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java index 7883047e3bdcc..e24f6d2648364 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; @@ -35,8 +36,6 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class PercentRankFunctionTest { private final List inputDataTypes = Collections.singletonList(TSDataType.INT32); private final int[] inputs = {1, 1, 2, 2, 3}; @@ -60,7 +59,8 @@ public void testPercentRankFunction() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java index 75c805a90bb7d..415e4cacfce6d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; @@ -35,8 +36,6 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class RankFunctionTest { private final List inputDataTypes = Collections.singletonList(TSDataType.INT32); private final int[] inputs = {0, 1, 1, 1, 2, 2, 3, 4, 4, 5}; @@ -60,7 +59,8 @@ public void testRankFunction() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java index ce960505bf5be..a98251293dc8e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; @@ -35,8 +36,6 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class RowNumberFunctionTest { private final List inputDataTypes = Collections.singletonList(TSDataType.INT32); private final int[] inputs = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; @@ -59,7 +58,8 @@ public void testRowNumberFunction() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java index 52a6011e3efcb..46ee8fe853582 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; @@ -36,8 +37,6 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class FirstValueFunctionTest { private final List inputDataTypes = Collections.singletonList(TSDataType.INT32); // Inputs element less than 0 means this pos is null @@ -69,7 +68,8 @@ public void testFirstValueFunctionIgnoreNull() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -105,7 +105,8 @@ public void testFirstValueFunctionNotIgnoreNull() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java index 2728df2acc69e..0919671e14858 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; @@ -35,8 +36,6 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class LagFunctionTest { private final List inputDataTypes = Collections.singletonList(TSDataType.INT32); // Inputs element less than 0 means this pos is null @@ -61,7 +60,8 @@ public void testLagFunctionIgnoreNullWithoutDefault() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -90,7 +90,8 @@ public void testLagFunctionIgnoreNullWithDefault() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -115,7 +116,8 @@ public void testLagFunctionNotIgnoreNullWithoutDefault() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -144,7 +146,8 @@ public void testLagFunctionNotIgnoreNullWithDefault() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -174,7 +177,8 @@ private static TsBlock createTsBlockWithDefault(int[] inputs, int offset, int de } return tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); } private static TsBlock createTsBlockWithoutDefault(int[] inputs, int offset) { @@ -193,6 +197,7 @@ private static TsBlock createTsBlockWithoutDefault(int[] inputs, int offset) { } return tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); } } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java index 64f1269917b86..2763add700a72 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; @@ -36,8 +37,6 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class LastValueFunctionTest { private final List inputDataTypes = Collections.singletonList(TSDataType.INT32); // Inputs element less than 0 means this pos is null @@ -69,7 +68,8 @@ public void testLastValueFunctionIgnoreNull() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -105,7 +105,8 @@ public void testLastValueFunctionNotIgnoreNull() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java index 662be90dc226f..07ed28e51298a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; @@ -35,8 +36,6 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class LeadFunctionTest { private final List inputDataTypes = Collections.singletonList(TSDataType.INT32); // Inputs element less than 0 means this pos is null @@ -61,7 +60,8 @@ public void testLeadFunctionIgnoreNullWithoutDefault() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -90,7 +90,8 @@ public void testLeadFunctionIgnoreNullWithDefault() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -115,7 +116,8 @@ public void testLeadFunctionNotIgnoreNullWithoutDefault() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -144,7 +146,8 @@ public void testLeadFunctionNotIgnoreNullWithDefault() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -174,7 +177,8 @@ private static TsBlock createTsBlockWithDefault(int[] inputs, int offset, int de } return tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); } private static TsBlock createTsBlockWithoutDefault(int[] inputs, int offset) { @@ -193,6 +197,7 @@ private static TsBlock createTsBlockWithoutDefault(int[] inputs, int offset) { } return tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); } } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java index bc8f4f5094f44..28c7c9881fed7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; @@ -36,8 +37,6 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE; - public class NthValueFunctionTest { private final List inputDataTypes = Collections.singletonList(TSDataType.INT32); // Inputs element less than 0 means this pos is null @@ -69,7 +68,8 @@ public void testNthValueFunctionIgnoreNull() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -105,7 +105,8 @@ public void testNthValueFunctionNotIgnoreNull() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), expected.length); @@ -139,7 +140,8 @@ public void testNthValueFunctionNotIgnoreNullOutOfBounds() { TsBlock result = tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); Column column = result.getColumn(1); Assert.assertEquals(column.getPositionCount(), inputs.length); @@ -167,6 +169,7 @@ private static TsBlock createTsBlock(int[] inputs, int startOffset, int endOffse } return tsBlockBuilder.build( - new RunLengthEncodedColumn(TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); + new RunLengthEncodedColumn( + CommonOperatorUtils.TIME_COLUMN_TEMPLATE, tsBlockBuilder.getPositionCount())); } } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java index d02873fc31d2f..aded96866ca5a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java index 63920f55f5f50..1210ce434d796 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java @@ -26,6 +26,7 @@ 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.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.process.SingleDeviceViewOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.FullOuterTimeJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanOperator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java index 71281e64ee1bd..c912eb162eab3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java @@ -20,18 +20,18 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.FirstAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.FirstByAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.FirstByDescAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.FirstDescAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastByAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.FirstAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.FirstByAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.FirstByDescAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.FirstDescAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastByAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastByDescAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.LastDescAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.TableAccumulator; import org.apache.tsfile.enums.TSDataType; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java index 6df8d88d57861..3db21eb78e94d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java @@ -20,6 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; @@ -29,12 +33,8 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -57,11 +57,11 @@ import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.SUM; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.DEFAULT_GROUP_NUMBER; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; 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.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java index 9fe263685549f..49bf7eaa1f8a4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; @@ -43,7 +43,7 @@ import java.util.Collections; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; 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 f92da6ab56525..3f7ca2b46d39a 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -40,7 +41,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; @@ -72,13 +72,13 @@ import java.util.List; import java.util.Optional; +import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; -import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AnalyzerTest.analyzeSQL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.ALL_DEVICE_ENTRIES; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.BEIJING_A1_DEVICE_ENTRY; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java index b3b618f03655e..db45fab9e290d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; +import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.common.SqlDialect; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.process.TransformOperator; import org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java index 78a1daaacaa03..2a8fa939588f1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java @@ -25,6 +25,7 @@ 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.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.WriteProcessException; @@ -43,7 +44,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.execution.schedule.IDriverScheduler; -import org.apache.iotdb.db.queryengine.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.schemaengine.schemaregion.utils.ResourceByPathUtils; From cef127acca4ec2647ee263ef87d707c77db38c42 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Wed, 15 Apr 2026 18:57:25 +0800 Subject: [PATCH 21/45] move some operators --- .../execution/operator/AbstractOperator.java | 2 - .../execution/operator/Operator.java | 2 - .../execution/operator/OperatorContext.java | 2 +- .../process/AbstractConsumeAllOperator.java | 5 +- .../process/AbstractFillOperator.java | 12 +- .../process/AbstractLinearFillOperator.java | 13 +- .../process/AbstractSortOperator.java | 5 +- .../process/AggregationMergeSortOperator.java | 4 +- .../process/AssignUniqueIdOperator.java | 5 +- .../operator/process/CollectOperator.java | 5 +- .../process/EnforceSingleRowOperator.java | 5 +- .../process/FilterAndProjectOperator.java | 5 +- .../operator/process/LimitOperator.java | 5 +- .../process/MappingCollectOperator.java | 4 +- .../operator/process/MergeSortOperator.java | 6 +- .../operator/process/OffsetOperator.java | 5 +- .../process/PatternRecognitionOperator.java | 19 ++- .../PreviousFillWithGroupOperator.java | 5 +- .../operator/process/SortOperator.java | 6 +- .../operator/process/TableFillOperator.java | 6 +- .../process/TableLinearFillOperator.java | 8 +- .../TableLinearFillWithGroupOperator.java | 4 +- .../process/TableMergeSortOperator.java | 4 +- .../operator/process/TableSortOperator.java | 4 +- .../process/TableStreamSortOperator.java | 4 +- .../operator/process/TableTopKOperator.java | 4 +- .../operator/process/TopKOperator.java | 8 +- .../operator/process/ValuesOperator.java | 4 +- .../function/TableFunctionLeafOperator.java | 4 +- .../function/TableFunctionOperator.java | 13 +- .../function/partition/PartitionCache.java | 2 +- .../function/partition/PartitionState.java | 2 +- .../process/function/partition/Slice.java | 2 +- .../SimpleNestedLoopCrossJoinOperator.java | 4 +- .../AscBinaryTypeJoinKeyComparator.java | 2 +- .../AscBooleanTypeJoinKeyComparator.java | 2 +- .../AscDoubleTypeJoinKeyComparator.java | 2 +- .../AscFloatTypeJoinKeyComparator.java | 2 +- .../AscIntTypeJoinKeyComparator.java | 2 +- ...cLongTypeIgnoreEqualJoinKeyComparator.java | 2 +- .../AscLongTypeJoinKeyComparator.java | 2 +- .../DescBinaryTypeJoinKeyComparator.java | 2 +- .../DescBooleanTypeJoinKeyComparator.java | 2 +- .../DescDoubleTypeJoinKeyComparator.java | 2 +- .../DescFloatTypeJoinKeyComparator.java | 2 +- .../DescIntTypeJoinKeyComparator.java | 2 +- ...cLongTypeIgnoreEqualJoinKeyComparator.java | 2 +- .../DescLongTypeJoinKeyComparator.java | 2 +- .../merge/comparator/JoinKeyComparator.java | 2 +- .../comparator/JoinKeyComparatorFactory.java | 2 +- .../rowpattern/LogicalIndexNavigation.java | 4 +- .../rowpattern/PatternAggregationTracker.java | 6 +- .../process/rowpattern/PatternAggregator.java | 6 +- .../rowpattern/PatternAggregators.java | 2 +- .../rowpattern/PatternPartitionExecutor.java | 20 +-- .../rowpattern/PatternVariableRecognizer.java | 10 +- .../PhysicalAggregationPointer.java | 2 +- .../rowpattern/PhysicalValueAccessor.java | 2 +- .../rowpattern/PhysicalValuePointer.java | 2 +- .../expression/ArithmeticOperator.java | 2 +- .../expression/BinaryComputation.java | 2 +- .../rowpattern/expression/BinaryOperator.java | 2 +- .../expression/CastComputation.java | 2 +- .../expression/ComparisonOperator.java | 2 +- .../rowpattern/expression/Computation.java | 2 +- .../expression/ConstantComputation.java | 2 +- .../expression/LogicalOperator.java | 2 +- .../expression/NaryComputation.java | 2 +- .../rowpattern/expression/NaryOperator.java | 2 +- .../PatternExpressionComputation.java | 20 +-- .../expression/ReferenceComputation.java | 2 +- .../process/rowpattern/matcher/ArrayView.java | 2 +- .../process/rowpattern/matcher/Done.java | 2 +- .../rowpattern/matcher/Instruction.java | 2 +- .../process/rowpattern/matcher/IntList.java | 2 +- .../rowpattern/matcher/IntMultimap.java | 2 +- .../process/rowpattern/matcher/IntStack.java | 2 +- .../IrRowPatternToProgramRewriter.java | 2 +- .../process/rowpattern/matcher/Jump.java | 2 +- .../process/rowpattern/matcher/MatchEnd.java | 2 +- .../rowpattern/matcher/MatchLabel.java | 2 +- .../rowpattern/matcher/MatchResult.java | 2 +- .../rowpattern/matcher/MatchStart.java | 2 +- .../process/rowpattern/matcher/Matcher.java | 10 +- .../rowpattern/matcher/PatternCaptures.java | 2 +- .../process/rowpattern/matcher/Program.java | 2 +- .../process/rowpattern/matcher/Save.java | 2 +- .../process/rowpattern/matcher/Split.java | 2 +- .../process/window/RowNumberOperator.java | 4 +- .../process/window/TableWindowOperator.java | 18 +-- .../process/window/TopKRankingOperator.java | 4 +- .../window/function/WindowFunction.java | 4 +- .../function/WindowFunctionFactory.java | 24 +-- .../aggregate/AggregationWindowFunction.java | 6 +- .../function/aggregate/WindowAggregator.java | 4 +- .../function/rank/CumeDistFunction.java | 4 +- .../function/rank/DenseRankFunction.java | 4 +- .../window/function/rank/NTileFunction.java | 4 +- .../function/rank/PercentRankFunction.java | 4 +- .../window/function/rank/RankFunction.java | 4 +- .../function/rank/RankWindowFunction.java | 6 +- .../function/rank/RowNumberFunction.java | 4 +- .../function/value/FirstValueFunction.java | 4 +- .../window/function/value/LagFunction.java | 4 +- .../function/value/LastValueFunction.java | 4 +- .../window/function/value/LeadFunction.java | 4 +- .../function/value/NthValueFunction.java | 4 +- .../function/value/ValueWindowFunction.java | 6 +- .../process/window/partition/Partition.java | 6 +- .../window/partition/PartitionExecutor.java | 22 +-- .../process/window/partition/frame/Frame.java | 4 +- .../window/partition/frame/FrameInfo.java | 2 +- .../window/partition/frame/GroupsFrame.java | 10 +- .../window/partition/frame/RangeFrame.java | 16 +- .../window/partition/frame/RowsFrame.java | 6 +- .../process/window/utils/ColumnList.java | 2 +- .../operator/process/window/utils/Range.java | 2 +- .../process/window/utils/RowComparator.java | 2 +- .../AbstractMergeSortJoinOperator.java | 6 +- .../AsofMergeSortInnerJoinOperator.java | 7 +- .../AsofMergeSortLeftJoinOperator.java | 7 +- .../relational/MarkDistinctOperator.java | 4 +- .../MergeSortFullOuterJoinOperator.java | 6 +- .../MergeSortInnerJoinOperator.java | 6 +- .../relational/MergeSortLeftJoinOperator.java | 6 +- .../relational/MergeSortSemiJoinOperator.java | 6 +- .../aggregation/AggregationOperator.java | 2 +- .../grouped/HashAggregationOperator.java | 2 +- .../grouped/StreamingAggregationOperator.java | 2 +- .../StreamingHashAggregationOperator.java | 2 +- .../InMemoryHashAggregationBuilder.java | 2 +- .../plan/planner/TableOperatorGenerator.java | 138 ++++++++---------- .../planner/CastToBlobLiteralVisitor.java | 6 +- .../planner/CastToBooleanLiteralVisitor.java | 6 +- .../planner/CastToDateLiteralVisitor.java | 6 +- .../planner/CastToDoubleLiteralVisitor.java | 6 +- .../planner/CastToFloatLiteralVisitor.java | 6 +- .../planner/CastToInt32LiteralVisitor.java | 6 +- .../planner/CastToInt64LiteralVisitor.java | 6 +- .../planner/CastToStringLiteralVisitor.java | 6 +- .../CastToTimestampLiteralVisitor.java | 6 +- .../plan/node/ICoreQueryPlanVisitor.java | 5 - .../rowpattern/LogicalIndexPointer.java | 2 +- .../thrift/impl/ClientRPCServiceImpl.java | 2 +- .../queryengine/execution/driver/Driver.java | 2 +- .../execution/driver/DriverContext.java | 2 +- .../fragment/FragmentInstanceExecution.java | 2 +- .../execution/operator/EmptyDataOperator.java | 1 + .../operator/ExplainAnalyzeOperator.java | 1 + .../process/AbstractIntoOperator.java | 2 +- .../process/AbstractTreeIntoOperator.java | 2 +- .../ActiveRegionScanMergeOperator.java | 3 +- .../operator/process/AggregationOperator.java | 3 +- .../process/ColumnInjectOperator.java | 2 +- .../process/DeviceViewIntoOperator.java | 2 +- .../operator/process/DeviceViewOperator.java | 2 +- .../operator/process/ProjectOperator.java | 2 +- .../process/RawDataAggregationOperator.java | 2 +- .../process/SingleDeviceViewOperator.java | 2 +- .../SingleInputAggregationOperator.java | 2 +- .../SlidingWindowAggregationOperator.java | 2 +- .../operator/process/TableIntoOperator.java | 2 +- .../process/TagAggregationOperator.java | 3 +- .../operator/process/TransformOperator.java | 2 +- .../operator/process/TreeFillOperator.java | 5 +- .../operator/process/TreeIntoOperator.java | 2 +- .../process/TreeLinearFillOperator.java | 7 +- .../process/TreeMergeSortOperator.java | 3 +- .../operator/process/TreeSortOperator.java | 3 +- .../operator/process/TreeTopKOperator.java | 3 +- .../process/ai/InferenceOperator.java | 2 +- .../process/copyto/TableCopyToOperator.java | 2 +- .../process/function/PartitionRecognizer.java | 4 +- .../gapfill/AbstractGapFillOperator.java | 2 +- .../AbstractGapFillWGroupOperator.java | 2 +- .../AbstractGapFillWoGroupOperator.java | 2 +- .../gapfill/GapFillWGroupWMoOperator.java | 2 +- .../gapfill/GapFillWGroupWoMoOperator.java | 2 +- .../gapfill/GapFillWoGroupWMoOperator.java | 2 +- .../gapfill/GapFillWoGroupWoMoOperator.java | 2 +- .../join/FullOuterTimeJoinOperator.java | 4 +- .../join/HorizontallyConcatOperator.java | 4 +- .../process/join/InnerTimeJoinOperator.java | 2 +- .../join/LeftOuterTimeJoinOperator.java | 2 +- .../join/TableLeftOuterTimeJoinOperator.java | 2 +- .../last/AbstractUpdateLastCacheOperator.java | 2 +- .../last/AlignedUpdateLastCacheOperator.java | 2 +- ...lignedUpdateViewPathLastCacheOperator.java | 2 +- .../last/LastQueryCollectOperator.java | 2 +- .../process/last/LastQueryMergeOperator.java | 2 +- .../process/last/LastQueryOperator.java | 2 +- .../process/last/LastQuerySortOperator.java | 2 +- .../last/LastQueryTransformOperator.java | 2 +- .../process/last/UpdateLastCacheOperator.java | 2 +- .../last/UpdateViewPathLastCacheOperator.java | 2 +- .../CountGroupByLevelMergeOperator.java | 2 +- .../schema/CountGroupByLevelScanOperator.java | 2 +- .../operator/schema/CountMergeOperator.java | 2 +- .../schema/NodeManageMemoryMergeOperator.java | 2 +- .../schema/NodePathsConvertOperator.java | 2 +- .../schema/NodePathsCountOperator.java | 2 +- .../operator/schema/SchemaCountOperator.java | 2 +- .../schema/SchemaFetchMergeOperator.java | 2 +- .../schema/SchemaFetchScanOperator.java | 2 +- .../schema/SchemaQueryMergeOperator.java | 2 +- .../SchemaQueryOrderByHeatOperator.java | 2 +- .../schema/SchemaQueryScanOperator.java | 2 +- .../schema/source/DeviceAttributeUpdater.java | 2 +- .../schema/source/DevicePredicateHandler.java | 2 +- .../operator/sink/IdentitySinkOperator.java | 2 +- .../operator/sink/ShuffleHelperOperator.java | 2 +- ...AbstractSeriesAggregationScanOperator.java | 2 +- .../ActiveDeviceRegionScanOperator.java | 2 +- .../ActiveTimeSeriesRegionScanOperator.java | 2 +- .../AlignedSeriesAggregationScanOperator.java | 2 +- .../source/AlignedSeriesScanOperator.java | 2 +- .../operator/source/ExchangeOperator.java | 2 +- .../source/LastCacheScanOperator.java | 2 +- .../source/SeriesAggregationScanOperator.java | 2 +- .../operator/source/SeriesScanOperator.java | 2 +- .../source/ShowDiskUsageOperator.java | 2 +- .../operator/source/ShowQueriesOperator.java | 2 +- .../AbstractAggTableScanOperator.java | 2 +- .../AbstractAsofMergeSortJoinOperator.java | 5 +- .../relational/AbstractTableScanOperator.java | 2 +- .../source/relational/CteScanOperator.java | 2 +- .../DeviceIteratorScanOperator.java | 2 +- ...formationSchemaContentSupplierFactory.java | 2 +- .../InformationSchemaTableScanOperator.java | 2 +- .../TreeToTableViewAdaptorOperator.java | 2 +- .../DataNodeTableOperatorGenerator.java | 26 +++- .../plan/planner/OperatorTreeGenerator.java | 12 +- .../plan/planner/plan/node/PlanVisitor.java | 5 + .../queryengine/execution/DataDriverTest.java | 2 +- .../AggregationMergeSortOperatorTest.java | 3 +- .../operator/AggregationOperatorTest.java | 1 + .../operator/CteScanOperatorTest.java | 1 + .../operator/DeviceViewIntoOperatorTest.java | 1 + .../operator/ExchangeOperatorTest.java | 1 + .../execution/operator/FillOperatorTest.java | 1 + .../operator/LastQueryMergeOperatorTest.java | 1 + .../execution/operator/LimitOperatorTest.java | 2 +- .../operator/MergeTreeSortOperatorTest.java | 1 + ...nedTreeDeviceViewScanOperatorTreeTest.java | 4 +- .../operator/OffsetOperatorTest.java | 4 +- .../operator/OperatorMemoryTest.java | 7 +- .../operator/SortOperatorSortBranchTest.java | 3 +- .../operator/TransformOperatorTest.java | 1 + .../operator/TreeIntoOperatorTest.java | 1 + .../operator/TreeLinearFillOperatorTest.java | 1 + .../operator/TreeSortOperatorTest.java | 1 + .../operator/TreeTopKOperatorTest.java | 1 + .../process/TableStreamSortOperatorTest.java | 3 +- .../operator/process/ValuesOperatorTest.java | 1 + .../gapfill/GapFillWGroupWMoOperatorTest.java | 4 +- .../GapFillWGroupWoMoOperatorTest.java | 4 +- .../GapFillWoGroupWMoOperatorTest.java | 4 +- .../GapFillWoGroupWoMoOperatorTest.java | 4 +- .../join/InnerTimeJoinOperatorTest.java | 2 +- .../join/LeftOuterTimeJoinOperatorTest.java | 2 +- .../process/rowpattern/MatcherTest.java | 14 +- .../rowpattern/PatternExpressionTest.java | 10 +- .../tvf/TableFunctionOperatorTest.java | 6 +- .../process/window/RowNumberOperatorTest.java | 3 +- .../window/TableWindowOperatorTest.java | 9 +- .../window/TopKRankingOperatorTest.java | 3 +- .../window/function/FunctionTestUtils.java | 9 +- .../AggregationWindowFunctionTest.java | 5 +- .../function/rank/CumeDistFunctionTest.java | 3 +- .../function/rank/DenseRankFunctionTest.java | 3 +- .../function/rank/NTileFunctionTest.java | 3 +- .../rank/PercentRankFunctionTest.java | 3 +- .../function/rank/RankFunctionTest.java | 3 +- .../function/rank/RowNumberFunctionTest.java | 3 +- .../value/FirstValueFunctionTest.java | 5 +- .../function/value/LagFunctionTest.java | 3 +- .../function/value/LastValueFunctionTest.java | 5 +- .../function/value/LeadFunctionTest.java | 3 +- .../function/value/NthValueFunctionTest.java | 5 +- .../partition/frame/FrameTestUtils.java | 13 +- .../partition/frame/GroupsFrameTest.java | 1 + .../partition/frame/RangeFrameTest.java | 1 + .../window/partition/frame/RowsFrameTest.java | 1 + .../CountGroupByLevelMergeOperatorTest.java | 2 +- .../schema/SchemaCountOperatorTest.java | 2 +- .../schema/SchemaQueryScanOperatorTest.java | 2 +- .../relational/TableScanOperatorTest.java | 2 +- .../analyzer/AggregationCornerCaseTest.java | 2 +- .../analyzer/AsofInnerJoinOperatorTest.java | 6 +- .../plan/relational/analyzer/JoinTest.java | 4 +- 290 files changed, 641 insertions(+), 599 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/OperatorContext.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/AbstractConsumeAllOperator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/AbstractFillOperator.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/AbstractLinearFillOperator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/AbstractSortOperator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/AggregationMergeSortOperator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/AssignUniqueIdOperator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/CollectOperator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/EnforceSingleRowOperator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/FilterAndProjectOperator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/LimitOperator.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/MappingCollectOperator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/MergeSortOperator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/OffsetOperator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/PatternRecognitionOperator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/PreviousFillWithGroupOperator.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/SortOperator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/TableFillOperator.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/TableLinearFillOperator.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/TableLinearFillWithGroupOperator.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/TableMergeSortOperator.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/TableSortOperator.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/TableStreamSortOperator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/TableTopKOperator.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/TopKOperator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/ValuesOperator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/function/TableFunctionLeafOperator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/function/TableFunctionOperator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/function/partition/PartitionCache.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/function/partition/PartitionState.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/function/partition/Slice.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/JoinKeyComparator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/LogicalIndexNavigation.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/PatternAggregationTracker.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/PatternAggregator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/PatternAggregators.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/PatternPartitionExecutor.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/PatternVariableRecognizer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/PhysicalAggregationPointer.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/PhysicalValueAccessor.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/PhysicalValuePointer.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/expression/ArithmeticOperator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/expression/BinaryComputation.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/expression/BinaryOperator.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/expression/CastComputation.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/expression/ComparisonOperator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/expression/Computation.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/expression/ConstantComputation.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/expression/LogicalOperator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/expression/NaryComputation.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/expression/NaryOperator.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/expression/ReferenceComputation.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/ArrayView.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/Done.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/Instruction.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/IntList.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/IntMultimap.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/IntStack.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/Jump.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/MatchEnd.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/MatchLabel.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/MatchResult.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/MatchStart.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/Matcher.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/PatternCaptures.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/Program.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/Save.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/rowpattern/matcher/Split.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/RowNumberOperator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/TableWindowOperator.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/TopKRankingOperator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/WindowFunction.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/WindowFunctionFactory.java (62%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/aggregate/WindowAggregator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/rank/CumeDistFunction.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/rank/DenseRankFunction.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/rank/NTileFunction.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/rank/PercentRankFunction.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/rank/RankFunction.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/rank/RankWindowFunction.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/rank/RowNumberFunction.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/value/FirstValueFunction.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/value/LagFunction.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/value/LastValueFunction.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/value/LeadFunction.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/value/NthValueFunction.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/function/value/ValueWindowFunction.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/partition/Partition.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/partition/PartitionExecutor.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/partition/frame/Frame.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/partition/frame/FrameInfo.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/partition/frame/GroupsFrame.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/partition/frame/RangeFrame.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/partition/frame/RowsFrame.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/utils/ColumnList.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/utils/Range.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/window/utils/RowComparator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/AbstractMergeSortJoinOperator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/MarkDistinctOperator.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/MergeSortInnerJoinOperator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/MergeSortLeftJoinOperator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/MergeSortSemiJoinOperator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/planner/CastToBlobLiteralVisitor.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/planner/CastToBooleanLiteralVisitor.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/planner/CastToDateLiteralVisitor.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/planner/CastToDoubleLiteralVisitor.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/planner/CastToFloatLiteralVisitor.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/planner/CastToInt32LiteralVisitor.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/planner/CastToInt64LiteralVisitor.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/planner/CastToStringLiteralVisitor.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/planner/CastToTimestampLiteralVisitor.java (92%) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/AbstractOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/AbstractOperator.java index 801265e94a38d..353331525c228 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/AbstractOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/AbstractOperator.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.calc_commons.execution.operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; - import org.apache.tsfile.common.conf.TSFileDescriptor; import org.apache.tsfile.read.common.block.TsBlock; import org.slf4j.Logger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/Operator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/Operator.java index 1fd73b6d3b9f8..8a1377085ea99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/Operator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/Operator.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.calc_commons.execution.operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; - import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/OperatorContext.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/OperatorContext.java index fafaa47f0b2e3..c754c053414db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/OperatorContext.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator; +package org.apache.iotdb.db.calc_commons.execution.operator; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractConsumeAllOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractConsumeAllOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java index 6d02d885c3cd9..cc66965ebe0d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractConsumeAllOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java @@ -17,12 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractFillOperator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractFillOperator.java index 86ae28d27fd04..2bce16793c840 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractFillOperator.java @@ -17,13 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; @@ -34,7 +33,7 @@ import static java.util.Objects.requireNonNull; /** Used for previous and constant value fill. */ -abstract class AbstractFillOperator implements ProcessOperator { +public abstract class AbstractFillOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(AbstractFillOperator.class); @@ -43,7 +42,8 @@ abstract class AbstractFillOperator implements ProcessOperator { private final Operator child; private final int outputColumnCount; - AbstractFillOperator(OperatorContext operatorContext, IFill[] fillArray, Operator child) { + protected AbstractFillOperator( + OperatorContext operatorContext, IFill[] fillArray, Operator child) { this.operatorContext = requireNonNull(operatorContext, "operatorContext is null"); checkArgument( fillArray != null && fillArray.length > 0, "fillArray should not be null or empty"); @@ -83,7 +83,7 @@ public TsBlock next() throws Exception { block.getPositionCount(), block.getTimeColumn(), valueColumns); } - abstract Column getHelperColumn(TsBlock tsBlock); + protected abstract Column getHelperColumn(TsBlock tsBlock); @Override public boolean hasNext() throws Exception { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractLinearFillOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractLinearFillOperator.java index 03fd0c432c905..c369c5c6b5ada 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractLinearFillOperator.java @@ -17,13 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; @@ -37,7 +36,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -abstract class AbstractLinearFillOperator implements ProcessOperator { +public abstract class AbstractLinearFillOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(AbstractLinearFillOperator.class); @@ -64,7 +63,7 @@ abstract class AbstractLinearFillOperator implements ProcessOperator { // indicate whether there is more TsBlock for child operator protected boolean noMoreTsBlock; - AbstractLinearFillOperator( + protected AbstractLinearFillOperator( OperatorContext operatorContext, ILinearFill[] fillArray, Operator child) { this.operatorContext = requireNonNull(operatorContext, "operatorContext is null"); checkArgument( @@ -156,10 +155,10 @@ boolean noMoreTsBlockForCurrentGroup() { return noMoreTsBlock; } - abstract Column getHelperColumn(TsBlock tsBlock); + protected abstract Column getHelperColumn(TsBlock tsBlock); // -1 means all values of helper column in @param{tsBlock} are null - abstract Integer getLastRowIndexForNonNullHelperColumn(TsBlock tsBlock); + protected abstract Integer getLastRowIndexForNonNullHelperColumn(TsBlock tsBlock); TsBlock append(int length, Column timeColumn, Column[] valueColumns) { return new TsBlock(length, timeColumn, valueColumns); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractSortOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java index 2a1539bb36c80..416899ab7480e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java @@ -17,13 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationMergeSortOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java index ba85b4f8d5522..18fa283410dfb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AssignUniqueIdOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AssignUniqueIdOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AssignUniqueIdOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AssignUniqueIdOperator.java index c025a1485ba50..90dd0011f0b17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AssignUniqueIdOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AssignUniqueIdOperator.java @@ -17,12 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.schedule.task.DriverTaskId; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/CollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/CollectOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/CollectOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/CollectOperator.java index 8cb9eeadb4d2b..a0b1d9af305f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/CollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/CollectOperator.java @@ -17,13 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/EnforceSingleRowOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/EnforceSingleRowOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/EnforceSingleRowOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/EnforceSingleRowOperator.java index 45f41e09ca3b2..8e85beebd6df5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/EnforceSingleRowOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/EnforceSingleRowOperator.java @@ -17,13 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/FilterAndProjectOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/FilterAndProjectOperator.java index ed1d3b54fa8fc..ee66b35f2d28b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/FilterAndProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/FilterAndProjectOperator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.transformation.dag.column.AbstractCaseWhenThenColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; @@ -32,7 +32,6 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/LimitOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/LimitOperator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/LimitOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/LimitOperator.java index f95b4a1aeea1d..115f5289a293e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/LimitOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/LimitOperator.java @@ -17,12 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MappingCollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MappingCollectOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MappingCollectOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MappingCollectOperator.java index 1f77429b3d689..ec90fb80cac7e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MappingCollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MappingCollectOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MergeSortOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java index 1c80854e4e42f..4e57a3b34ecc8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/MergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -55,7 +55,7 @@ public abstract class MergeSortOperator extends AbstractConsumeAllOperator { private boolean finished; - MergeSortOperator( + protected MergeSortOperator( OperatorContext operatorContext, List inputOperators, List dataTypes, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/OffsetOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/OffsetOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/OffsetOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/OffsetOperator.java index 76600e65b96c9..b4192314b900b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/OffsetOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/OffsetOperator.java @@ -17,12 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PatternRecognitionOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PatternRecognitionOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java index 5dfae6eca9711..c9fda77fa7b60 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PatternRecognitionOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java @@ -17,22 +17,21 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternPartitionExecutor; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.LogicalIndexNavigation; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternAggregator; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternPartitionExecutor; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternVariableRecognizer; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression.PatternExpressionComputation; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.Matcher; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.RowComparator; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java index 005ee99540215..f39198a9e103d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/PreviousFillWithGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java @@ -17,13 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SortOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java index 73f32d417c111..e989e27fbf0fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.db.utils.sort.DiskSpiller; @@ -39,7 +39,7 @@ public abstract class SortOperator extends AbstractSortOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(SortOperator.class); - SortOperator( + protected SortOperator( OperatorContext operatorContext, Operator inputOperator, List dataTypes, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableFillOperator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableFillOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableFillOperator.java index bb1d5a5815632..24b7373d17bd1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableFillOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; @@ -40,7 +40,7 @@ public TableFillOperator( } @Override - Column getHelperColumn(TsBlock tsBlock) { + protected Column getHelperColumn(TsBlock tsBlock) { // if helperColumnIndex is -1, HelperColumn won't be used, so just return TimeColumn in TsBlock // instead return helperColumnIndex == -1 ? tsBlock.getTimeColumn() : tsBlock.getColumn(helperColumnIndex); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillOperator.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillOperator.java index 79c561dfaa603..b7ecdea33bf79 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; @@ -42,14 +42,14 @@ public TableLinearFillOperator( } @Override - Column getHelperColumn(TsBlock tsBlock) { + protected Column getHelperColumn(TsBlock tsBlock) { // if helperColumnIndex is -1, HelperColumn won't be used, so just return TimeColumn in TsBlock // instead return tsBlock.getColumn(helperColumnIndex); } @Override - Integer getLastRowIndexForNonNullHelperColumn(TsBlock tsBlock) { + protected Integer getLastRowIndexForNonNullHelperColumn(TsBlock tsBlock) { Column helperColumn = getHelperColumn(tsBlock); int size = tsBlock.getPositionCount(); if (!helperColumn.mayHaveNull()) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillWithGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillWithGroupOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java index 8b638fd0c1fac..6d622ee576e78 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableLinearFillWithGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableMergeSortOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java index c9e4667a59af3..70dd1fd97ae3a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableSortOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java index fb4795847101a..75811a796d5a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.db.utils.sort.TableDiskSpiller; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java index e1f4f62d8ae37..4809c6c812b4a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.db.utils.sort.TableDiskSpiller; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableTopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableTopKOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java index 983f5f6db200c..39fcfadac8c66 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableTopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TopKOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java index 1c943548d01c4..985bb5bc2c15d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.queryengine.execution.operator.process.TreeTopKOperator; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -87,7 +87,7 @@ public abstract class TopKOperator implements ProcessOperator { public static final int OPERATOR_BATCH_UPPER_BOUND = 100000; - TopKOperator( + protected TopKOperator( OperatorContext operatorContext, List childrenOperators, List dataTypes, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ValuesOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ValuesOperator.java index 31703b553b629..480b3ec702524 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ValuesOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process; +package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionLeafOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionLeafOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java index 7b3c12386fc89..69423c981d78a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionLeafOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.function; +package org.apache.iotdb.db.calc_commons.execution.operator.process.function; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; import org.apache.iotdb.udf.api.relational.table.processor.TableFunctionLeafProcessor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java index edac5810d9d9a..d10f5fdbae406 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/TableFunctionOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java @@ -17,17 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.function; +package org.apache.iotdb.db.calc_commons.execution.operator.process.function; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.AggregationMergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionCache; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.AggregationMergeSortOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.PartitionCache; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.PartitionState; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.db.queryengine.execution.operator.process.function.PartitionRecognizer; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; import org.apache.iotdb.udf.api.relational.table.processor.TableFunctionDataProcessor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/partition/PartitionCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/PartitionCache.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/partition/PartitionCache.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/PartitionCache.java index 1797c8fc00e9e..29ea1afce3e26 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/partition/PartitionCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/PartitionCache.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.function.partition; +package org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/partition/PartitionState.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/PartitionState.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/partition/PartitionState.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/PartitionState.java index 1c3c6e8686ad8..fa0583d75b094 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/partition/PartitionState.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/PartitionState.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.function.partition; +package org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition; public class PartitionState { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/partition/Slice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/Slice.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/partition/Slice.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/Slice.java index f504ec0da52d8..44630f3aeeec0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/partition/Slice.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/Slice.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.function.partition; +package org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition; import org.apache.iotdb.db.utils.ObjectTypeUtils; import org.apache.iotdb.udf.api.relational.access.Record; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java index 7a8a2517b15aa..24f72e3d29d26 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java index 9a0f971426177..73d5a26d07c23 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java index 9203625c69aba..1bf4eed51703f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java index 0586fa6a53d12..4b78007a964ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java index 351cb0599dbd0..eafb053e2f17a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java index 99b9d23dd946c..2a7b2b19c7c79 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java index 8b94dde815bfc..d20b6aa73b6cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java index 793c3f2a1e6ac..383eb43e023c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java index b1ee6d5c4af58..48ac9205c37d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java index 2402574265c4b..87f33e1cee106 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java index 0c20b7d45f8f5..eae1de899226c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java index de835133f000a..983dce239932b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java index f3d5fbadd29dd..d85e0364bc963 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java index 59ea63730d016..d6a701d2e6fd0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java index 44849b9a1541f..cf06e9d3acf38 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/JoinKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/JoinKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java index 2857f545e1ae2..f93bf21de29f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/JoinKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java index 4ab5f87fb798b..9dd06f4574600 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/LogicalIndexNavigation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/LogicalIndexNavigation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java index 4259119dba570..9429304423700 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/LogicalIndexNavigation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; import java.util.Collections; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregationTracker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregationTracker.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java index aa0c25b816eaa..ef8e3cbbc0bb2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregationTracker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.IntList; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.IntList; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java index 7afe5cb171d8e..44b84fd5bc2b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregators.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregators.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java index d25363f2304ec..4d1d0200c674b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternAggregators.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; import java.util.Arrays; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternPartitionExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternPartitionExecutor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java index 07852c6f1ceac..0eea49975fd75 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternPartitionExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; - +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; + +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer.PatternVariableComputation; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.MatchResult; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternVariableRecognizer.PatternVariableComputation; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression.PatternExpressionComputation; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.MatchResult; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.Matcher; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.RowComparator; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternVariableRecognizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternVariableRecognizer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java index 39cd5b163e58a..3652f6d620057 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternVariableRecognizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression.Computation; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression.PatternExpressionComputation; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.Computation; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PhysicalAggregationPointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PhysicalAggregationPointer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java index ed1ada2ac036e..bba6ae5523900 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PhysicalAggregationPointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; public class PhysicalAggregationPointer implements PhysicalValueAccessor { private final int index; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PhysicalValueAccessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PhysicalValueAccessor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java index 81dd0ad095f6a..71242f8b66b49 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PhysicalValueAccessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java @@ -17,6 +17,6 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; public interface PhysicalValueAccessor {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PhysicalValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PhysicalValuePointer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java index 414705dbbf599..036f7d2b4dc42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PhysicalValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/ArithmeticOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/ArithmeticOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java index 59f0cbdc42a8f..86b83a80af8e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/ArithmeticOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/BinaryComputation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/BinaryComputation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java index 32a14cb7ce4c6..b2bd75e8d84ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/BinaryComputation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/BinaryOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/BinaryOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java index f913b64968502..2bc993fef66ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/BinaryOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; public interface BinaryOperator { /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/CastComputation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/CastComputation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java index 8c7b3f808877e..0ec5d2374cb1d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/CastComputation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/ComparisonOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/ComparisonOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java index 96bd1d991b057..4142c1f419213 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/ComparisonOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/Computation.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/Computation.java index a9df4dbacde6d..fa2d4e90c14b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/Computation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/Computation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/ConstantComputation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/ConstantComputation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java index 6412917ff0a4e..08db21e9add80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/ConstantComputation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/LogicalOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/LogicalOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java index c426cbd16939c..48b32a1351f57 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/LogicalOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/NaryComputation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/NaryComputation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java index 291f95d046be4..0a3ea4282b3c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/NaryComputation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/NaryOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/NaryOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java index 1d5d469a6b466..b9cb2d262117e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/NaryOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java index cb8cbdccbb695..b66db2c6efcd8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression; - +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; + +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalAggregationPointer; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValueAccessor; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternAggregator; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalAggregationPointer; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValueAccessor; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValuePointer; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.type.AbstractIntType; @@ -41,8 +41,8 @@ import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; -import static org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; import static org.apache.tsfile.enums.TSDataType.STRING; public class PatternExpressionComputation { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/ReferenceComputation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/ReferenceComputation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java index 8d8b7fd6367fa..105fc943d4dd0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/expression/ReferenceComputation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/ArrayView.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/ArrayView.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java index 63197a26ccf65..1b737ffeff1a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/ArrayView.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; import com.google.common.annotations.VisibleForTesting; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Done.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Done.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Done.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Done.java index 08e26baca8a89..e0eb0c4208463 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Done.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Done.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; class Done implements Instruction { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Instruction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Instruction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java index 68400950271c0..269892966d553 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Instruction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; interface Instruction { enum Type { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IntList.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IntList.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java index c5fd5dd2620d8..560c111a5942a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IntList.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IntMultimap.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IntMultimap.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java index 3baf0ef782e10..1a10dc1340f26 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IntMultimap.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IntStack.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IntStack.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java index 47fbc1ca5d4a8..403e246b97c5f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IntStack.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java index 70d1253e71c13..bb0b6576e7892 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAlternation; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAnchor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Jump.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Jump.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java index c75698c97f82b..9db3497cf0a5c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Jump.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/MatchEnd.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/MatchEnd.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java index 7d14586186ba0..fa30f0af86c09 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/MatchEnd.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; class MatchEnd implements Instruction { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/MatchLabel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/MatchLabel.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java index d839508ea30ee..584f1516e895b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/MatchLabel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/MatchResult.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/MatchResult.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java index fd79e55589db9..a2be6d5836694 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/MatchResult.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/MatchStart.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/MatchStart.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java index f8dd5e5597a27..0d6eed3c748d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/MatchStart.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; class MatchStart implements Instruction { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Matcher.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Matcher.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java index ffb5f7e6fce5e..e3492d458b6dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Matcher.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternAggregator; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternAggregators; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternVariableRecognizer; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregators; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; import org.apache.tsfile.utils.RamUsageEstimator; import java.util.List; -import static org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.MatchResult.NO_MATCH; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.MatchResult.NO_MATCH; public class Matcher { private final Program program; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/PatternCaptures.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/PatternCaptures.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java index 640ae54e98c23..25f556e56a3f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/PatternCaptures.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Program.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Program.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Program.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Program.java index d679cad42dcb8..a29ab2ad6973c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Program.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Program.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Save.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Save.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Save.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Save.java index fceac14288256..f213c16d81f18 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Save.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Save.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; class Save implements Instruction { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Split.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Split.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Split.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Split.java index 5376ad44ba261..d8da43120a212 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/matcher/Split.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Split.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java index 998d436ab01e2..f141ab8fb389a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java index 0d2f3ea860fb6..cdbea645d3888 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java @@ -17,22 +17,22 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionCache; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.function.PartitionRecognizer; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.PartitionCache; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.PartitionState; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.Slice; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java index 355e1903c76bc..66d5b3953c182 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java @@ -17,9 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.execution.operator.GroupedTopNBuilder; import org.apache.iotdb.db.queryengine.execution.operator.GroupedTopNRowNumberBuilder; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.SimpleTsBlockWithPositionComparator; import org.apache.iotdb.db.queryengine.execution.operator.TsBlockWithPositionComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/WindowFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/WindowFunction.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/WindowFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/WindowFunction.java index acaf72da85654..dc92585873922 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/WindowFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/WindowFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/WindowFunctionFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java similarity index 62% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/WindowFunctionFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java index 04c8a774deb27..41853d836b0ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/WindowFunctionFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank.CumeDistFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank.DenseRankFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank.NTileFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank.PercentRankFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank.RankFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank.RowNumberFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value.FirstValueFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value.LagFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value.LastValueFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value.LeadFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value.NthValueFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.CumeDistFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.DenseRankFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.NTileFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.PercentRankFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RankFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RowNumberFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.FirstValueFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LagFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LastValueFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LeadFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.NthValueFunction; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java index b8f5a95f3fa3b..495afb677b3ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/WindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/WindowAggregator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java index 4b428de77d6e0..bf09c971be081 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/WindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java index e4745bd0ad54b..f407f89117874 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java index ac16fcf66f088..5413199386f8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java index c218215f19832..19e97d2765c90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java index 35741eb4078b4..bb9dd0785b631 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RankFunction.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RankFunction.java index c6fbf710e725d..6e811f6a4575f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RankFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankWindowFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankWindowFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java index b2c672afbea65..10325d423653f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankWindowFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java index 67a790557bcb8..7ea5344ab2fa3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java index 465ec2920fc28..1733a0d05a818 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LagFunction.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LagFunction.java index 91e39753344d9..c8d75fb6750f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LagFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java index 1c929d035be34..e6344e4754e2e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LeadFunction.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LeadFunction.java index c51eac1563596..44651a9d1e7bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LeadFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java index 83c245119ff01..824edefc725bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/ValueWindowFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/ValueWindowFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java index 45e5b9def92b0..69f8f838e7b88 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/ValueWindowFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/Partition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/Partition.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/Partition.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/Partition.java index ac23bbc9fef34..63d6720eea812 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/Partition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/Partition.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.Slice; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/PartitionExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/PartitionExecutor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java index d5a68ea579672..50a6fb5025ed7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/PartitionExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition; - -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.Frame; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.GroupsFrame; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.RangeFrame; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.RowsFrame; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.Range; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.RowComparator; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition; + +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.Frame; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.GroupsFrame; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.RangeFrame; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.RowsFrame; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/Frame.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/Frame.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/Frame.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/Frame.java index b697420443c58..bd6e0349b3be3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/Frame.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/Frame.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.Range; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; public interface Frame { Range getRange(int currentPosition, int currentGroup, int peerGroupStart, int peerGroupEnd); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameInfo.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java index 64dc54407d6ec..36ce3b0900e98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrame.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrame.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java index 3e9b111301da8..30dd01d08b91a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrame.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.Range; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.RowComparator; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrame.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrame.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java index 64981fb62323b..09ad9f090b052 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrame.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.Range; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.RowComparator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.write.UnSupportedDataTypeException; @@ -31,9 +31,9 @@ import java.util.List; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.CURRENT_ROW; -import static org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.UNBOUNDED_FOLLOWING; -import static org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.UNBOUNDED_PRECEDING; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.CURRENT_ROW; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.UNBOUNDED_FOLLOWING; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.UNBOUNDED_PRECEDING; public class RangeFrame implements Frame { private final Partition partition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrame.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrame.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java index 51f386e4f6577..24df0db346094 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrame.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.Range; import static com.google.common.base.Preconditions.checkArgument; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/utils/ColumnList.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/ColumnList.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/utils/ColumnList.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/ColumnList.java index 97152b715d804..2e29be9029576 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/utils/ColumnList.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/ColumnList.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.utils; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnEncoding; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/utils/Range.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/Range.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/utils/Range.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/Range.java index 9994742bbfee4..60876bdd02f81 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/utils/Range.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/Range.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.utils; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils; public class Range { private final int start; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/utils/RowComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/RowComparator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/utils/RowComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/RowComparator.java index 73ff0fe60e64c..2abeb817456f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/utils/RowComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/RowComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.window.utils; +package org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractMergeSortJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractMergeSortJoinOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java index 3b1fe191e8453..6498e6243bf38 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractMergeSortJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java index 84475f1c89a48..c896216c81c00 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java @@ -17,12 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractAsofMergeSortJoinOperator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java index a4a1b21581fbf..901491ff11022 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java @@ -17,12 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractAsofMergeSortJoinOperator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MarkDistinctOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MarkDistinctOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java index b41cdd98865f6..e6386c9639fea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MarkDistinctOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.MarkDistinctHash; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java index 04e20c9b28202..12b56ede05cb9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortInnerJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortInnerJoinOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java index 76eb04e06c08e..1f4c9709798be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortInnerJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortLeftJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortLeftJoinOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java index b78da19254bc2..41031c460bfc0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortLeftJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortSemiJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortSemiJoinOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java index 28b5bdcc4dbdb..d9f380cfe635c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MergeSortSemiJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java index 08fa0a54de4b5..e5131c70a634c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java @@ -21,10 +21,10 @@ import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java index 43096b6bded3d..ca8113230d0c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java @@ -21,12 +21,12 @@ import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java index 922ab0503e3ab..243307d190e22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.primitives.Ints; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java index b13231c27c538..f6b8fa0a8863b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java @@ -21,12 +21,12 @@ import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.primitives.Ints; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java index 005c5943f5616..3178686894c32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 6ddd813e2367c..f0d91827c8a36 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -20,6 +20,24 @@ package org.apache.iotdb.db.calc_commons.plan.planner; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.AssignUniqueIdOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.CollectOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.EnforceSingleRowOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.MappingCollectOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.PatternRecognitionOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.PreviousFillWithGroupOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.TableFillOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.TableLinearFillOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.TableLinearFillWithGroupOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.TableMergeSortOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.TableSortOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.TableStreamSortOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.TableTopKOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ValuesOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BinaryConstantFill; @@ -28,6 +46,37 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.FloatConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.IntConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.LongConstantFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.TableFunctionLeafOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.TableFunctionOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregationTracker; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalAggregationPointer; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValueAccessor; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.Computation; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.IrRowPatternToProgramRewriter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Program; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.RowNumberOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.TableWindowOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.TopKRankingOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunctionFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate.WindowAggregator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.AsofMergeSortLeftJoinOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.MarkDistinctOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.MergeSortFullOuterJoinOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.MergeSortInnerJoinOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.MergeSortLeftJoinOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.MergeSortSemiJoinOperator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationOperator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; @@ -39,6 +88,15 @@ import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingAggregationOperator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; import org.apache.iotdb.db.calc_commons.execution.relational.ColumnTransformerBuilder; +import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToBlobLiteralVisitor; +import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToBooleanLiteralVisitor; +import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToDateLiteralVisitor; +import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToDoubleLiteralVisitor; +import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToFloatLiteralVisitor; +import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToInt32LiteralVisitor; +import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToInt64LiteralVisitor; +import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToStringLiteralVisitor; +import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToTimestampLiteralVisitor; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -99,73 +157,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.AssignUniqueIdOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.CollectOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.EnforceSingleRowOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.FilterAndProjectOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.MappingCollectOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.OffsetOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.PatternRecognitionOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.PreviousFillWithGroupOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.TableFillOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.TableLinearFillOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.TableLinearFillWithGroupOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.TableMergeSortOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.TableSortOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.TableStreamSortOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.TableTopKOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.ValuesOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.TableFunctionLeafOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.TableFunctionOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.gapfill.GapFillWGroupWMoOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.LogicalIndexNavigation; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternAggregationTracker; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternAggregator; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PatternVariableRecognizer; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalAggregationPointer; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValueAccessor; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValuePointer; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression.Computation; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression.PatternExpressionComputation; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.IrRowPatternToProgramRewriter; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.Matcher; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.Program; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.RowNumberOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.TopKRankingOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.WindowFunctionFactory; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate.AggregationWindowFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate.WindowAggregator; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AsofMergeSortLeftJoinOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.CteScanOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.MarkDistinctOperator; -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.MergeSortLeftJoinOperator; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.MergeSortSemiJoinOperator; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToBlobLiteralVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToBooleanLiteralVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToDateLiteralVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToDoubleLiteralVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToFloatLiteralVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToInt32LiteralVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToInt64LiteralVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToStringLiteralVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.CastToTimestampLiteralVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; @@ -210,6 +208,8 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createAccumulator; import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createBuiltinAccumulator; import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; @@ -226,8 +226,6 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; -import static org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; -import static org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.IDENTITY_FILL; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; @@ -252,22 +250,6 @@ public Operator visitPlan(PlanNode node, LocalExecutionPlanContext context) { throw new UnsupportedOperationException("should call the concrete visitXX() method"); } - @Override - public Operator visitCteScan(CteScanNode node, LocalExecutionPlanContext context) { - OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - CteScanOperator.class.getSimpleName()); - return new CteScanOperator( - operatorContext, - node.getPlanNodeId(), - node.getDataStore(), - context.getFragmentInstanceId().getQueryId()); - } - public static Map> makeLayout(final List children) { final Map> outputMappings = new LinkedHashMap<>(); int tsBlockIndex = 0; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBlobLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBlobLiteralVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java index 634df74109f12..bef1e2c9af5da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBlobLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner; +package org.apache.iotdb.db.calc_commons.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; @@ -28,12 +29,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.tsfile.utils.Binary; // return NULL, if we cannot parse literal to blob type -public class CastToBlobLiteralVisitor extends AstVisitor { +public class CastToBlobLiteralVisitor extends CommonQueryAstVisitor { @Override protected Binary visitLiteral(Literal node, Void context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBooleanLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBooleanLiteralVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java index 55c8f504db4b9..8e973cdec388c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToBooleanLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner; +package org.apache.iotdb.db.calc_commons.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; @@ -28,10 +29,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; // return NULL, if we cannot parse literal to boolean type -public class CastToBooleanLiteralVisitor extends AstVisitor { +public class CastToBooleanLiteralVisitor extends CommonQueryAstVisitor { @Override protected Boolean visitLiteral(Literal node, Void context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDateLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDateLiteralVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java index f348e3c1ca538..20462fa84fa9d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDateLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner; +package org.apache.iotdb.db.calc_commons.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; @@ -28,12 +29,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.tsfile.utils.DateUtils; // return NULL, if we cannot parse literal to date type -public class CastToDateLiteralVisitor extends AstVisitor { +public class CastToDateLiteralVisitor extends CommonQueryAstVisitor { @Override protected Integer visitLiteral(Literal node, Void context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDoubleLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDoubleLiteralVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java index 766f25f198953..be66a5867137d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToDoubleLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner; +package org.apache.iotdb.db.calc_commons.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; @@ -28,10 +29,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; // return NULL, if we cannot parse literal to double type -public class CastToDoubleLiteralVisitor extends AstVisitor { +public class CastToDoubleLiteralVisitor extends CommonQueryAstVisitor { @Override protected Double visitLiteral(Literal node, Void context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToFloatLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToFloatLiteralVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java index 75c14c5487597..65203715a9b87 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToFloatLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner; +package org.apache.iotdb.db.calc_commons.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; @@ -28,10 +29,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; // return NULL, if we cannot parse literal to float type -public class CastToFloatLiteralVisitor extends AstVisitor { +public class CastToFloatLiteralVisitor extends CommonQueryAstVisitor { @Override protected Float visitLiteral(Literal node, Void context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt32LiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt32LiteralVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java index b599c68837346..40a47fc9418ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt32LiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner; +package org.apache.iotdb.db.calc_commons.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; @@ -28,10 +29,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; // return NULL, if we cannot parse literal to INT32 type -public class CastToInt32LiteralVisitor extends AstVisitor { +public class CastToInt32LiteralVisitor extends CommonQueryAstVisitor { @Override protected Integer visitLiteral(Literal node, Void context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt64LiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt64LiteralVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java index b4f6e33a1f178..62343667cce1d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToInt64LiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner; +package org.apache.iotdb.db.calc_commons.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; @@ -28,10 +29,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; // return NULL, if we cannot parse literal to INT64 type -public class CastToInt64LiteralVisitor extends AstVisitor { +public class CastToInt64LiteralVisitor extends CommonQueryAstVisitor { @Override protected Long visitLiteral(Literal node, Void context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToStringLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToStringLiteralVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java index 8d12c763923d3..862e5557880be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToStringLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner; +package org.apache.iotdb.db.calc_commons.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.BytesUtils; @@ -36,7 +36,7 @@ import java.nio.charset.Charset; // return NULL, if we cannot parse literal to string/text type -public class CastToStringLiteralVisitor extends AstVisitor { +public class CastToStringLiteralVisitor extends CommonQueryAstVisitor { private final Charset charset; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToTimestampLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToTimestampLiteralVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java index 37e67f3cfe3c6..edd252ece7197 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CastToTimestampLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.planner; +package org.apache.iotdb.db.calc_commons.plan.relational.planner; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; @@ -28,13 +29,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.utils.DateTimeUtils; import java.time.ZoneId; // return NULL, if we cannot parse literal to timestamp type -public class CastToTimestampLiteralVisitor extends AstVisitor { +public class CastToTimestampLiteralVisitor extends CommonQueryAstVisitor { private final ZoneId zoneId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java index ef6d4eef14472..0ffcaa1668b61 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java @@ -53,7 +53,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; public interface ICoreQueryPlanVisitor extends IPlanVisitor { @@ -67,10 +66,6 @@ default R visitSourceNode(SourceNode node, C context) { return visitPlan(node, context); } - default R visitCteScan(CteScanNode node, C context) { - return visitSourceNode(node, context); - } - // single child -------------------------------------------------------------------------------- default R visitSingleChildProcess(SingleChildProcessNode node, C context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/LogicalIndexPointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/LogicalIndexPointer.java index 1dee70133b5d8..cc1d1c6fb308b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/LogicalIndexPointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/LogicalIndexPointer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.LogicalIndexNavigation; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 758d4527d6587..d8062cd9786c4 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 @@ -45,6 +45,7 @@ import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.db.audit.DNAuditLogger; import org.apache.iotdb.db.auth.AuthorityChecker; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.SessionInfo; @@ -73,7 +74,6 @@ import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FakedFragmentInstanceContext; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractSeriesAggregationScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesAggregationScanOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java index e0a06ae2ae73f..41d9d637c1e15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.schedule.task.DriverTaskId; import org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.metric.QueryMetricsManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java index d153e05f69631..1bbe2b9b764a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.driver; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.ExchangeOperator; import org.apache.iotdb.db.queryengine.execution.schedule.task.DriverTaskId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java index 4e2319b5a1872..5b42dab79fc6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.fragment; import org.apache.iotdb.commons.utils.FileUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.exchange.MPPDataExchangeManager; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; import org.apache.iotdb.db.queryengine.execution.operator.ExplainAnalyzeOperator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.schedule.IDriverScheduler; import org.apache.iotdb.db.utils.SetThreadName; import org.apache.iotdb.mpp.rpc.thrift.TFetchFragmentInstanceStatisticsResp; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java index 9653b4a39cfbb..5aa39c1e99aed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java index b9fdd7a495f83..01fde66d65a6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java index 4df031d59a8e1..457438e925190 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java @@ -22,11 +22,11 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.IntoProcessException; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.rpc.TSStatusCode; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java index 371aaea226dc6..b326c9d557de7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java index cd495cff980ca..d20644fbde0a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java @@ -20,8 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java index 040f4f56cfdf2..d0ca9dc420e71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.TimeRange; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java index 37a89a9db0f03..e9c8fbacee55e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.columngenerator.ColumnGenerator; import com.google.common.util.concurrent.ListenableFuture; 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 efd2514790324..352995ba593a4 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 @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.IntoProcessException; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java index 8d4b779c2b66c..b37b04f1e03e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java index 768bbbad6768b..9539ee0efb36f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java index ca0715b3c3eda..8e80a80701855 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.window.IWindow; import org.apache.iotdb.db.queryengine.execution.operator.window.IWindowManager; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java index 2069bce5012ec..160b75b4e98a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java index da80d054d4484..2171746ba8fd1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java index aa3b0ac29450a..2e41a73a4fcd2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow.SlidingWindowAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java index 35a5ef1f06c3b..468f93af7968c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java @@ -24,10 +24,10 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java index 8edbcd7a8eafe..984c85c68df82 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java @@ -20,9 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java index ef6406a226e7c..60b92e9c76995 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java @@ -22,13 +22,13 @@ import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java index bd1db31fb2563..11e8be6562a53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java @@ -20,8 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractFillOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; @@ -33,7 +34,7 @@ public TreeFillOperator(OperatorContext operatorContext, IFill[] fillArray, Oper } @Override - Column getHelperColumn(TsBlock tsBlock) { + protected Column getHelperColumn(TsBlock tsBlock) { return tsBlock.getTimeColumn(); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java index d4998c9015c1f..3b3245a6e15f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java index 3c21c93864b6a..771ec8a79ea67 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java @@ -20,8 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractLinearFillOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; @@ -34,12 +35,12 @@ public TreeLinearFillOperator( } @Override - Column getHelperColumn(TsBlock tsBlock) { + protected Column getHelperColumn(TsBlock tsBlock) { return tsBlock.getTimeColumn(); } @Override - Integer getLastRowIndexForNonNullHelperColumn(TsBlock tsBlock) { + protected Integer getLastRowIndexForNonNullHelperColumn(TsBlock tsBlock) { return tsBlock.getPositionCount() - 1; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java index 5260ba393f662..fdc29a1b4e172 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java @@ -20,7 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java index 55863e9b8e360..0586ef55c9f41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java @@ -20,7 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.SortOperator; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.db.utils.sort.TreeDiskSpiller; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java index 773c036302454..0a6531dedf8ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java @@ -20,7 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.TopKOperator; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java index f55c38c645cb5..277cfb4e09221 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java @@ -23,6 +23,7 @@ import org.apache.iotdb.ainode.rpc.thrift.TInferenceResp; import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; import org.apache.iotdb.db.exception.runtime.ModelInferenceProcessException; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.protocol.client.an.AINodeClient; import org.apache.iotdb.db.protocol.client.an.AINodeClientManager; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.model.ModelInferenceDescriptor; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java index 6971475c4316d..4a9ec2248cb1c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.CopyToTsFileOptions; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.TsFileFormatCopyToWriter; import org.apache.iotdb.db.storageengine.rescon.disk.TierManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java index d8658f9f1fa0b..75efa595f1d4c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.function; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.PartitionState; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java index 8605dc8c8a028..48f4a949de9b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java index 186c5964d83d5..c375c47d76a81 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java index ceb791ba11c9b..71521a10e4edf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java index 1a1a17593b692..b44a7ba88c0fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java index 2920a5fd5982c..79dcf1a5682bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java @@ -22,7 +22,7 @@ // without month interval import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java index 39ddc57f3e82e..c65f133c70738 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java index 149add5b4dee7..ff050d318cb14 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java index 7ccb9648a8917..bceb28183758e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.ColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java index 01d741861fdd6..73a92df566579 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.AbstractConsumeAllOperator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java index df0473a03041c..8b5f10db8da3d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java index 99dcbf2e560f2..b1116ea423030 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java index 6a5ec86cc2aa7..dd7a5375ecb15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java index 08d7e71cf9fa4..0a0a7febb393b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java index 6c159e2672746..7a29a99829e63 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java index 832300f4f5771..ff8f9c7f61137 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java index d5a7f92aff957..009f1d997baf3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java index 276e62d08960b..50bf870d92a78 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java index 09e69af85c1ae..0aa1799ec9716 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java index d573f9a234fea..3a37d00b4b1fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java index a80bccfed9cdb..d15cb8b66a229 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java index 26e960db04093..e3869ab8f1632 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java index 996508364fb9d..9a3b972d6bf24 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java index 6b73ede4a6f6b..c45f2f774be66 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java index f1851eeb5901c..9742554db3660 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; 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/CountMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java index 8fe4604ea907d..ee72cee1b09e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.enums.TSDataType; 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 314a931cc524e..1d54f07bb93e3 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 @@ -24,9 +24,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.node.MNodeType; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; 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 e2a08deaa6830..ae7bb15d3c135 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 @@ -24,9 +24,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; 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 7b1fa1f9385ff..608da4762ec08 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 @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java index bd55f5103b7bb..edd71f2a3e0d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java index 18c7a2bf9eae8..e5c68d374b8b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java index aa65e3441d5d6..77cff0040c800 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java @@ -25,11 +25,11 @@ import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.common.schematree.node.SchemaNode; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java index 3f7d49ab588b5..b4a50673180c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; 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 e9fccdfedf974..8d33cc13a8b25 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 @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; 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 0ba4335eee36d..0b0c48e00b9ac 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 @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; import org.apache.iotdb.commons.schema.column.ColumnHeader; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; 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 dbbd7e5972842..acc8de457ff5c 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 @@ -44,7 +44,7 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; -import static org.apache.iotdb.db.queryengine.execution.operator.process.FilterAndProjectOperator.constructFilteredTsBlock; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator.constructFilteredTsBlock; public class DeviceAttributeUpdater extends DeviceUpdater { private final List commonTransformerList; 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 7a14018eb2e3c..bf36d17e83d51 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 @@ -39,7 +39,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import static org.apache.iotdb.db.queryengine.execution.operator.process.FilterAndProjectOperator.satisfy; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator.satisfy; import static org.apache.iotdb.db.queryengine.execution.operator.schema.source.TableDeviceQuerySource.transformToTableDeviceTsBlockColumns; public abstract class DevicePredicateHandler implements AutoCloseable { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java index b4abb30ef0fa0..7bae5d19ea4b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java index e0b62aa5d3d2a..a4691f8126b07 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java index d5fffd6b14b8d..08cedd587567a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.tsfile.enums.TSDataType; 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 916921e3c870f..db952156935be 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 @@ -24,9 +24,9 @@ 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.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DeviceContext; -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.schemaengine.template.ClusterTemplateManager; 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 0f2b940a3a62e..d081aa41e61e5 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 @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java index 8ad102ef9f904..20e80ee043f53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java index 3bdb8f78d9d9f..3633b673f1cc3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java index 8a7c2fda8dbc3..066523c3cf935 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.source.ISourceHandle; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java index 1ffa6542a8359..484e922b03d34 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java index d8ba1cf7989ca..4e201f16e30d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.IFullPath; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java index 5d35db1e16146..0f4ab091e72c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.IFullPath; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java index 09dc225f9a025..fe9059716197d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.db.storageengine.dataregion.utils.StorageEngineTimePartitionIterator; import org.apache.iotdb.db.storageengine.dataregion.utils.TreeDiskUsageStatisticUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java index 8ccddf64ccc40..4bdfd82a880b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; import org.apache.iotdb.db.utils.TimestampPrecisionUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java index 1730fe33dba24..3adcafd11adb2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java @@ -22,11 +22,11 @@ import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanUtil; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java index eb7f07d2a8e74..15e2f32621fbc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java @@ -20,8 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.AbstractMergeSortJoinOperator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java index e1fb6b83c5aa9..199ddbd82eead 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractSeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java index 70caacbf358eb..b998db4fdc3bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java @@ -21,10 +21,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; import org.apache.iotdb.db.utils.cte.CteDataReader; import org.apache.iotdb.db.utils.cte.CteDataStore; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java index 9510a2a8c3e2c..c74d33109d569 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java @@ -21,8 +21,8 @@ import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; 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 index 5f788b68ca06c..2e43a27147580 100644 --- 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 @@ -64,6 +64,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TTableInfo; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.ConnectionInfo; import org.apache.iotdb.db.node_commons.common.SqlDialect; @@ -78,7 +79,6 @@ import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.QueryState; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; import org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.ShowCreateViewTask; 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 index 579eb316ca982..fd1fc859c77fd 100644 --- 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 @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java index 952a1b802c256..53aca92a40c4b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; 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/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 9318885eceac1..22a25c948f2af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -24,6 +24,10 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.calc_commons.execution.relational.ColumnTransformerBuilder; @@ -55,10 +59,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.queryengine.execution.operator.EmptyDataOperator; import org.apache.iotdb.db.queryengine.execution.operator.ExplainAnalyzeOperator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.FilterAndProjectOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.TableIntoOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.TableCopyToOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.FullOuterTimeJoinOperator; @@ -80,6 +80,7 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractAggTableScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator; +import org.apache.iotdb.db.queryengine.execution.operator.source.relational.CteScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.DefaultAggTableScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.DeviceIteratorScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.InformationSchemaTableScanOperator; @@ -107,6 +108,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AlignedAggregationTreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; 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.ExplainAnalyzeNode; @@ -201,6 +203,22 @@ public DataNodeTableOperatorGenerator(Metadata metadata) { super(metadata); } + @Override + public Operator visitCteScan(CteScanNode node, LocalExecutionPlanContext context) { + OperatorContext operatorContext = + context + .getDriverContext() + .addOperatorContext( + context.getNextOperatorId(), + node.getPlanNodeId(), + CteScanOperator.class.getSimpleName()); + return new CteScanOperator( + operatorContext, + node.getPlanNodeId(), + node.getDataStore(), + context.getFragmentInstanceId().getQueryId()); + } + @Override public Operator visitIdentitySink(IdentitySinkNode node, LocalExecutionPlanContext context) { context.addExchangeSumNum(1); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index 84455be5b13fd..4fd18bd6a9fbf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -30,6 +30,12 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.AggregationMergeSortOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.CollectOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BinaryConstantFill; @@ -71,17 +77,11 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil; import org.apache.iotdb.db.queryengine.execution.operator.ExplainAnalyzeOperator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ActiveRegionScanMergeOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.AggregationMergeSortOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.AggregationOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.CollectOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.ColumnInjectOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.DeviceViewIntoOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.DeviceViewOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.FilterAndProjectOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.ProjectOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.RawDataAggregationOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.SingleDeviceViewOperator; 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 925327af79399..6186320f07d55 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 @@ -122,6 +122,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AlignedAggregationTreeDeviceViewScanNode; +import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; 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.NonAlignedAggregationTreeDeviceViewScanNode; @@ -151,6 +152,10 @@ public interface PlanVisitor extends ICoreQueryPlanVisitor { // source -------------------------------------------------------------------------------------- + default R visitCteScan(CteScanNode node, C context) { + return visitSourceNode(node, context); + } + default R visitSeriesScanSource(SeriesScanSourceNode node, C context) { return visitSourceNode(node, context); } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java index ee97192fde021..9f05490296cdf 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -36,7 +37,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceState; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.process.LimitOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.SingleDeviceViewOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.FullOuterTimeJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.LeftOuterTimeJoinOperator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java index 6fdfc9370202d..ee6293708f312 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java @@ -19,11 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.AggregationMergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.CountAccumulator; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.AggregationMergeSortOperator; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java index edf7131b09995..be16024ee04c8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java index 1d51a91c29ef2..faa1bd6301a71 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java @@ -22,6 +22,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.CteScanOperator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java index 719cfbdc77b05..54b1b9550e3e9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java index 7d77c3e25dbf3..aed7e437003b3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java index 6649a6f6ebede..78f085d5b3378 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java @@ -20,6 +20,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.FixedIntervalFillFilter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java index 802655c8307e7..7afc2ca4e12ef 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java index 3c8a8562dd524..c5d0ad9db9800 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.process.LimitOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.FullOuterTimeJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; 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 067bc7839bdd4..c52748ef58ac4 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.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java index 2bc2dcdce92ad..46f4cf0ad2952 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java @@ -28,6 +28,8 @@ import org.apache.iotdb.commons.schema.table.column.TimeColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; @@ -41,8 +43,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.DeviceIteratorScanOperator; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.DataNodeTableOperatorGenerator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java index f39c0a57a7860..e1d3278ac904f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java @@ -23,6 +23,8 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -31,8 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.FullOuterTimeJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index 283ed9aac707c..8ae12c07ef5be 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -26,6 +26,10 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.LinearFill; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; @@ -46,9 +50,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.process.AggregationOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.DeviceViewOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.FilterAndProjectOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.RawDataAggregationOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.SlidingWindowAggregationOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeFillOperator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java index 4a03822d96ab0..bb5f9b0a6379e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java @@ -22,6 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.SortOperator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -30,7 +32,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.process.SortOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeSortOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java index 2aca46bbadcd3..f6e0546ab24d5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java index 08fd4a88ba93f..05d0f19f7b4e0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java index 74cd3dd52720d..a2426ee731538 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java @@ -20,6 +20,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java index 9f843467c46dc..27ac251273238 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java index 7b70fdc2cf947..a3c17e35f4ec8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java index 7040f6f16f249..a276c8618f3df 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java @@ -22,6 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.TableStreamSortOperator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; @@ -31,7 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java index 1376b0a0c0285..e08c2245e6750 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.ValuesOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java index 5838768a49743..ea22fc8a69478 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java @@ -22,6 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -30,8 +32,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java index 777a38b3d50f2..6d84000d9351e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java @@ -22,6 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -30,8 +32,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java index a96be31069736..27eccc5dba2c7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java @@ -22,6 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -29,8 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.MergeSortOperator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java index 6a502a09ba640..40936717a22e9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java @@ -22,6 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -29,8 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.MergeSortOperator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java index 59dba2b9147d5..2728830ec61eb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java index b3a7dd0678309..ed2b97afe9754 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java index b520b9c63dca5..8132fff0ee78a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java @@ -19,14 +19,16 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.IrRowPatternToProgramRewriter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.MatchResult; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Program; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.IrRowPatternToProgramRewriter; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.MatchResult; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.Matcher; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.matcher.Program; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternExpressionTest.java index 536efdf124615..89be7476e8eb3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternExpressionTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression.ArithmeticOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression.BinaryComputation; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression.ComparisonOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression.Computation; -import org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern.expression.ReferenceComputation; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.ArithmeticOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.BinaryComputation; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.ComparisonOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.Computation; +import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.ReferenceComputation; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java index 9b4f676649a19..535c246e076d0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java @@ -21,16 +21,16 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; 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.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.function.PartitionRecognizer; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.PartitionState; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.Slice; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java index 963b6f3547ad7..0ce5acbe5538e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java @@ -22,6 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.RowNumberOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -29,7 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java index 55be8fa2b737b..26cb5c71e88b8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java @@ -22,6 +22,11 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.TableWindowOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RankFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -29,11 +34,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank.RankFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java index 81ae5fa943fc9..1bde9153dca25 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java @@ -22,6 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.TopKRankingOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; @@ -31,7 +33,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java index b299f62686012..48f63c953ef2d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java @@ -20,12 +20,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function; import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate.WindowAggregator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate.AggregationWindowFunction; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate.WindowAggregator; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java index 63b4822ec0633..19f66f5604269 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java @@ -21,11 +21,12 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java index 39fc6fe39069b..284c5d7a5579d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java @@ -20,9 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.CumeDistFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java index db2f298a6b3ce..461eee97794fb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java @@ -20,9 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.DenseRankFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java index d6ba0ec1e3063..b7f675241b27c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java @@ -20,8 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.NTileFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java index e24f6d2648364..e4021485c2a78 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java @@ -20,9 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.PercentRankFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java index 415e4cacfce6d..2e5205ecf9ec6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java @@ -20,9 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RankFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java index a98251293dc8e..043c6de69a7db 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java @@ -20,9 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RowNumberFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java index 46ee8fe853582..1af502e2f6d39 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.FirstValueFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java index 0919671e14858..02d47cef7b96f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java @@ -20,8 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LagFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java index 2763add700a72..137ff7b19246e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LastValueFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java index 07ed28e51298a..b770837c84f90 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java @@ -20,8 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LeadFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java index 28c7c9881fed7..270cbe81bd1cb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java @@ -20,9 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.NthValueFunction; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameTestUtils.java index b8a808ae13588..0f5b910620c90 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameTestUtils.java @@ -19,10 +19,15 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.Range; -import org.apache.iotdb.db.queryengine.execution.operator.process.window.utils.RowComparator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.Frame; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.GroupsFrame; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.RangeFrame; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.RowsFrame; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrameTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrameTest.java index e937f147c58db..632c570ebd4c4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrameTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrameTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java index dd6fcc56eb1a7..5e91d23500bb8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrameTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrameTest.java index 19b0daeee49f0..9887686854df8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrameTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrameTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; +import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java index 350962529fe08..0eb94ffc02c07 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ITimeSeriesSchemaInfo; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java index 1d2fe58b93f46..37f0b7782e083 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java @@ -20,6 +20,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ISchemaInfo; 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 09ca7b0047886..8c4ff31f50bea 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 @@ -25,6 +25,7 @@ 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.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.SchemaSourceFactory; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java index 30625a830d744..1416a235bb5c0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.AbstractTableScanOperatorParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java index 3db21eb78e94d..348b34efb91e2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java index 49bf7eaa1f8a4..f83f7cf5baa7f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; +import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; import org.apache.iotdb.db.queryengine.plan.planner.memory.ThreadSafeMemoryReservationManager; import com.google.common.util.concurrent.ListenableFuture; 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 3f7ca2b46d39a..b0751e1e1308c 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 @@ -21,6 +21,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -41,8 +43,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; From ffc07740a534ad81b93c78c70ed817da44168551 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Thu, 16 Apr 2026 10:45:37 +0800 Subject: [PATCH 22/45] move operators --- .../operator/CommonOperatorUtils.java | 28 ----------- .../operator/GroupedTopNBuilder.java | 2 +- .../GroupedTopNRowNumberAccumulator.java | 2 +- .../operator/GroupedTopNRowNumberBuilder.java | 6 +-- .../execution/operator/IdRegistry.java | 2 +- .../operator/RowIdComparisonStrategy.java | 2 +- .../execution/operator/RowIdHashStrategy.java | 2 +- .../execution/operator/RowReference.java | 2 +- .../operator/RowReferenceTsBlockManager.java | 2 +- .../SimpleTsBlockWithPositionComparator.java | 4 +- .../TsBlockWithPositionComparator.java | 2 +- .../process/MappingCollectOperator.java | 2 +- .../process/PatternRecognitionOperator.java | 4 +- .../TableLinearFillWithGroupOperator.java | 2 +- .../process/TableMergeSortOperator.java | 2 +- .../operator/process/TableSortOperator.java | 2 +- .../process/TableStreamSortOperator.java | 2 +- .../operator/process/TableTopKOperator.java | 2 +- .../operator/process/TopKOperator.java | 3 +- .../function/TableFunctionLeafOperator.java | 2 +- .../function/TableFunctionOperator.java | 2 +- .../gapfill/AbstractGapFillOperator.java | 4 +- .../AbstractGapFillWGroupOperator.java | 2 +- .../AbstractGapFillWoGroupOperator.java | 2 +- .../gapfill/GapFillWGroupWMoOperator.java | 2 +- .../gapfill/GapFillWGroupWoMoOperator.java | 2 +- .../gapfill/GapFillWoGroupWMoOperator.java | 2 +- .../gapfill/GapFillWoGroupWoMoOperator.java | 2 +- .../SimpleNestedLoopCrossJoinOperator.java | 2 +- .../join/merge/MergeSortComparator.java | 27 +--------- .../process/join/merge/SortKeyComparator.java | 2 +- .../process/rowpattern/PatternAggregator.java | 2 +- .../rowpattern/matcher/PatternCaptures.java | 2 +- .../process/window/RowNumberOperator.java | 6 +-- .../process/window/TableWindowOperator.java | 4 +- .../process/window/TopKRankingOperator.java | 12 ++--- .../function/aggregate/WindowAggregator.java | 2 +- .../AbstractAsofMergeSortJoinOperator.java | 3 +- .../AbstractMergeSortJoinOperator.java | 4 +- .../AsofMergeSortInnerJoinOperator.java | 1 - .../AsofMergeSortLeftJoinOperator.java | 1 - .../relational/MarkDistinctOperator.java | 4 +- .../MergeSortFullOuterJoinOperator.java | 2 +- .../aggregation/AccumulatorFactory.java | 2 +- .../aggregation/AggregationOperator.java | 2 +- .../aggregation/TableAggregator.java | 10 ++-- .../grouped/GroupedAggregator.java | 2 +- .../grouped/HashAggregationOperator.java | 2 +- .../grouped/StreamingAggregationOperator.java | 2 +- .../StreamingHashAggregationOperator.java | 4 +- .../InMemoryHashAggregationBuilder.java | 6 +-- .../metric/QueryExecutionMetricSet.java | 2 +- ...torUtils.java => CommonOperatorUtils.java} | 12 ++++- .../plan/planner/TableOperatorGenerator.java | 20 ++++---- .../ir/GlobalTimePredicateExtractVisitor.java | 2 - .../relational/utils/matching/Capture.java | 2 +- .../relational/utils/matching/Captures.java | 2 +- .../utils/matching/DefaultPrinter.java | 12 ++--- .../plan/relational/utils/matching/Match.java | 2 +- .../relational/utils/matching/Pattern.java | 10 ++-- .../utils/matching/PatternVisitor.java | 12 ++--- .../relational/utils/matching/Property.java | 6 +-- .../utils/matching/PropertyPattern.java | 2 +- .../matching/pattern/CapturePattern.java | 12 ++--- .../utils/matching/pattern/EqualsPattern.java | 10 ++-- .../utils/matching/pattern/FilterPattern.java | 10 ++-- .../utils/matching/pattern/TypeOfPattern.java | 10 ++-- .../utils/matching/pattern/WithPattern.java | 14 +++--- .../hash/{hash => }/CombineHashFunction.java | 2 +- .../hash/{hash => }/FlatGroupByHash.java | 4 +- .../grouped/hash/{hash => }/FlatHash.java | 6 +-- .../hash/{hash => }/FlatHashStrategy.java | 2 +- .../grouped/hash/{hash => }/GroupByHash.java | 2 +- .../grouped/hash/{hash => }/HashStrategy.java | 2 +- .../hash/{hash => }/MarkDistinctHash.java | 6 +-- .../hash/{hash => }/NoChannelGroupByHash.java | 2 +- .../hash/{hash => }/VariableWidthData.java | 8 +-- .../grouped/hash/{hash => }/XxHash64.java | 2 +- .../relational/planner/node/ApplyNode.java | 4 +- .../relational/sql/ast/BinaryLiteral.java | 2 +- .../sql/ast/CommonQueryAstVisitor.java | 24 +++++++++ .../plan/relational/sql/ast/Fill.java | 12 ++--- .../plan/relational/sql/ast/FunctionCall.java | 2 - .../relational/sql/ast/GenericLiteral.java | 2 +- .../plan/relational/sql/ast/Limit.java | 13 +---- .../plan/relational/sql/ast/LongLiteral.java | 2 +- .../plan/relational/sql/ast/Offset.java | 12 +---- .../relational/sql/ast/ProcessingMode.java | 9 +--- .../plan/relational/sql/ast/Query.java | 4 -- .../plan/relational/sql/ast/With.java | 9 +--- .../plan/relational/sql/ast/WithQuery.java | 11 +--- .../sql/parser/ParsingException.java | 2 +- .../relational/type/NamedTypeSignature.java | 4 +- .../plan/relational/type/ParameterKind.java | 2 +- .../plan/relational/type/RowFieldName.java | 2 +- .../plan/relational/type/StandardTypes.java | 2 +- .../plan/relational/type/TypeSignature.java | 8 +-- .../type/TypeSignatureParameter.java | 4 +- .../type/TypeSignatureTranslator.java | 7 ++- .../plan/relational/utils/TypeUtil.java | 10 ++-- .../plan/statement/component/FillPolicy.java | 2 +- .../thrift/impl/ClientRPCServiceImpl.java | 2 +- .../execution/aggregation/TreeAggregator.java | 6 +-- .../execution/driver/DataDriver.java | 2 +- .../queryengine/execution/driver/Driver.java | 4 +- .../fragment/FragmentInstanceManager.java | 4 +- .../process/function/PartitionRecognizer.java | 2 +- .../join/merge/MergeSortComparatorUtils.java | 50 +++++++++++++++++++ .../AbstractAggTableScanOperator.java | 2 +- .../AbstractDefaultAggTableScanOperator.java | 2 +- .../relational/AbstractTableScanOperator.java | 2 +- .../DeviceIteratorScanOperator.java | 2 +- ...formationSchemaContentSupplierFactory.java | 2 +- .../MeasurementToTableViewAdaptorUtils.java | 2 +- ...gnedDeviceViewAggregationScanOperator.java | 4 +- .../plan/analyze/ExpressionAnalyzer.java | 2 +- .../plan/analyze/ExpressionUtils.java | 2 +- .../plan/analyze/PredicateUtils.java | 2 +- .../plan/execution/QueryExecution.java | 4 +- .../UnknownExpressionTypeException.java | 4 +- .../optimization/LimitOffsetPushDown.java | 2 +- ...rderByExpressionWithLimitChangeToTopK.java | 2 +- .../queryengine/plan/parser/ASTVisitor.java | 2 +- .../plan/planner/LogicalPlanBuilder.java | 2 +- .../plan/planner/OperatorGeneratorUtil.java | 2 +- .../plan/planner/OperatorTreeGenerator.java | 17 +++---- .../plan/parameter/FillDescriptor.java | 2 +- .../plan/relational/analyzer/Analysis.java | 8 +-- .../analyzer/ExpressionAnalyzer.java | 2 +- .../analyzer/PatternRecognitionAnalyzer.java | 2 +- .../plan/relational/analyzer/Scope.java | 2 +- .../analyzer/StatementAnalyzer.java | 12 ++--- .../relational/planner/CteMaterializer.java | 4 +- .../relational/planner/PredicateUtils.java | 2 +- .../plan/relational/planner/QueryPlanner.java | 4 +- ...correlatedScalarSubqueryReconstructor.java | 4 +- .../planner/iterative/IterativeOptimizer.java | 8 +-- .../relational/planner/iterative/Rule.java | 4 +- .../planner/iterative/RuleIndex.java | 4 +- .../EliminateLimitProjectWithTableScan.java | 8 +-- .../rule/EliminateLimitWithTableScan.java | 8 +-- .../rule/EvaluateEmptyIntersect.java | 4 +- .../rule/ExpressionRewriteRuleSet.java | 4 +- .../iterative/rule/GatherAndMergeWindows.java | 10 ++-- .../iterative/rule/ImplementExceptAll.java | 4 +- .../rule/ImplementExceptDistinctAsUnion.java | 4 +- .../iterative/rule/ImplementIntersectAll.java | 4 +- .../ImplementIntersectDistinctAsUnion.java | 4 +- .../rule/ImplementPatternRecognition.java | 4 +- .../rule/ImplementTableFunctionSource.java | 4 +- .../iterative/rule/InlineProjections.java | 8 +-- .../planner/iterative/rule/MergeExcept.java | 4 +- .../planner/iterative/rule/MergeFilters.java | 8 +-- .../iterative/rule/MergeIntersect.java | 4 +- .../MergeLimitOverProjectWithMergeSort.java | 8 +-- .../rule/MergeLimitOverProjectWithSort.java | 8 +-- .../rule/MergeLimitWithMergeSort.java | 8 +-- .../iterative/rule/MergeLimitWithSort.java | 8 +-- .../planner/iterative/rule/MergeLimits.java | 8 +-- .../planner/iterative/rule/MergeUnion.java | 4 +- ...ipleDistinctAggregationToMarkDistinct.java | 4 +- .../iterative/rule/OptimizeRowPattern.java | 4 +- .../rule/ProjectOffPushDownRule.java | 8 +-- .../rule/PruneAggregationSourceColumns.java | 4 +- .../iterative/rule/PruneApplyCorrelation.java | 4 +- .../rule/PruneApplySourceColumns.java | 4 +- .../iterative/rule/PruneCopyToColumns.java | 4 +- .../rule/PruneCorrelatedJoinCorrelation.java | 4 +- .../rule/PruneDistinctAggregation.java | 4 +- .../rule/PruneExceptSourceColumns.java | 4 +- .../rule/PruneExplainAnalyzeColumns.java | 4 +- .../rule/PruneIntersectSourceColumns.java | 4 +- .../rule/PruneJoinChildrenColumns.java | 4 +- .../rule/PruneOutputSourceColumns.java | 4 +- .../PrunePatternRecognitionSourceColumns.java | 4 +- ...neTableFunctionProcessorSourceColumns.java | 4 +- .../rule/PruneUnionSourceColumns.java | 4 +- .../rule/PushDownFilterIntoWindow.java | 8 +-- .../rule/PushDownLimitIntoWindow.java | 8 +-- .../rule/PushDownOffsetIntoTableScan.java | 8 +-- .../rule/PushLimitThroughOffset.java | 8 +-- .../rule/PushLimitThroughProject.java | 8 +-- .../iterative/rule/PushLimitThroughUnion.java | 8 +-- .../rule/PushProjectionThroughUnion.java | 8 +-- .../iterative/rule/PushTopKThroughUnion.java | 8 +-- .../rule/RemoveEmptyExceptBranches.java | 4 +- .../rule/RemoveEmptyUnionBranches.java | 4 +- .../RemoveRedundantEnforceSingleRowNode.java | 4 +- .../iterative/rule/RemoveRedundantExists.java | 4 +- .../RemoveRedundantIdentityProjections.java | 4 +- .../iterative/rule/RemoveRedundantWindow.java | 4 +- .../iterative/rule/RemoveTrivialFilters.java | 4 +- .../RemoveUnreferencedScalarApplyNodes.java | 4 +- .../RemoveUnreferencedScalarSubqueries.java | 4 +- .../rule/ReplaceWindowWithRowNumber.java | 4 +- .../rule/SimplifyCountOverConstant.java | 8 +-- .../SingleDistinctAggregationToGroupBy.java | 4 +- ...atedDistinctAggregationWithProjection.java | 10 ++-- ...dDistinctAggregationWithoutProjection.java | 10 ++-- ...elatedGlobalAggregationWithProjection.java | 12 ++--- ...tedGlobalAggregationWithoutProjection.java | 12 ++--- ...latedGroupedAggregationWithProjection.java | 10 ++-- ...edGroupedAggregationWithoutProjection.java | 10 ++-- .../rule/TransformCorrelatedJoinToJoin.java | 6 +-- .../TransformCorrelatedScalarSubquery.java | 6 +-- .../TransformExistsApplyToCorrelatedJoin.java | 4 +- ...TransformFilteringSemiJoinToInnerJoin.java | 8 +-- ...rrelatedInPredicateSubqueryToSemiJoin.java | 6 +-- .../TransformUncorrelatedSubqueryToJoin.java | 6 +-- .../relational/planner/node/Patterns.java | 10 ++-- .../plan/relational/sql/ast/AstVisitor.java | 24 --------- .../sql/ast/DefaultTraversalVisitor.java | 5 ++ .../sql/ast/QuerySpecification.java | 2 + .../plan/relational/sql/ast/ShowDevice.java | 1 + .../sql/ast/ShowExternalService.java | 1 + .../sql/ast/ShowQueriesStatement.java | 1 + .../relational/sql/ast/ShowStatement.java | 1 + .../relational/sql/parser/AstBuilder.java | 17 ++++--- .../relational/sql/parser/ErrorHandler.java | 2 + .../plan/relational/sql/parser/SqlParser.java | 1 + .../plan/relational/sql/util/QueryUtil.java | 4 +- .../sql/util/ReservedIdentifiers.java | 2 +- .../relational/sql/util/SqlFormatter.java | 10 ++-- .../plan/scheduler/ClusterScheduler.java | 4 +- .../FragmentInstanceDispatcherImpl.java | 4 +- .../statement/component/FillComponent.java | 1 + .../metrics/DataNodeMetricsHelper.java | 2 +- .../dataregion/memtable/TsFileProcessor.java | 4 +- .../iotdb/db/utils/sort/TableDiskSpiller.java | 2 +- .../AggregationMergeSortOperatorTest.java | 2 +- .../operator/MergeTreeSortOperatorTest.java | 16 +++--- .../operator/SortOperatorSortBranchTest.java | 4 +- .../operator/TreeTopKOperatorTest.java | 16 +++--- .../process/TableStreamSortOperatorTest.java | 4 +- .../operator/process/ValuesOperatorTest.java | 2 +- .../gapfill/GapFillWGroupWMoOperatorTest.java | 6 ++- .../GapFillWGroupWoMoOperatorTest.java | 6 ++- .../GapFillWoGroupWMoOperatorTest.java | 4 +- .../GapFillWoGroupWoMoOperatorTest.java | 3 +- .../tvf/TableFunctionOperatorTest.java | 2 +- .../process/window/RowNumberOperatorTest.java | 2 +- .../window/TableWindowOperatorTest.java | 2 +- .../window/TableWindowOperatorTestUtils.java | 2 +- .../window/TopKRankingOperatorTest.java | 2 +- .../AggregationWindowFunctionTest.java | 2 +- .../function/rank/CumeDistFunctionTest.java | 2 +- .../function/rank/DenseRankFunctionTest.java | 2 +- .../function/rank/NTileFunctionTest.java | 2 +- .../rank/PercentRankFunctionTest.java | 2 +- .../function/rank/RankFunctionTest.java | 2 +- .../function/rank/RowNumberFunctionTest.java | 2 +- .../value/FirstValueFunctionTest.java | 2 +- .../function/value/LagFunctionTest.java | 2 +- .../function/value/LastValueFunctionTest.java | 2 +- .../function/value/LeadFunctionTest.java | 2 +- .../function/value/NthValueFunctionTest.java | 2 +- .../ColumnInjectionPushDownTest.java | 2 +- .../optimization/LimitOffsetPushDownTest.java | 2 +- .../plan/optimization/TestPlanBuilder.java | 2 +- .../node/process/FillNodeSerdeTest.java | 2 +- .../analyzer/AggregationCornerCaseTest.java | 6 +-- .../analyzer/AsofInnerJoinOperatorTest.java | 2 +- .../plan/relational/analyzer/JoinTest.java | 2 +- .../sql/ast/SqlParserErrorHandlerTest.java | 2 +- .../sql/parser/AuthorStatementTest.java | 1 + .../datastructure/MergeSortHeapTest.java | 4 +- 266 files changed, 656 insertions(+), 685 deletions(-) delete mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorUtils.java rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/GroupedTopNBuilder.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/GroupedTopNRowNumberAccumulator.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/GroupedTopNRowNumberBuilder.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/IdRegistry.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/RowIdComparisonStrategy.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/RowIdHashStrategy.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/RowReference.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/RowReferenceTsBlockManager.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/SimpleTsBlockWithPositionComparator.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/TsBlockWithPositionComparator.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/process => calc_commons/execution/operator/process/gapfill}/gapfill/AbstractGapFillOperator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/process => calc_commons/execution/operator/process/gapfill}/gapfill/AbstractGapFillWGroupOperator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/process => calc_commons/execution/operator/process/gapfill}/gapfill/AbstractGapFillWoGroupOperator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/process => calc_commons/execution/operator/process/gapfill}/gapfill/GapFillWGroupWMoOperator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/process => calc_commons/execution/operator/process/gapfill}/gapfill/GapFillWGroupWoMoOperator.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/process => calc_commons/execution/operator/process/gapfill}/gapfill/GapFillWoGroupWMoOperator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine/execution/operator/process => calc_commons/execution/operator/process/gapfill}/gapfill/GapFillWoGroupWoMoOperator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/MergeSortComparator.java (78%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/join/merge/SortKeyComparator.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/metric/QueryExecutionMetricSet.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/{OperatorGeneratorUtils.java => CommonOperatorUtils.java} (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/utils/matching/Capture.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/utils/matching/Captures.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/utils/matching/DefaultPrinter.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/utils/matching/Match.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/utils/matching/Pattern.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/utils/matching/PatternVisitor.java (70%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/utils/matching/Property.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/utils/matching/PropertyPattern.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/utils/matching/pattern/CapturePattern.java (75%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/utils/matching/pattern/EqualsPattern.java (79%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/utils/matching/pattern/FilterPattern.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/utils/matching/pattern/TypeOfPattern.java (80%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/relational/utils/matching/pattern/WithPattern.java (78%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/{hash => }/CombineHashFunction.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/{hash => }/FlatGroupByHash.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/{hash => }/FlatHash.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/{hash => }/FlatHashStrategy.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/{hash => }/GroupByHash.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/{hash => }/HashStrategy.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/{hash => }/MarkDistinctHash.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/{hash => }/NoChannelGroupByHash.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/{hash => }/VariableWidthData.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/{hash => }/XxHash64.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Fill.java (89%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Limit.java (80%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Offset.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/ProcessingMode.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/With.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/WithQuery.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/parser/ParsingException.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/type/NamedTypeSignature.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/type/ParameterKind.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/type/RowFieldName.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/type/StandardTypes.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/type/TypeSignatureParameter.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/statement/component/FillPolicy.java (93%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{calc_commons => queryengine}/plan/expression/UnknownExpressionTypeException.java (88%) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorUtils.java deleted file mode 100644 index df3f315cc38ab..0000000000000 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorUtils.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.calc_commons.execution.operator; - -import org.apache.tsfile.read.common.block.column.LongColumn; - -import java.util.Optional; - -public class CommonOperatorUtils { - public static final String CURRENT_DEVICE_INDEX_STRING = "CurrentDeviceIndex"; - public static final LongColumn TIME_COLUMN_TEMPLATE = - new LongColumn(1, Optional.empty(), new long[] {0}); - public static final String CURRENT_USED_MEMORY = "CurrentUsedMemory"; - public static final String MAX_USED_MEMORY = "MaxUsedMemory"; - public static final String MAX_RESERVED_MEMORY = "MaxReservedMemory"; -} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNBuilder.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNBuilder.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNBuilder.java index 2f8a99097c95c..ae0989f93de05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator; +package org.apache.iotdb.db.calc_commons.execution.operator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberAccumulator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java index 245071da905fa..15a687afa5276 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator; +package org.apache.iotdb.db.calc_commons.execution.operator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberBuilder.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java index 15a3ad259b328..025877eddfede 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/GroupedTopNRowNumberBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator; +package org.apache.iotdb.db.calc_commons.execution.operator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableList; @@ -35,7 +35,7 @@ import java.util.Iterator; import java.util.List; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class GroupedTopNRowNumberBuilder implements GroupedTopNBuilder { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/IdRegistry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/IdRegistry.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/IdRegistry.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/IdRegistry.java index ad87c4fe25f39..2dec051a9acf2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/IdRegistry.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/IdRegistry.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator; +package org.apache.iotdb.db.calc_commons.execution.operator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntArrayFIFOQueue; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowIdComparisonStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowIdComparisonStrategy.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowIdComparisonStrategy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowIdComparisonStrategy.java index a3a49e7eef333..7b4288dbc0697 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowIdComparisonStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowIdComparisonStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator; +package org.apache.iotdb.db.calc_commons.execution.operator; public interface RowIdComparisonStrategy { int compare(long leftRowId, long rightRowId); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowIdHashStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowIdHashStrategy.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowIdHashStrategy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowIdHashStrategy.java index f51912c952d4c..43382d293aed9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowIdHashStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowIdHashStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator; +package org.apache.iotdb.db.calc_commons.execution.operator; /** Hash strategy that evaluates over row IDs */ public interface RowIdHashStrategy { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowReference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowReference.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowReference.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowReference.java index ef81b2ad992f0..4522932cb983b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowReference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowReference.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator; +package org.apache.iotdb.db.calc_commons.execution.operator; /** * Reference to a row. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowReferenceTsBlockManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowReferenceTsBlockManager.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowReferenceTsBlockManager.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowReferenceTsBlockManager.java index d56257a00b03a..c17725a9a5070 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/RowReferenceTsBlockManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowReferenceTsBlockManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator; +package org.apache.iotdb.db.calc_commons.execution.operator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/SimpleTsBlockWithPositionComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/SimpleTsBlockWithPositionComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java index e9b64ac2d0141..c9c296b8dca07 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/SimpleTsBlockWithPositionComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator; +package org.apache.iotdb.db.calc_commons.execution.operator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/TsBlockWithPositionComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/TsBlockWithPositionComparator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/TsBlockWithPositionComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/TsBlockWithPositionComparator.java index aa6c5bfb734a9..4d482688d6558 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/TsBlockWithPositionComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/TsBlockWithPositionComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator; +package org.apache.iotdb.db.calc_commons.execution.operator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MappingCollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MappingCollectOperator.java index ec90fb80cac7e..362e3e564adf0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MappingCollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MappingCollectOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java index c9fda77fa7b60..898c7d4edc2c2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java @@ -50,8 +50,8 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.MAX_RESERVED_MEMORY; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class PatternRecognitionOperator implements ProcessOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java index 6d622ee576e78..70df964db90ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java index 70dd1fd97ae3a..bc44b7a4dab10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java index 75811a796d5a3..2a2930044c2d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.db.utils.sort.TableDiskSpiller; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java index 4809c6c812b4a..effd8157dab55 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.db.utils.sort.TableDiskSpiller; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java index 39fcfadac8c66..b9be44ca14161 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java index 985bb5bc2c15d..bb7f2c3e6dd2b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java @@ -22,7 +22,6 @@ import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.process.TreeTopKOperator; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -55,7 +54,7 @@ public abstract class TopKOperator implements ProcessOperator { private static final long INSTANCE_SIZE = - RamUsageEstimator.shallowSizeOfInstance(TreeTopKOperator.class); + RamUsageEstimator.shallowSizeOfInstance(TopKOperator.class); private final OperatorContext operatorContext; private final List childrenOperators; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java index 69423c981d78a..b923028cfd322 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.function; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; import org.apache.iotdb.udf.api.relational.table.processor.TableFunctionLeafProcessor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java index d10f5fdbae406..0b353a40d41ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.function; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.AggregationMergeSortOperator; @@ -27,6 +26,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionCache; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.process.function.PartitionRecognizer; import org.apache.iotdb.udf.api.relational.access.Record; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillOperator.java index 48f4a949de9b2..4693f2633a5f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWGroupOperator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWGroupOperator.java index c375c47d76a81..dfff820a7d89f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWGroupOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWoGroupOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWoGroupOperator.java index 71521a10e4edf..ee7e4f33d894a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWoGroupOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWMoOperator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWMoOperator.java index b44a7ba88c0fa..9dc413c41724e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWMoOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWoMoOperator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWoMoOperator.java index 79dcf1a5682bc..63780e995832f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWoMoOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; // without month interval diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWMoOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWMoOperator.java index c65f133c70738..7a0fe11d143d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWMoOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWoMoOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWoMoOperator.java index ff050d318cb14..1f13c51c59b66 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWoMoOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java index 24f72e3d29d26..f09a263e51d6b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java index 2b7dc8b9c5991..c329b92bea51b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java @@ -17,12 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.queryengine.plan.statement.component.NullOrdering; -import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; -import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; @@ -47,26 +44,6 @@ private MergeSortComparator() { // util class doesn't need constructor } - /** -1 in index is for time column. */ - public static Comparator getComparator( - List sortItemList, List indexList, List dataTypeList) { - - // use code-gen compile this comparator - List> list = new ArrayList<>(indexList.size()); - for (int i = 0; i < indexList.size(); i++) { - int index = indexList.get(i); - if (index == -2) { - continue; - } - TSDataType dataType = dataTypeList.get(i); - boolean asc = sortItemList.get(i).getOrdering() == Ordering.ASC; - boolean nullFirst = sortItemList.get(i).getNullOrdering() == NullOrdering.FIRST; - list.add(genSingleComparator(asc, index, dataType, nullFirst)); - } - - return list.size() == 1 ? list.get(0) : new ComparatorChain<>(list); - } - public static Comparator getComparatorForTable( List sortOrderList, List indexList, List dataTypeList) { @@ -134,7 +111,7 @@ public static Comparator getComparator(TSDataType dataType, int index, return comparator; } - private static Comparator genSingleComparator( + public static Comparator genSingleComparator( boolean asc, int index, TSDataType dataType, boolean nullFirst) { if (index == -1) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SortKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SortKeyComparator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java index 0959e675d2354..de83c8dc75d30 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SortKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; +package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java index 44b84fd5bc2b7..59210b07a0cff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java @@ -33,7 +33,7 @@ import java.util.List; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; /** * This class computes an aggregate function result in row pattern recognition context. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java index 25f556e56a3f2..9e3bd429da231 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java index f141ab8fb389a..dc5399fc65012 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableList; @@ -44,8 +44,8 @@ import java.util.Map; import java.util.Optional; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.createGroupByHash; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; public class RowNumberOperator implements ProcessOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java index cdbea645d3888..79ae9ff129b8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.window; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; @@ -30,6 +29,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.process.function.PartitionRecognizer; @@ -49,7 +49,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.MAX_RESERVED_MEMORY; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; public class TableWindowOperator implements ProcessOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java index 66d5b3953c182..0749d466f2641 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java @@ -19,20 +19,20 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.window; +import org.apache.iotdb.db.calc_commons.execution.operator.GroupedTopNBuilder; +import org.apache.iotdb.db.calc_commons.execution.operator.GroupedTopNRowNumberBuilder; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.SimpleTsBlockWithPositionComparator; +import org.apache.iotdb.db.calc_commons.execution.operator.TsBlockWithPositionComparator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.NoChannelGroupByHash; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.NoChannelGroupByHash; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.execution.operator.GroupedTopNBuilder; -import org.apache.iotdb.db.queryengine.execution.operator.GroupedTopNRowNumberBuilder; -import org.apache.iotdb.db.queryengine.execution.operator.SimpleTsBlockWithPositionComparator; -import org.apache.iotdb.db.queryengine.execution.operator.TsBlockWithPositionComparator; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java index bf09c971be081..20ec45f86223e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java index 15e2f32621fbc..a0d2ee0acf67d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java @@ -17,12 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.AbstractMergeSortJoinOperator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java index 6498e6243bf38..ca9bb4cff3c13 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import com.google.common.util.concurrent.ListenableFuture; @@ -38,7 +38,7 @@ import java.util.concurrent.TimeUnit; import static com.google.common.util.concurrent.Futures.successfulAsList; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.MAX_RESERVED_MEMORY; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; public abstract class AbstractMergeSortJoinOperator extends AbstractOperator { protected boolean leftFinished; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java index c896216c81c00..938ef7af9fd6e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java @@ -23,7 +23,6 @@ import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractAsofMergeSortJoinOperator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java index 901491ff11022..044d244f779cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java @@ -23,7 +23,6 @@ import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractAsofMergeSortJoinOperator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java index e6386c9639fea..37681173d6a31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java @@ -25,7 +25,7 @@ import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.MarkDistinctHash; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; @@ -40,7 +40,7 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.CURRENT_USED_MEMORY; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; public class MarkDistinctOperator implements ProcessOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java index 12b56ede05cb9..70b3e8af27fda 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java index 85ae0b7dfb6e0..82f3524bac277 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java @@ -52,7 +52,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.MarkDistinctHash; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java index e5131c70a634c..300e9e65d2856 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java index 3baf1a915afcf..67e2d2a7e2302 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java @@ -19,7 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import com.google.common.primitives.Ints; @@ -35,10 +36,13 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator.QUERY_EXECUTION_METRICS; -import static org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet.AGGREGATION_FROM_RAW_DATA; +import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.AGGREGATION_FROM_RAW_DATA; public class TableAggregator { + + public static final QueryExecutionMetricSet QUERY_EXECUTION_METRICS = + QueryExecutionMetricSet.getInstance(); + private final TableAccumulator accumulator; private final AggregationNode.Step step; private final TSDataType outputType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java index 5d58a2bc61d57..030054508e713 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import com.google.common.primitives.Ints; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java index ca8113230d0c8..0e4b6e975bc1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java @@ -38,7 +38,7 @@ import java.util.Optional; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.CURRENT_USED_MEMORY; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; public class HashAggregationOperator extends AbstractOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java index 243307d190e22..2032ba156c29f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java index f6b8fa0a8863b..7e8eaedeb7239 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java @@ -45,8 +45,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.CURRENT_USED_MEMORY; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.MAX_USED_MEMORY; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.MAX_USED_MEMORY; import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; public class StreamingHashAggregationOperator extends AbstractOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java index 3178686894c32..d6253e05c79b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; @@ -47,7 +47,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.createGroupByHash; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; public class InMemoryHashAggregationBuilder implements HashAggregationBuilder { private final int[] groupByChannels; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/metric/QueryExecutionMetricSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/metric/QueryExecutionMetricSet.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/metric/QueryExecutionMetricSet.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/metric/QueryExecutionMetricSet.java index 27a238d3d8cc0..bfc93370ebe86 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/metric/QueryExecutionMetricSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/metric/QueryExecutionMetricSet.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.metric; +package org.apache.iotdb.db.calc_commons.metric; import org.apache.iotdb.commons.service.metric.enums.Metric; import org.apache.iotdb.commons.service.metric.enums.Tag; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/OperatorGeneratorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/CommonOperatorUtils.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/OperatorGeneratorUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/CommonOperatorUtils.java index 6464ac4814bd7..f7903a3b72212 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/OperatorGeneratorUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/CommonOperatorUtils.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalMSFillFilter; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalNSFillFilter; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalUSFillFilter; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity.IdentityFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.DoubleLinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; @@ -40,16 +41,25 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.LongPreviousFillWithTimeDuration; import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.read.common.block.column.LongColumn; import org.apache.tsfile.utils.TimeDuration; import java.time.ZoneId; import java.util.List; +import java.util.Optional; import static org.apache.iotdb.db.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; -public class OperatorGeneratorUtils { +public class CommonOperatorUtils { public static final IdentityLinearFill IDENTITY_LINEAR_FILL = new IdentityLinearFill(); public static final String UNKNOWN_DATATYPE = "Unknown data type: "; + public static final String CURRENT_DEVICE_INDEX_STRING = "CurrentDeviceIndex"; + public static final LongColumn TIME_COLUMN_TEMPLATE = + new LongColumn(1, Optional.empty(), new long[] {0}); + public static final String CURRENT_USED_MEMORY = "CurrentUsedMemory"; + public static final String MAX_USED_MEMORY = "MaxUsedMemory"; + public static final String MAX_RESERVED_MEMORY = "MaxReservedMemory"; + public static final IdentityFill IDENTITY_FILL = new IdentityFill(); public static ILinearFill[] getLinearFill(int inputColumns, List inputDataTypes) { ILinearFill[] linearFill = new ILinearFill[inputColumns]; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index f0d91827c8a36..62f664c88fb37 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -48,6 +48,10 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.LongConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.TableFunctionLeafOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.TableFunctionOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWGroupWMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWGroupWoMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; @@ -157,10 +161,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; -import org.apache.iotdb.db.queryengine.execution.operator.process.gapfill.GapFillWGroupWMoOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; @@ -208,15 +208,17 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; import static org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createAccumulator; import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createBuiltinAccumulator; import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; -import static org.apache.iotdb.db.calc_commons.plan.planner.OperatorGeneratorUtils.UNKNOWN_DATATYPE; -import static org.apache.iotdb.db.calc_commons.plan.planner.OperatorGeneratorUtils.getLinearFill; -import static org.apache.iotdb.db.calc_commons.plan.planner.OperatorGeneratorUtils.getPreviousFill; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.DEFAULT_GROUP_NUMBER; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.IDENTITY_FILL; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.UNKNOWN_DATATYPE; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.getLinearFill; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.getPreviousFill; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; @@ -225,8 +227,6 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition.LAST; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; -import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; -import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.IDENTITY_FILL; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_AGGREGATION; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java index c19cc2be15a75..1eeb3106f0e3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.calc_commons.plan.relational.planner.ir; -import org.apache.iotdb.db.calc_commons.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; @@ -63,7 +62,6 @@ public class GlobalTimePredicateExtractVisitor * * @param predicate raw query predicate * @return Pair, left is globalTimePredicate, right is if hasValueFilter. - * @throws UnknownExpressionTypeException unknown expression type */ public static Pair extractGlobalTimeFilter( Expression predicate, String timeColumnName) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Capture.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Capture.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Capture.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Capture.java index 572b84d3119c1..f2e88446dfa12 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Capture.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Capture.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils.matching; +package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; import java.util.concurrent.atomic.AtomicInteger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Captures.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Captures.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Captures.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Captures.java index a3f731aea3397..9823e1255554f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Captures.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Captures.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils.matching; +package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; import java.util.NoSuchElementException; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/DefaultPrinter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/DefaultPrinter.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/DefaultPrinter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/DefaultPrinter.java index f858e2b82d178..085ff48de50f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/DefaultPrinter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/DefaultPrinter.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils.matching; +package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.CapturePattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.EqualsPattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.FilterPattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.TypeOfPattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.WithPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.CapturePattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.EqualsPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.WithPattern; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Match.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Match.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Match.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Match.java index 6b47686bcd1e8..af62c05b0b7c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Match.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Match.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils.matching; +package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Pattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Pattern.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Pattern.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Pattern.java index 9cd8dc869de6f..69d7b8e1ceca7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Pattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Pattern.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils.matching; +package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.CapturePattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.FilterPattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.TypeOfPattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.WithPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.CapturePattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.WithPattern; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/PatternVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/PatternVisitor.java similarity index 70% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/PatternVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/PatternVisitor.java index 577101a268d75..77091fd6c90d6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/PatternVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/PatternVisitor.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils.matching; +package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.CapturePattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.EqualsPattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.FilterPattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.TypeOfPattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.WithPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.CapturePattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.EqualsPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.WithPattern; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Property.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Property.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Property.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Property.java index d03050c8a168e..8daa276db4ad9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/Property.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Property.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils.matching; +package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.EqualsPattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.FilterPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.EqualsPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; import java.util.Optional; import java.util.function.BiFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/PropertyPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/PropertyPattern.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/PropertyPattern.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/PropertyPattern.java index 8ba64a22c933d..d6b451c9ae39d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/PropertyPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/PropertyPattern.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils.matching; +package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/CapturePattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java similarity index 75% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/CapturePattern.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java index 621d017855881..4afb65620a571 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/CapturePattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern; +package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Match; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Match; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PatternVisitor; import java.util.stream.Stream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/EqualsPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/EqualsPattern.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java index 92979f55ab937..61bbf0d04937c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/EqualsPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern; +package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Match; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Match; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PatternVisitor; import java.util.Optional; import java.util.stream.Stream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/FilterPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/FilterPattern.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java index 7543ef2282fec..098e3e8dfb88f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/FilterPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern; +package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Match; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Match; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PatternVisitor; import java.util.Optional; import java.util.function.BiPredicate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/TypeOfPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java similarity index 80% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/TypeOfPattern.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java index 5cf7802168d96..824be1e90a77a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/TypeOfPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern; +package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Match; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Match; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PatternVisitor; import java.util.Optional; import java.util.stream.Stream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/WithPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/WithPattern.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java index ccdf0497f82c2..f847e3d212759 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/matching/pattern/WithPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern; +package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Match; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.PatternVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Property; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.PropertyPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Match; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Property; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PropertyPattern; import java.util.Optional; import java.util.function.BiFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/CombineHashFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/CombineHashFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java index 5fb5750779121..3284c1414165a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/CombineHashFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; public final class CombineHashFunction { private CombineHashFunction() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatGroupByHash.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatGroupByHash.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java index 825c3395b2748..16d1866fa4014 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatGroupByHash.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; @@ -35,7 +35,7 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Verify.verify; import static java.lang.Math.min; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.FlatHash.sumExact; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.sumExact; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; // This implementation assumes arrays used in the hash are always a power of 2 diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatHash.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatHash.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java index 508cd37b8c35f..8159b921886f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatHash.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; @@ -32,8 +32,8 @@ import static java.lang.Math.max; import static java.lang.Math.min; import static java.lang.Math.toIntExact; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.VariableWidthData.EMPTY_CHUNK; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.VariableWidthData.POINTER_SIZE; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.VariableWidthData.EMPTY_CHUNK; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.VariableWidthData.POINTER_SIZE; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfByteArray; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfIntArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatHashStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatHashStrategy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java index 75bac8f0f8835..714479b780988 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/FlatHashStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/GroupByHash.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/GroupByHash.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java index 72acfa3833689..408fe209a99b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/GroupByHash.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/HashStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/HashStrategy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java index 02fd8edba8774..d215de8ed8963 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/HashStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/MarkDistinctHash.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/MarkDistinctHash.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java index 677cbf96de28d..2b2195585501e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/MarkDistinctHash.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; @@ -32,8 +32,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.DEFAULT_GROUP_NUMBER; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.createGroupByHash; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; public class MarkDistinctHash { private final GroupByHash groupByHash; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/NoChannelGroupByHash.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/NoChannelGroupByHash.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java index 4fff74ad3a42f..1272b3f045e40 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/NoChannelGroupByHash.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlockBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/VariableWidthData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/VariableWidthData.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java index 159766822d1c0..f3f209bc77928 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/VariableWidthData.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; import com.google.common.primitives.Ints; import org.apache.tsfile.utils.RamUsageEstimator; @@ -30,9 +30,9 @@ import static java.lang.Math.addExact; import static java.lang.Math.max; import static java.lang.Math.subtractExact; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.FlatHash.bytesToInt; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.FlatHash.intToBytes; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.FlatHash.sumExact; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.bytesToInt; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.intToBytes; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.sumExact; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfObjectArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/XxHash64.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/XxHash64.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java index e2f493e5b7652..9c6e127f2cea8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/hash/XxHash64.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash; +package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; import java.io.IOException; import java.io.InputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ApplyNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ApplyNode.java index 4c7a0feabdc74..ed1afa866b6f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ApplyNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ApplyNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; @@ -119,7 +119,7 @@ public List getOutputSymbols() { @Override public R accept(IPlanVisitor visitor, C context) { - return ((PlanVisitor) visitor).visitApply(this, context); + return ((ICoreQueryPlanVisitor) visitor).visitApply(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java index e95fa1b78aa2e..c94074b4676fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import com.google.common.base.CharMatcher; import com.google.common.io.BaseEncoding; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java index 6aa949096dc13..174a07437f837 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java @@ -319,4 +319,28 @@ protected R visitJoin(Join node, C context) { protected R visitSingleColumn(SingleColumn node, C context) { return visitSelectItem(node, context); } + + protected R visitProcessingMode(ProcessingMode node, C context) { + return visitNode(node, context); + } + + protected R visitWithQuery(WithQuery node, C context) { + return visitNode(node, context); + } + + protected R visitWith(With node, C context) { + return visitNode(node, context); + } + + protected R visitFill(Fill node, C context) { + return visitNode(node, context); + } + + protected R visitOffset(Offset node, C context) { + return visitNode(node, context); + } + + protected R visitLimit(Limit node, C context) { + return visitNode(node, context); + } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Fill.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Fill.java index 9d3686f7087f7..70ae6b40959db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Fill.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Fill.java @@ -17,15 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; +import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; @@ -113,7 +107,7 @@ public Optional> getFillGroupingElements() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitFill(this, context); + return ((CommonQueryAstVisitor) visitor).visitFill(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FunctionCall.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FunctionCall.java index 21c0a4a85ba93..477ef633660f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FunctionCall.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FunctionCall.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode; - import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericLiteral.java index 3da015c7345c1..f265b16a7f5e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericLiteral.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Limit.java similarity index 80% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Limit.java index 65addf5c4ead9..e1c2f26e329e0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Limit.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Limit.java @@ -17,16 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllRows; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -71,7 +62,7 @@ public Expression getRowCount() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitLimit(this, context); + return ((CommonQueryAstVisitor) visitor).visitLimit(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LongLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LongLiteral.java index f5ba4de18131b..f12552681560e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LongLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LongLiteral.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Offset.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Offset.java index 05ae2b9cb5293..a7eb3bd9056fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Offset.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Offset.java @@ -17,15 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -68,7 +60,7 @@ public Expression getRowCount() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitOffset(this, context); + return ((CommonQueryAstVisitor) visitor).visitOffset(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ProcessingMode.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ProcessingMode.java index 0f1784c087b41..8d76e87d329a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ProcessingMode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ProcessingMode.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -50,7 +45,7 @@ public Mode getMode() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitProcessingMode(this, context); + return ((CommonQueryAstVisitor) visitor).visitProcessingMode(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Query.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Query.java index b37568135a6eb..27ef6f6015006 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Query.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Query.java @@ -19,10 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Limit; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; import org.apache.iotdb.db.utils.cte.CteDataStore; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/With.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/With.java index 1682de9bb33c7..c2bec8c63dde3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/With.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/With.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -71,7 +66,7 @@ public List getQueries() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitWith(this, context); + return ((CommonQueryAstVisitor) visitor).visitWith(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WithQuery.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WithQuery.java index 9345e19474b10..bc707acad4c00 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WithQuery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WithQuery.java @@ -17,14 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -105,7 +98,7 @@ public boolean isMaterialized() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitWithQuery(this, context); + return ((CommonQueryAstVisitor) visitor).visitWithQuery(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ParsingException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/parser/ParsingException.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ParsingException.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/parser/ParsingException.java index bb830551d0dad..c2a03bbc969a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ParsingException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/parser/ParsingException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; +package org.apache.iotdb.db.node_commons.plan.relational.sql.parser; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/NamedTypeSignature.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/NamedTypeSignature.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/NamedTypeSignature.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/NamedTypeSignature.java index 0c65cca60639c..12a4e1e3065b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/NamedTypeSignature.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/NamedTypeSignature.java @@ -17,9 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.type; - -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; +package org.apache.iotdb.db.node_commons.plan.relational.type; import com.google.errorprone.annotations.Immutable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/ParameterKind.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/ParameterKind.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/ParameterKind.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/ParameterKind.java index f52cb50946bdc..bc146af909346 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/ParameterKind.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/ParameterKind.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.type; +package org.apache.iotdb.db.node_commons.plan.relational.type; public enum ParameterKind { TYPE, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/RowFieldName.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/RowFieldName.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/RowFieldName.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/RowFieldName.java index d1896d8a9ee97..c061153377799 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/RowFieldName.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/RowFieldName.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.type; +package org.apache.iotdb.db.node_commons.plan.relational.type; import com.google.errorprone.annotations.Immutable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/StandardTypes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/StandardTypes.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/StandardTypes.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/StandardTypes.java index 37ae2db6a2129..7c0bfc5c72f8a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/StandardTypes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/StandardTypes.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.type; +package org.apache.iotdb.db.node_commons.plan.relational.type; public class StandardTypes { public static final String BIGINT = "bigint"; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignature.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignature.java index f6c773d0fc01f..b58195470804c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignature.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignature.java @@ -19,10 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.type; -import org.apache.iotdb.db.queryengine.plan.relational.type.ParameterKind; -import org.apache.iotdb.db.queryengine.plan.relational.type.StandardTypes; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureParameter; - import com.google.errorprone.annotations.FormatMethod; import com.google.errorprone.annotations.Immutable; @@ -35,8 +31,8 @@ import static java.lang.String.format; import static java.util.Arrays.asList; -import static org.apache.iotdb.db.queryengine.plan.relational.type.StandardTypes.TIME_WITH_TIME_ZONE; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureParameter.typeParameter; +import static org.apache.iotdb.db.node_commons.plan.relational.type.StandardTypes.TIME_WITH_TIME_ZONE; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureParameter.typeParameter; @Immutable public class TypeSignature { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureParameter.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureParameter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureParameter.java index f7475c544a59b..eb4a4ffb92990 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeSignatureParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureParameter.java @@ -17,9 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.type; - -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; +package org.apache.iotdb.db.node_commons.plan.relational.type; import com.google.errorprone.annotations.Immutable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureTranslator.java index 2e25be99c8549..14f7a2e160c48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureTranslator.java @@ -26,7 +26,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; -import org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureParameter; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.Type; @@ -36,9 +35,9 @@ import java.util.Set; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureParameter.numericParameter; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureParameter.typeParameter; -import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureParameter.typeVariable; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureParameter.numericParameter; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureParameter.typeParameter; +import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureParameter.typeVariable; public class TypeSignatureTranslator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/TypeUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/TypeUtil.java index c1b3414f177ab..5da7eb1d6212d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/TypeUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/TypeUtil.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.node_commons.plan.relational.utils; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.FlatHashStrategy; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.HashStrategy; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.XxHash64; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHashStrategy; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.HashStrategy; +import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.XxHash64; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -48,8 +48,8 @@ import static java.lang.Double.doubleToLongBits; import static java.lang.Float.floatToIntBits; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.XxHash64.FALSE_XX_HASH; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.XxHash64.TRUE_XX_HASH; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.XxHash64.FALSE_XX_HASH; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.XxHash64.TRUE_XX_HASH; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DateType.DATE; import static org.apache.tsfile.read.common.type.IntType.INT32; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillPolicy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/statement/component/FillPolicy.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillPolicy.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/statement/component/FillPolicy.java index 4100faffa5090..e7e888322c0bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillPolicy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/statement/component/FillPolicy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.statement.component; +package org.apache.iotdb.db.node_commons.plan.statement.component; public enum FillPolicy { PREVIOUS((byte) 0), 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 d8062cd9786c4..c278f253358d7 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 @@ -60,6 +60,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.protocol.basic.BasicOpenSessionResp; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; @@ -103,7 +104,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Execute; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetSqlDialect; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use; -import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java index b7d3e7e9c0741..f94a974e25c21 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.tsfile.block.column.Column; @@ -35,8 +35,8 @@ import java.util.List; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet.AGGREGATION_FROM_RAW_DATA; -import static org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet.AGGREGATION_FROM_STATISTICS; +import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.AGGREGATION_FROM_RAW_DATA; +import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.AGGREGATION_FROM_STATISTICS; public class TreeAggregator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java index 9632ba6a4a8ea..221d7b2e26a03 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java @@ -31,7 +31,7 @@ import java.util.List; -import static org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet.QUERY_RESOURCE_INIT; +import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.QUERY_RESOURCE_INIT; import static org.apache.iotdb.db.storageengine.dataregion.VirtualDataRegion.UNFINISHED_QUERY_DATA_SOURCE; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java index 41d9d637c1e15..b9ae87b37e73c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; import org.apache.iotdb.db.queryengine.execution.schedule.task.DriverTaskId; -import org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.metric.QueryMetricsManager; import com.google.common.collect.ImmutableList; @@ -56,7 +56,7 @@ import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static java.lang.Boolean.TRUE; import static org.apache.iotdb.db.calc_commons.execution.operator.Operator.NOT_BLOCKED; -import static org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet.DRIVER_INTERNAL_PROCESS; +import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.DRIVER_INTERNAL_PROCESS; public abstract class Driver implements IDriver { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java index 1898cbfe53ccb..513daf61f9142 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.QueryTimeoutException; +import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -36,7 +37,6 @@ import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; import org.apache.iotdb.db.queryengine.execution.schedule.DriverScheduler; import org.apache.iotdb.db.queryengine.execution.schedule.IDriverScheduler; -import org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.metric.QueryRelatedResourceMetricSet; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; @@ -64,10 +64,10 @@ import java.util.concurrent.atomic.AtomicLong; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.LOCAL_EXECUTION_PLANNER; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceExecution.createFragmentInstanceExecution; import static org.apache.iotdb.db.queryengine.execution.schedule.queue.IndexedBlockingQueue.TOO_MANY_CONCURRENT_QUERIES_ERROR_MSG; -import static org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet.LOCAL_EXECUTION_PLANNER; import static org.apache.iotdb.rpc.TSStatusCode.TOO_MANY_CONCURRENT_QUERIES_ERROR; @SuppressWarnings("squid:S6548") diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java index 75efa595f1d4c..55eb324b92fbb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java @@ -32,8 +32,8 @@ import java.util.List; import java.util.stream.Collectors; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; -import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; public class PartitionRecognizer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java new file mode 100644 index 0000000000000..d2855d2d8de11 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.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.execution.operator.process.join.merge; + +import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator; +import org.apache.iotdb.db.queryengine.plan.statement.component.NullOrdering; +import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; +import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; +import org.apache.iotdb.db.utils.datastructure.SortKey; + +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.external.commons.collections4.comparators.ComparatorChain; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; + +public class MergeSortComparatorUtils { + /** -1 in index is for time column. */ + public static Comparator getComparator( + List sortItemList, List indexList, List dataTypeList) { + + // use code-gen compile this comparator + List> list = new ArrayList<>(indexList.size()); + for (int i = 0; i < indexList.size(); i++) { + int index = indexList.get(i); + if (index == -2) { + continue; + } + TSDataType dataType = dataTypeList.get(i); + boolean asc = sortItemList.get(i).getOrdering() == Ordering.ASC; + boolean nullFirst = sortItemList.get(i).getNullOrdering() == NullOrdering.FIRST; + list.add(MergeSortComparator.genSingleComparator(asc, index, dataType, nullFirst)); + } + + return list.size() == 1 ? list.get(0) : new ComparatorChain<>(list); + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java index 3adcafd11adb2..447d85df05a25 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java index 61be8d4942a3a..c39cbdbd12116 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java @@ -30,7 +30,7 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public abstract class AbstractDefaultAggTableScanOperator extends AbstractAggTableScanOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java index 199ddbd82eead..49466500deec7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.commons.path.AlignedFullPath; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractSeriesScanOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java index c74d33109d569..ecd7659ee9daa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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 index 2e43a27147580..789887544573a 100644 --- 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 @@ -63,8 +63,8 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowTopicReq; import org.apache.iotdb.confignode.rpc.thrift.TTableInfo; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.ConnectionInfo; import org.apache.iotdb.db.node_commons.common.SqlDialect; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java index f3cfb903ef6d7..3efd6482fb8e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class MeasurementToTableViewAdaptorUtils { private MeasurementToTableViewAdaptorUtils() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java index d7a1cbdd75e9f..71537fc373f2d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java @@ -38,8 +38,8 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.CURRENT_DEVICE_INDEX_STRING; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_DEVICE_INDEX_STRING; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class TreeNonAlignedDeviceViewAggregationScanOperator extends AbstractDefaultAggTableScanOperator { 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 f1a36aa71d064..9a847a9ebd132 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 @@ -24,11 +24,11 @@ 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.db.calc_commons.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java index 69b309a58203c..1d9bb7838d5f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionUtils.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.analyze; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.calc_commons.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java index 7f0315097a679..55cfd18f16f48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.calc_commons.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; 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 7efa083a58542..8f95906fc8d10 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 @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; +import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.KilledByOthersException; @@ -37,7 +38,6 @@ import org.apache.iotdb.db.queryengine.execution.exchange.MPPDataExchangeService; import org.apache.iotdb.db.queryengine.execution.exchange.source.ISourceHandle; import org.apache.iotdb.db.queryengine.execution.exchange.source.SourceHandle; -import org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; @@ -73,8 +73,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Throwables.throwIfUnchecked; import static org.apache.iotdb.commons.utils.ErrorHandlingCommonUtils.getRootCause; +import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.WAIT_FOR_RESULT; import static org.apache.iotdb.db.queryengine.common.DataNodeEndPoints.isSameNode; -import static org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet.WAIT_FOR_RESULT; import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/expression/UnknownExpressionTypeException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/expression/UnknownExpressionTypeException.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java index f56a02db6bdba..459f19680d66f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/expression/UnknownExpressionTypeException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/UnknownExpressionTypeException.java @@ -17,9 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.expression; - -import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; +package org.apache.iotdb.db.queryengine.plan.expression; public class UnknownExpressionTypeException extends IllegalArgumentException { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java index 42fbd67b39eae..c811740ce0685 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; @@ -40,7 +41,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowDiskUsageNode; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; -import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.statement.component.GroupByTimeComponent; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java index 02834f2f4639c..9c69c699ae5fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java @@ -39,8 +39,8 @@ import java.util.ArrayList; import java.util.List; +import static org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy.LINEAR; 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; /** * Replace `SortNode`+`LimitNode` to `TopKNode` and replace `MergeSortNode`+`LimitNode` to 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 9fb77d2298e28..b3f95fb64f330 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 @@ -50,6 +50,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.ConstantContext; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.CountDatabasesContext; @@ -110,7 +111,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.component.FillComponent; -import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.statement.component.FromComponent; import org.apache.iotdb.db.queryengine.plan.statement.component.GroupByComponent; import org.apache.iotdb.db.queryengine.plan.statement.component.GroupByConditionComponent; 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 10365024d4e25..6662856ae8df2 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 @@ -128,9 +128,9 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; 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.node_commons.plan.statement.component.FillPolicy.LINEAR; 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; import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_VALUE; import static org.apache.iotdb.db.utils.constant.SqlConstant.MAX_TIME; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java index 9815bb4cd44b6..2c70b2a47b6d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static org.apache.iotdb.db.calc_commons.plan.planner.OperatorGeneratorUtils.UNKNOWN_DATATYPE; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.UNKNOWN_DATATYPE; public class OperatorGeneratorUtil { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index 4fd18bd6a9fbf..2f18a99fe0d41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -44,8 +44,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.FloatConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.IntConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.LongConstantFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity.IdentityFill; -import org.apache.iotdb.db.calc_commons.plan.planner.OperatorGeneratorUtils; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -56,6 +55,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; @@ -240,7 +240,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.model.ModelInferenceDescriptor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; -import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; @@ -297,7 +296,7 @@ import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.calculateMaxAggregationResultSizeForLastQuery; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.getOutputColumnSizePerLine; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.initTimeRangeIterator; -import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparator; +import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparatorUtils.getComparator; import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DELIMITER_BETWEEN_ID; import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DOWNSTREAM_PLAN_NODE_ID; import static org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils.convertPredicateToFilter; @@ -321,8 +320,6 @@ public class OperatorTreeGenerator implements PlanVisitor ASC_BINARY_COMPARATOR = Comparator.naturalOrder(); private static final Comparator DESC_BINARY_COMPARATOR = Comparator.reverseOrder(); @@ -1322,7 +1319,7 @@ private ProcessOperator getFillOperator( case PREVIOUS: return new TreeFillOperator( operatorContext, - OperatorGeneratorUtils.getPreviousFill( + CommonOperatorUtils.getPreviousFill( inputColumns, inputDataTypes, descriptor.getTimeDurationThreshold(), @@ -1331,7 +1328,7 @@ private ProcessOperator getFillOperator( case LINEAR: return new TreeLinearFillOperator( operatorContext, - OperatorGeneratorUtils.getLinearFill(inputColumns, inputDataTypes), + CommonOperatorUtils.getLinearFill(inputColumns, inputDataTypes), child); default: throw new IllegalArgumentException("Unknown fill policy: " + fillPolicy); @@ -1343,7 +1340,7 @@ private IFill[] getConstantFill( IFill[] constantFill = new IFill[inputColumns]; for (int i = 0; i < inputColumns; i++) { if (!literal.isDataTypeConsistency(inputDataTypes.get(i))) { - constantFill[i] = IDENTITY_FILL; + constantFill[i] = CommonOperatorUtils.IDENTITY_FILL; continue; } switch (inputDataTypes.get(i)) { @@ -1373,7 +1370,7 @@ private IFill[] getConstantFill( break; default: throw new IllegalArgumentException( - OperatorGeneratorUtils.UNKNOWN_DATATYPE + inputDataTypes.get(i)); + CommonOperatorUtils.UNKNOWN_DATATYPE + inputDataTypes.get(i)); } } return constantFill; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/FillDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/FillDescriptor.java index 76b111f448150..48c900d7c9cd3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/FillDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/FillDescriptor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; -import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; +import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.statement.literal.Literal; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 b11b09ed647ba..2cccc1c931738 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 @@ -33,12 +33,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; @@ -48,6 +50,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; +import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; @@ -61,8 +65,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; @@ -70,9 +72,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; -import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 710b550ed2ca0..2c6fe7ff2db99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -69,6 +69,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ProcessingMode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; @@ -98,7 +99,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java index 4e7c29c1d9374..846ec6b8bd0f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java @@ -49,8 +49,8 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableSet.toImmutableSet; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ProcessingMode.Mode.FINAL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.ExpressionTreeUtils.extractExpressions; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode.Mode.FINAL; import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.AstUtil.preOrder; public class PatternRecognitionAnalyzer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java index 450b9bf93a607..ce24d7246dee0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java @@ -25,8 +25,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.rpc.TSStatusCode; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index 0f48aef0a83e4..4de1227515b9b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -45,6 +45,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupBy; @@ -59,12 +60,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; @@ -90,7 +93,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; import org.apache.iotdb.db.queryengine.execution.warnings.IoTDBWarning; @@ -146,7 +152,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FetchDevice; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRow; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; @@ -154,11 +159,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; 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.Limit; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; @@ -191,11 +194,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WrappedInsertStatement; import org.apache.iotdb.db.queryengine.plan.relational.type.CompatibleResolver; -import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertBaseStatement; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java index 2b26bcb228e96..df94bde9c817a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java @@ -30,6 +30,8 @@ import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -44,8 +46,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import org.apache.iotdb.db.queryengine.statistics.FragmentInstanceStatisticsDrawer; import org.apache.iotdb.db.queryengine.statistics.QueryStatisticsFetcher; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java index 2f0eb92ec3c28..0fb65377d9a5e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.calc_commons.plan.expression.UnknownExpressionTypeException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index 8e7bce995162e..b7281d16b9451 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -45,12 +45,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; @@ -65,9 +67,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GapFillStartAndEndTimeExtractVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java index 21445b6d01559..b8734a020cb64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java @@ -36,6 +36,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; @@ -44,8 +46,6 @@ import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java index 86a0c4ebf2d43..9c2208917b869 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Match; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -31,9 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.AdaptivePlanOptimizer; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanOptimizer; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Match; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import org.apache.iotdb.session.Session; import com.google.common.collect.ImmutableList; @@ -56,8 +56,8 @@ import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static java.util.stream.Collectors.joining; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.rpc.TSStatusCode.OPTIMIZER_TIMEOUT; public class IterativeOptimizer implements AdaptivePlanOptimizer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java index 5f3290cbe91f9..f082cb8541b2f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/RuleIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/RuleIndex.java index 5fa96a6ffee62..a8783d758d9a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/RuleIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/RuleIndex.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.pattern.TypeOfPattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; 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 630e56aa4aa5d..6531be20519ef 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 @@ -19,20 +19,20 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.TableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; public class EliminateLimitProjectWithTableScan implements Rule { private static final Capture PROJECT = newCapture(); 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 e9313bb0373e7..efa933890e949 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 @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; 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.TableScanNode; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; public class EliminateLimitWithTableScan implements Rule { private static final Capture CHILD = newCapture(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java index cde237a7b516c..e5146d624094f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.intersect; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.isEmpty; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java index ee3095f9ae043..1252cae1a116d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -30,8 +32,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java index b4d13a34d1b86..b83ef5aa0c209 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PropertyPattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; @@ -28,10 +32,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.PropertyPattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -49,13 +49,13 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableSet.toImmutableSet; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.transpose; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.groupNode; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.window; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; public class GatherAndMergeWindows { private GatherAndMergeWindows() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java index dfdf91929e7f9..a572b7d251079 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -33,8 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.LongType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java index 7aa4d30775e55..c4701c36a78e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -29,8 +31,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.LongType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java index 0fee749fb87e6..66475d8d20101 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; @@ -30,8 +32,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java index 2da41be6c216f..264da6b286d37 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; @@ -29,8 +31,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.LongType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java index e43afc1b609ec..34e27f5ad411c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; @@ -26,8 +28,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import java.util.ArrayList; import java.util.HashMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java index 6b5647159d256..2384ce961862b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; @@ -28,8 +30,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java index d1a18b7093c2c..4fa9c699dafc8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; @@ -30,9 +33,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -47,11 +47,11 @@ import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toSet; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; /** * Inlines expressions from a child project node into a parent project node as long as they are diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java index 349b6a76bf536..be077084e7acb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java index 9cd9a13cdca1b..178123468aa3b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; public class MergeFilters implements Rule { private static final Capture CHILD = newCapture(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java index 71dbdb0dbf497..fd562592b251a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java index a74d41ffec3aa..620e4b76648cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java @@ -19,24 +19,24 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.MergeLimitWithMergeSort.transformByMergeSortNode; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.mergeSort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; /** * Optimization phase: Distributed plan planning. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java index 080bb389b73a4..58a8a22150a5e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java @@ -19,23 +19,23 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; /** * Optimization phase: Logical plan planning. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java index 126ef39982e0a..dfdfba12945b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java @@ -19,21 +19,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import java.util.Optional; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.mergeSort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; /** * Optimization phase: Distributed plan planning. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java index 36c3e68d79618..2874a8cc079d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; /** Optimization phase: Logical plan planning. */ public class MergeLimitWithSort implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java index f9d9330a1302d..761886ac1f888 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; /** * This rule handles both LimitNode with ties and LimitNode without ties. The parent LimitNode is diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java index 97a194e409edf..71eae26bfd7ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java index 014f4b7d58d47..f320a7fd29c66 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java index 9b9071e2b10a1..a89b1930e6271 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrPatternAlternationOptimizer; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPatternFlattener; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.patternRecognition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java index bdeaf4c746bf4..396315eebb91e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java @@ -19,23 +19,23 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import java.util.Optional; import java.util.Set; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.pruneInputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; /** * @param The node type to look for under the ProjectNode Looks for a Project parent over a N diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java index 428023dc25288..f86b9f7df3616 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java index f883d1cfc5b14..f83c40bc10615 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import java.util.List; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java index 10edb885f4ffa..db321ffdb1755 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCopyToColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCopyToColumns.java index d6f4cfb991e18..c5907a11412e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCopyToColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCopyToColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java index eed7cf2d414e6..5583e6be950e8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import java.util.List; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java index ca530546f4b93..f1e67b1fd8339 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; @@ -27,8 +29,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java index 5e482ec8aee76..5d8edb0eddc10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExplainAnalyzeColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExplainAnalyzeColumns.java index 697c1a55a8d04..0bf718b5b85eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExplainAnalyzeColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExplainAnalyzeColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java index 517ae1366d660..f888acd0dccb2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java index f097b70e9ddaf..2e6dc98192d9e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java @@ -18,12 +18,12 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java index 3c931b2fbeeea..3d7f13b495d15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java index fac70eea82c4c..d17c209a64c23 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java index ed72c555d752f..80fac73327b07 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java index 0bfa98190cb13..b54236c53e36a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java index bd88893e96593..5013d87b0ceb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; @@ -30,9 +33,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; @@ -42,11 +42,11 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.lang.Math.toIntExact; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.toTopNRankingType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.window; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; public class PushDownFilterIntoWindow implements Rule { private static final Capture childCapture = newCapture(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java index ae68b5d630a05..b3327561eda0b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; @@ -34,13 +34,13 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.lang.Math.toIntExact; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.toTopNRankingType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.ChildReplacer.replaceChildren; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.window; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; public class PushDownLimitIntoWindow implements Rule { private static final Capture childCapture = newCapture(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java index 69e24ee2265b1..2ff071f88419e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java @@ -19,20 +19,20 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; 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 org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.offset; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.tableScan; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; /** * Optimization phase: Distributed plan planning. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java index f5fa14df40b8d..ab36f532141f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java @@ -19,20 +19,20 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import static java.lang.Math.addExact; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.offset; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; /** * Transforms: diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java index 32cf9da774740..3d33b97ae6ccc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java @@ -18,20 +18,20 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.transpose; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PushPredicateIntoTableScan.containsDiffFunction; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; public class PushLimitThroughProject implements Rule { private static final Capture CHILD = newCapture(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java index 31d8fb49d4745..839214eb7bff1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java @@ -19,24 +19,24 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import java.util.Optional; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Limit.requiresPreSortedInputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.union; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.isAtMost; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; /** * Transforms: diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java index b62b41dd1d463..a3fdcab055dab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -27,9 +30,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; @@ -39,11 +39,11 @@ import java.util.List; import java.util.Map; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.union; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; public class PushProjectionThroughUnion implements Rule { private static final Capture CHILD = newCapture(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java index 193a58d1cdb70..456dda2c7506e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -37,11 +37,11 @@ import static com.google.common.collect.Iterables.getLast; import static com.google.common.collect.Sets.intersection; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.topK; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.union; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.isAtMost; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; public class PushTopKThroughUnion implements Rule { private static final Capture CHILD = newCapture(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java index 98130b3cc15a4..86c76a0721e32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -27,8 +29,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java index 7e225161c79bb..e019c67fc2f44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java index 5ab98cc57ddee..10e4a6ad300d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.enforceSingleRow; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.isScalar; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java index cf47238240222..2d9093a4675ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; @@ -26,8 +28,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java index a55f2ecd60822..a8fa2b2ffa3ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java index fbe4f3e6515a3..f57b734319e96 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java index b720724378f74..d935b5ec229e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import static com.google.common.base.Preconditions.checkArgument; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java index c8b3c2f192639..48a73b8e95315 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java index d5983ac2a4902..bc446b0750f0f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.RIGHT; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java index 5469f4d29c473..a11e4d89f4181 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java index b6f66f5afa646..3d8a472f68398 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; @@ -30,9 +33,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.LongType; @@ -44,6 +44,7 @@ import static com.google.common.base.Verify.verify; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind.AGGREGATE; import static org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression; @@ -51,7 +52,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT; public class SimplifyCountOverConstant implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java index 25bc4b28b2c5d..09972c88a84e8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java index 578bf290bb905..7758f2ea09c13 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -31,9 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.LongType; @@ -45,6 +45,8 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; @@ -55,8 +57,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; /** * This rule decorrelates a correlated subquery of LEFT correlated join with distinct operator diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java index b792610ece053..dde53b352214d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; @@ -29,9 +32,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -40,6 +40,8 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; @@ -49,8 +51,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.type; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; /** * This rule decorrelates a correlated subquery of LEFT correlated join with distinct operator diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java index 3d40d67fd2d74..561959365b879 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -32,9 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -50,6 +50,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.empty; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; @@ -65,9 +68,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.empty; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; /** * This rule decorrelates a correlated subquery of LEFT or INNER correlated join with: - single diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java index 8a61487f6b52d..cc2ccbc8fb834 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -32,9 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -47,6 +47,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.empty; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; @@ -62,9 +65,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.empty; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; /** * This rule decorrelates a correlated subquery with: - single global aggregation, or - global diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java index ec06d7c36958e..0e74e81e640a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -31,9 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.BooleanType; @@ -45,6 +45,8 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; @@ -58,8 +60,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; /** * This rule decorrelates a correlated subquery of INNER correlated join with: - single grouped diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java index f2808d333bdaf..836b51ab019b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; @@ -29,9 +32,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -40,6 +40,8 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; @@ -53,8 +55,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; /** * This rule decorrelates a correlated subquery of INNER correlated join with: - single grouped diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java index 8fe8d2b356f5a..a05f3853c4d81 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; @@ -26,8 +28,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; @@ -35,13 +35,13 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; /** * Tries to decorrelate subquery and rewrite it using normal join. Decorrelated predicates are part diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index 89ed4ac2ec8d7..c50a21e4bb3c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -37,8 +39,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; @@ -46,6 +46,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; @@ -56,7 +57,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.LongType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java index 22b3b695569da..e505727e957ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; @@ -36,8 +38,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java index 7396c03b2845f..18e099a67682a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -28,9 +31,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -40,6 +40,7 @@ import java.util.function.Predicate; import static com.google.common.collect.ImmutableList.toImmutableList; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; @@ -50,7 +51,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.semiJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture.newCapture; /** * Rewrite filtering semi-join to inner join. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java index 02bb7450bbda1..431cfefdb5363 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import static com.google.common.collect.Iterables.getOnlyElement; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.empty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Apply.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.empty; /** * This optimizers looks for InPredicate expressions in ApplyNodes and replaces the nodes with diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java index 268d212544e5b..67d153e66371b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; @@ -30,8 +32,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -41,12 +41,12 @@ import java.util.Optional; import static com.google.common.base.Preconditions.checkState; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.empty; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.empty; public class TransformUncorrelatedSubqueryToJoin implements Rule { private static final Pattern PATTERN = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java index 0a210a46269f8..5002bfd443034 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Property; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; @@ -52,17 +54,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Property; import java.util.List; import java.util.Optional; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Pattern.typeOf; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Property.optionalProperty; -import static org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Property.property; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.typeOf; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Property.optionalProperty; +import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Property.property; public final class Patterns { private Patterns() {} 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 e379797c3b291..9f7dd6e192925 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 @@ -55,30 +55,10 @@ protected R visitDeallocate(Deallocate node, C context) { return visitStatement(node, context); } - protected R visitWith(With node, C context) { - return visitNode(node, context); - } - - protected R visitWithQuery(WithQuery node, C context) { - return visitNode(node, context); - } - protected R visitSelect(Select node, C context) { return visitNode(node, context); } - protected R visitFill(Fill node, C context) { - return visitNode(node, context); - } - - protected R visitOffset(Offset node, C context) { - return visitNode(node, context); - } - - protected R visitLimit(Limit node, C context) { - return visitNode(node, context); - } - protected R visitQuerySpecification(QuerySpecification node, C context) { return visitQueryBody(node, context); } @@ -99,10 +79,6 @@ protected R visitExcept(Except node, C context) { return visitSetOperation(node, context); } - protected R visitProcessingMode(ProcessingMode node, C context) { - return visitNode(node, context); - } - protected R visitWindowDefinition(WindowDefinition node, C context) { return visitNode(node, context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java index 1eda04568f288..18e44a31e3631 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java @@ -31,6 +31,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingElement; @@ -42,10 +43,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; @@ -62,6 +65,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; public abstract class DefaultTraversalVisitor extends AstVisitor { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java index eedccd3767440..e893c3990f0e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java @@ -21,10 +21,12 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; 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 ea7bf10ebf56e..2e46c31c7ca7c 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 @@ -27,6 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; 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/ShowExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java index 0cee6ce66389f..357893cf31b40 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java index 78dfc6e6dfee2..234dbbded73d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import java.util.Optional; 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 index 585ef9b12251c..f9ae38f436d3d 100644 --- 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 @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; 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 a3b4f708deac8..411439e274788 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 @@ -57,6 +57,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; @@ -72,6 +73,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; @@ -81,8 +83,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ProcessingMode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; @@ -108,6 +112,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; @@ -153,7 +160,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExtendRegion; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Flush; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; @@ -161,14 +167,12 @@ 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.Limit; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadConfiguration; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadModel; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MigrateRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OneOrMoreQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternAlternation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternConcatenation; @@ -178,7 +182,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternVariable; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Prepare; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; @@ -246,8 +249,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ViewFieldDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.With; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ZeroOrMoreQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ZeroOrOneQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.util.AstUtil; @@ -317,6 +318,8 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets.Type.CUBE; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets.Type.EXPLICIT; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets.Type.ROLLUP; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ProcessingMode.Mode.FINAL; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ProcessingMode.Mode.RUNNING; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName.mapIdentifier; import static org.apache.iotdb.db.queryengine.plan.execution.config.TableConfigTaskVisitor.DATABASE_NOT_SPECIFIED; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.SERVICE_MANAGEMENT_NOT_SUPPORTED; @@ -331,8 +334,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_SHOW_EMPTY; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_WITH_UNMATCHED; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode.Mode.FINAL; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ProcessingMode.Mode.RUNNING; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.skipPastLastRow; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.skipToFirst; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.skipToLast; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ErrorHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ErrorHandler.java index e663ac5bcf3ff..603378d034eb4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ErrorHandler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ErrorHandler.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; +import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; + import com.google.common.collect.ImmutableSet; import org.antlr.v4.runtime.BaseErrorListener; import org.antlr.v4.runtime.NoViableAltException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java index 62633ffbc1dba..bf13ae1e8711e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlBaseListener; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlLexer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java index e3555bf504719..fd65156ff1eb7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java @@ -24,11 +24,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; @@ -41,8 +43,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java index 41ae4dd125f35..4e9108aacbe21 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import java.time.ZoneId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java index 16ac73ea4a77f..c0bb282d3489b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java @@ -22,10 +22,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; @@ -35,7 +38,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter; +import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; @@ -61,15 +66,12 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Except; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; 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.Limit; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; @@ -104,8 +106,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WithQuery; -import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; import com.google.common.base.Joiner; import com.google.common.base.Strings; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java index f8d288d8e875f..e1c6a2a227a80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.client.IClientManager; import org.apache.iotdb.commons.client.async.AsyncDataNodeInternalServiceClient; import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; +import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.QueryStateMachine; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInfo; -import org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; @@ -42,7 +42,7 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; -import static org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet.WAIT_FOR_DISPATCH; +import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.WAIT_FOR_DISPATCH; /** * QueryScheduler is used to dispatch the fragment instances of a query to target nodes. And it will diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java index 2a8c6b320a0fd..de91f6da036b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java @@ -33,6 +33,7 @@ import org.apache.iotdb.commons.utils.RetryUtils; import org.apache.iotdb.consensus.exception.ConsensusGroupNotExistException; import org.apache.iotdb.consensus.exception.RatisReadUnavailableException; +import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.mpp.FragmentInstanceDispatchException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; @@ -40,7 +41,6 @@ import org.apache.iotdb.db.queryengine.execution.executor.RegionExecutionResult; import org.apache.iotdb.db.queryengine.execution.executor.RegionReadExecutor; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; -import org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; @@ -77,7 +77,7 @@ import java.util.stream.Collectors; import static com.google.common.util.concurrent.Futures.immediateFuture; -import static org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet.DISPATCH_READ; +import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.DISPATCH_READ; public class FragmentInstanceDispatcherImpl implements IFragInstanceDispatcher { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillComponent.java index 9b59269136d68..e8c387eb7fa04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillComponent.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; +import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import org.apache.iotdb.db.queryengine.plan.statement.literal.Literal; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java index 2a99261f57d83..fd3d2dbcab49a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java @@ -29,13 +29,13 @@ import org.apache.iotdb.commons.service.metric.MetricService; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.commons.service.metric.cpu.CpuUsageMetrics; +import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.pipe.metric.PipeDataNodeMetrics; import org.apache.iotdb.db.protocol.thrift.handler.RPCServiceThriftHandlerMetrics; import org.apache.iotdb.db.queryengine.metric.DataExchangeCostMetricSet; import org.apache.iotdb.db.queryengine.metric.DataExchangeCountMetricSet; import org.apache.iotdb.db.queryengine.metric.DriverSchedulerMetricSet; -import org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; import org.apache.iotdb.db.queryengine.metric.QueryRelatedResourceMetricSet; import org.apache.iotdb.db.queryengine.metric.QueryResourceMetricSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java index cab286aa48fc1..ff3be331de1e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java @@ -29,6 +29,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.TsFileProcessorException; @@ -39,7 +40,6 @@ import org.apache.iotdb.db.pipe.source.dataregion.realtime.listener.PipeInsertionDataNodeListener; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; -import org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.metric.QueryResourceMetricSet; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; @@ -117,7 +117,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Function; -import static org.apache.iotdb.db.queryengine.metric.QueryExecutionMetricSet.GET_QUERY_RESOURCE_FROM_MEM; +import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.GET_QUERY_RESOURCE_FROM_MEM; import static org.apache.iotdb.db.queryengine.metric.QueryResourceMetricSet.FLUSHING_MEMTABLE; import static org.apache.iotdb.db.queryengine.metric.QueryResourceMetricSet.WORKING_MEMTABLE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/TableDiskSpiller.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/TableDiskSpiller.java index da22b44999f38..3ff756aa8eeb1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/TableDiskSpiller.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/TableDiskSpiller.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.utils.sort; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java index ee6293708f312..5cc287f6e4259 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java @@ -42,7 +42,7 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparator; +import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparatorUtils.getComparator; import static org.junit.Assert.assertEquals; public class AggregationMergeSortOperatorTest { 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 c52748ef58ac4..b73d6fbb05a1f 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 @@ -42,7 +42,7 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.FullOuterTimeJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator; +import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.ShowQueriesOperator; @@ -355,7 +355,7 @@ public TreeMergeSortOperator mergeSortOperatorTest( Arrays.asList( singleDeviceViewOperator1, singleDeviceViewOperator2, singleDeviceViewOperator3), tsDataTypes, - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Arrays.asList( new SortItem(OrderByKey.TIME, timeOrdering), new SortItem(OrderByKey.DEVICE, deviceOrdering)), @@ -839,7 +839,7 @@ public TreeMergeSortOperator mergeSortOperatorTest2( driverContext.getOperatorContexts().get(14), Arrays.asList(singleDeviceViewOperator1, singleDeviceViewOperator2), tsDataTypes, - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Arrays.asList( new SortItem(OrderByKey.TIME, timeOrdering), new SortItem(OrderByKey.DEVICE, deviceOrdering)), @@ -853,7 +853,7 @@ public TreeMergeSortOperator mergeSortOperatorTest2( driverContext.getOperatorContexts().get(15), Arrays.asList(singleDeviceViewOperator3, singleDeviceViewOperator4), tsDataTypes, - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Arrays.asList( new SortItem(OrderByKey.TIME, timeOrdering), new SortItem(OrderByKey.DEVICE, deviceOrdering)), @@ -868,7 +868,7 @@ public TreeMergeSortOperator mergeSortOperatorTest2( driverContext.getOperatorContexts().get(16), Arrays.asList(treeMergeSortOperator1, treeMergeSortOperator2), tsDataTypes, - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Arrays.asList( new SortItem(OrderByKey.TIME, timeOrdering), new SortItem(OrderByKey.DEVICE, deviceOrdering)), @@ -1329,7 +1329,7 @@ public TreeMergeSortOperator mergeSortOperatorTest3( driverContext.getOperatorContexts().get(12), Arrays.asList(deviceViewOperator1, deviceViewOperator2), tsDataTypes, - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Arrays.asList( new SortItem(OrderByKey.DEVICE, deviceOrdering), new SortItem(OrderByKey.TIME, timeOrdering)), @@ -1597,7 +1597,7 @@ public void mergeSortWithSortOperatorTest() throws Exception { List operatorContexts = driverContext.getOperatorContexts(); List dataTypes = DatasetHeaderFactory.getShowQueriesHeader().getRespDataTypes(); Comparator comparator = - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Arrays.asList( new SortItem(OrderByKey.TIME, Ordering.ASC), new SortItem(OrderByKey.DATANODEID, Ordering.DESC)), @@ -1785,7 +1785,7 @@ public void mergeSortTest() throws Exception { driverContext.getOperatorContexts().get(0), Arrays.asList(childOperator1, childOperator2), Collections.singletonList(TSDataType.INT64), - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Collections.singletonList(new SortItem(OrderByKey.TIME, Ordering.ASC)), Collections.singletonList(-1), Collections.singletonList(TSDataType.INT64))); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java index bb5f9b0a6379e..62bdfe1cbf2fe 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java @@ -33,7 +33,7 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeSortOperator; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator; +import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -177,7 +177,7 @@ public long ramBytesUsed() { OperatorContext operatorContext = driverContext.getOperatorContexts().get(1); Comparator comparator = - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Arrays.asList(new SortItem(OrderByKey.DATANODEID, Ordering.ASC)), ImmutableList.of(0), outputTypes); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java index a3c17e35f4ec8..62889b87d088c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java @@ -41,7 +41,7 @@ import org.apache.iotdb.db.queryengine.execution.operator.process.join.FullOuterTimeJoinOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator; +import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanOperator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; @@ -340,7 +340,7 @@ public TreeTopKOperator topKOperatorTest( Arrays.asList( singleDeviceViewOperator1, singleDeviceViewOperator2, singleDeviceViewOperator3), tsDataTypes, - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Arrays.asList( new SortItem(OrderByKey.TIME, timeOrdering), new SortItem(OrderByKey.DEVICE, deviceOrdering)), @@ -710,7 +710,7 @@ public TreeTopKOperator topKOperatorTest2( driverContext.getOperatorContexts().get(14), Arrays.asList(singleDeviceViewOperator1, singleDeviceViewOperator2), tsDataTypes, - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Arrays.asList( new SortItem(OrderByKey.TIME, timeOrdering), new SortItem(OrderByKey.DEVICE, deviceOrdering)), @@ -724,7 +724,7 @@ public TreeTopKOperator topKOperatorTest2( driverContext.getOperatorContexts().get(15), Arrays.asList(singleDeviceViewOperator3, singleDeviceViewOperator4), tsDataTypes, - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Arrays.asList( new SortItem(OrderByKey.TIME, timeOrdering), new SortItem(OrderByKey.DEVICE, deviceOrdering)), @@ -739,7 +739,7 @@ public TreeTopKOperator topKOperatorTest2( driverContext.getOperatorContexts().get(16), Arrays.asList(topKOperator1, topKOperator2), tsDataTypes, - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Arrays.asList( new SortItem(OrderByKey.TIME, timeOrdering), new SortItem(OrderByKey.DEVICE, deviceOrdering)), @@ -1093,7 +1093,7 @@ public TreeTopKOperator topKOperatorTest3( driverContext.getOperatorContexts().get(12), Arrays.asList(deviceViewOperator1, deviceViewOperator2), tsDataTypes, - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Arrays.asList( new SortItem(OrderByKey.DEVICE, deviceOrdering), new SortItem(OrderByKey.TIME, timeOrdering)), @@ -1322,7 +1322,7 @@ public void topKOperatorSortTest() throws Exception { driverContext.getOperatorContexts().get(0), Arrays.asList(childOperator1, childOperator2), Collections.singletonList(TSDataType.INT64), - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Collections.singletonList(new SortItem(OrderByKey.TIME, Ordering.ASC)), Collections.singletonList(-1), Collections.singletonList(TSDataType.INT64)), @@ -1547,7 +1547,7 @@ public TreeTopKOperator emptyTopKOperatorTest( Arrays.asList( singleDeviceViewOperator1, singleDeviceViewOperator2, singleDeviceViewOperator3), tsDataTypes, - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Arrays.asList( new SortItem(OrderByKey.TIME, timeOrdering), new SortItem(OrderByKey.DEVICE, deviceOrdering)), diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java index a276c8618f3df..d5ec53397ecda 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.TableStreamSortOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; @@ -55,8 +55,8 @@ import java.util.List; import java.util.concurrent.ExecutorService; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; -import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.utils.EnvironmentUtils.cleanDir; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java index e08c2245e6750..e9ee663b35569 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.process.ValuesOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java index ea22fc8a69478..1b0ecd6e0c2e7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java @@ -20,10 +20,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWGroupWMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -52,8 +54,8 @@ import java.util.Set; import java.util.concurrent.ExecutorService; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; -import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java index 6d84000d9351e..91ac1d4710b8b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java @@ -20,10 +20,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWGroupWoMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -51,8 +53,8 @@ import java.util.Set; import java.util.concurrent.ExecutorService; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; -import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java index 27eccc5dba2c7..add04df03d5e6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java @@ -20,10 +20,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java index 40936717a22e9..aaee67935a028 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java @@ -20,10 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java index 535c246e076d0..035eeb9270e80 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java @@ -49,7 +49,7 @@ import java.util.List; import java.util.concurrent.ExecutorService; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java index 0ce5acbe5538e..e043afadcb503 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.RowNumberOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java index 26cb5c71e88b8..592ce5a56fb4a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.TableWindowOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RankFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java index 9e2e22845e3d4..81545bbad237b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java index 1bde9153dca25..f61689914e48a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.TopKRankingOperator; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java index 19f66f5604269..f5748ee681979 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate; import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java index 284c5d7a5579d..f998eec5a52ed 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.CumeDistFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java index 461eee97794fb..2224f6d10aed9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.DenseRankFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java index b7f675241b27c..a34aca134c5d8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.NTileFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java index e4021485c2a78..f20d529a8e52e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.PercentRankFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java index 2e5205ecf9ec6..542a1458def28 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RankFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java index 043c6de69a7db..577fe8f223799 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RowNumberFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java index 1af502e2f6d39..8ae2616191320 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.FirstValueFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java index 02d47cef7b96f..f30f36d8bfa50 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LagFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java index 137ff7b19246e..cb74fc28dcd1f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LastValueFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java index b770837c84f90..467a6177b50de 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LeadFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java index 270cbe81bd1cb..8e27eba09067f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.NthValueFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java index b59a783988442..c5b80b552743f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.optimization; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; -import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; import org.apache.tsfile.utils.TimeDuration; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java index e242c46ad0c0e..28e35ac2bb101 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; -import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.statement.component.GroupByTimeComponent; import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; 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 2301cc1b3c1ae..1973df9be383d 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 @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ColumnInjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; @@ -50,7 +51,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.IntoPathDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; -import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java index 9c6211bc61290..ff3633f550cb4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java @@ -20,11 +20,11 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.FillDescriptor; -import org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.literal.LongLiteral; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java index 348b34efb91e2..e91486b17dd09 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java @@ -57,11 +57,11 @@ import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.SUM; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.hash.GroupByHash.DEFAULT_GROUP_NUMBER; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; -import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java index f83f7cf5baa7f..c8dffa7497fbc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java @@ -43,7 +43,7 @@ import java.util.Collections; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; 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 b0751e1e1308c..99f6a9c7fa5c4 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 @@ -72,7 +72,7 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SqlParserErrorHandlerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SqlParserErrorHandlerTest.java index f17efb29616d5..5d7662a097d6b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SqlParserErrorHandlerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SqlParserErrorHandlerTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java index 8d1795373bd86..035d1028c64ed 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.auth.entity.PrivilegeModelType; import org.apache.iotdb.commons.auth.entity.PrivilegeType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RelationalAuthorStatement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java index a84b44323e190..5e73abe878490 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.utils.datastructure; -import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator; +import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparatorUtils; import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; @@ -82,7 +82,7 @@ public void minHeapTest() { inputBuilder2.declarePosition(); Comparator comparator = - MergeSortComparator.getComparator( + MergeSortComparatorUtils.getComparator( Arrays.asList( new SortItem(OrderByKey.TIME, Ordering.ASC), new SortItem(OrderByKey.DEVICE, Ordering.ASC)), From e618ef3bcd6b03d03ae4e905f355b379763f079f Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Thu, 16 Apr 2026 12:29:57 +0800 Subject: [PATCH 23/45] fix --- .../relational/ColumnTransformerBuilder.java | 70 +++-- .../planner/CastToBlobLiteralVisitor.java | 20 +- .../planner/CastToBooleanLiteralVisitor.java | 20 +- .../planner/CastToDateLiteralVisitor.java | 20 +- .../planner/CastToDoubleLiteralVisitor.java | 20 +- .../planner/CastToFloatLiteralVisitor.java | 20 +- .../planner/CastToInt32LiteralVisitor.java | 20 +- .../planner/CastToInt64LiteralVisitor.java | 20 +- .../planner/CastToStringLiteralVisitor.java | 20 +- .../CastToTimestampLiteralVisitor.java | 20 +- .../ir/GlobalTimePredicateExtractVisitor.java | 35 +-- .../sql/ast/CommonQueryAstVisitor.java | 164 +++++----- .../sql/ast/StackableAstVisitor.java | 2 +- .../sql/util/ExpressionFormatter.java | 98 +++--- ...PipeStatementTablePatternParseVisitor.java | 2 +- .../PipeTableStatementToPlanVisitor.java | 2 +- .../config/TableConfigTaskVisitor.java | 174 ++++++----- ...ableModelStatementMemorySourceVisitor.java | 2 +- .../analyzer/AggregationAnalyzer.java | 66 ++--- .../analyzer/ExpressionAnalyzer.java | 85 +++--- .../analyzer/StatementAnalyzer.java | 191 ++++++------ .../ConvertPredicateToFilterVisitor.java | 24 +- .../ConvertPredicateToTimeFilterVisitor.java | 24 +- .../PredicateCombineIntoTableScanChecker.java | 24 +- .../PredicatePushIntoMetadataChecker.java | 67 +++-- .../PredicatePushIntoScanChecker.java | 24 +- .../analyzer/predicate/PredicateVisitor.java | 26 +- .../schema/CheckSchemaPredicateVisitor.java | 11 +- ...ConvertSchemaPredicateToFilterVisitor.java | 24 +- .../ExtractPredicateColumnNameVisitor.java | 27 +- .../planner/IrExpressionInterpreter.java | 40 +-- .../relational/planner/IrTypeAnalyzer.java | 66 ++--- .../planner/LiteralInterpreter.java | 20 +- .../relational/planner/RelationPlanner.java | 43 ++- .../relational/planner/SymbolsExtractor.java | 11 +- .../planner/ir/DefaultTraversalVisitor.java | 38 +-- .../planner/ir/DeterminismEvaluator.java | 2 +- .../planner/ir/ExpressionTreeRewriter.java | 45 ++- .../GapFillStartAndEndTimeExtractVisitor.java | 12 +- .../rowpattern/RowPatternToIrRewriter.java | 18 +- .../relational/sql/ParameterExtractor.java | 2 +- .../plan/relational/sql/ast/AstVisitor.java | 280 +++++++++--------- .../DefaultExpressionTraversalVisitor.java | 2 +- .../sql/ast/DefaultTraversalVisitor.java | 135 +++++---- .../relational/sql/rewrite/ShowRewrite.java | 12 +- .../sql/util/RowPatternFormatter.java | 30 +- .../relational/sql/util/SqlFormatter.java | 141 +++++---- ...InsertTabletStatementExceptionVisitor.java | 2 +- ...tementDataTypeConvertExecutionVisitor.java | 2 +- .../assertions/ExpressionVerifier.java | 64 ++-- 50 files changed, 1127 insertions(+), 1160 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java index e476a881ccf9a..af96c98faf8a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java @@ -250,7 +250,7 @@ import static org.apache.tsfile.read.common.type.StringType.STRING; public class ColumnTransformerBuilder - extends CommonQueryAstVisitor { + implements CommonQueryAstVisitor { private static final String UNSUPPORTED_EXPRESSION = "Unsupported expression: %s"; @@ -261,8 +261,7 @@ public ColumnTransformer visitExpression(Expression expression, Context context) } @Override - protected ColumnTransformer visitArithmeticBinary( - ArithmeticBinaryExpression node, Context context) { + public ColumnTransformer visitArithmeticBinary(ArithmeticBinaryExpression node, Context context) { if (!context.cache.containsKey(node)) { if (context.hasSeen.containsKey(node)) { ColumnTransformer left = process(node.getLeft(), context); @@ -324,8 +323,7 @@ protected ColumnTransformer visitArithmeticBinary( } @Override - protected ColumnTransformer visitArithmeticUnary( - ArithmeticUnaryExpression node, Context context) { + public ColumnTransformer visitArithmeticUnary(ArithmeticUnaryExpression node, Context context) { switch (node.getSign()) { case PLUS: return process(node.getValue(), context); @@ -347,7 +345,7 @@ protected ColumnTransformer visitArithmeticUnary( } @Override - protected ColumnTransformer visitBetweenPredicate(BetweenPredicate node, Context context) { + public ColumnTransformer visitBetweenPredicate(BetweenPredicate node, Context context) { if (!context.cache.containsKey(node)) { if (context.hasSeen.containsKey(node)) { appendIdentityColumnTransformer(node, BOOLEAN, TSDataType.BOOLEAN, context); @@ -362,7 +360,7 @@ protected ColumnTransformer visitBetweenPredicate(BetweenPredicate node, Context } @Override - protected ColumnTransformer visitCast(Cast node, Context context) { + public ColumnTransformer visitCast(Cast node, Context context) { if (!context.cache.containsKey(node)) { if (context.hasSeen.containsKey(node)) { @@ -392,7 +390,7 @@ protected ColumnTransformer visitCast(Cast node, Context context) { } @Override - protected ColumnTransformer visitExtract(Extract node, Context context) { + public ColumnTransformer visitExtract(Extract node, Context context) { if (!context.cache.containsKey(node)) { if (context.hasSeen.containsKey(node)) { ColumnTransformer columnTransformer = context.hasSeen.get(node); @@ -413,7 +411,7 @@ protected ColumnTransformer visitExtract(Extract node, Context context) { } @Override - protected ColumnTransformer visitBooleanLiteral(BooleanLiteral node, Context context) { + public ColumnTransformer visitBooleanLiteral(BooleanLiteral node, Context context) { ColumnTransformer res = context.cache.computeIfAbsent( node, @@ -430,7 +428,7 @@ protected ColumnTransformer visitBooleanLiteral(BooleanLiteral node, Context con } @Override - protected ColumnTransformer visitBinaryLiteral(BinaryLiteral node, Context context) { + public ColumnTransformer visitBinaryLiteral(BinaryLiteral node, Context context) { ColumnTransformer res = context.cache.computeIfAbsent( node, @@ -448,7 +446,7 @@ protected ColumnTransformer visitBinaryLiteral(BinaryLiteral node, Context conte } @Override - protected ColumnTransformer visitStringLiteral(StringLiteral node, Context context) { + public ColumnTransformer visitStringLiteral(StringLiteral node, Context context) { ColumnTransformer res = context.cache.computeIfAbsent( node, @@ -468,7 +466,7 @@ protected ColumnTransformer visitStringLiteral(StringLiteral node, Context conte } @Override - protected ColumnTransformer visitLongLiteral(LongLiteral node, Context context) { + public ColumnTransformer visitLongLiteral(LongLiteral node, Context context) { ColumnTransformer res = context.cache.computeIfAbsent( node, @@ -495,7 +493,7 @@ protected ColumnTransformer visitLongLiteral(LongLiteral node, Context context) } @Override - protected ColumnTransformer visitDoubleLiteral(DoubleLiteral node, Context context) { + public ColumnTransformer visitDoubleLiteral(DoubleLiteral node, Context context) { ColumnTransformer res = context.cache.computeIfAbsent( node, @@ -512,7 +510,7 @@ protected ColumnTransformer visitDoubleLiteral(DoubleLiteral node, Context conte } @Override - protected ColumnTransformer visitFloatLiteral(FloatLiteral node, Context context) { + public ColumnTransformer visitFloatLiteral(FloatLiteral node, Context context) { ColumnTransformer res = context.cache.computeIfAbsent( node, @@ -528,12 +526,12 @@ protected ColumnTransformer visitFloatLiteral(FloatLiteral node, Context context } @Override - protected ColumnTransformer visitDecimalLiteral(DecimalLiteral node, Context context) { + public ColumnTransformer visitDecimalLiteral(DecimalLiteral node, Context context) { throw new UnsupportedOperationException(); } @Override - protected ColumnTransformer visitGenericLiteral(GenericLiteral node, Context context) { + public ColumnTransformer visitGenericLiteral(GenericLiteral node, Context context) { ColumnTransformer res = context.cache.computeIfAbsent( node, @@ -570,7 +568,7 @@ private static ConstantColumnTransformer getColumnTransformerForGenericLiteral( } @Override - protected ColumnTransformer visitNullLiteral(NullLiteral node, Context context) { + public ColumnTransformer visitNullLiteral(NullLiteral node, Context context) { ColumnTransformer res = context.cache.computeIfAbsent( node, @@ -584,8 +582,7 @@ protected ColumnTransformer visitNullLiteral(NullLiteral node, Context context) } @Override - protected ColumnTransformer visitComparisonExpression( - ComparisonExpression node, Context context) { + public ColumnTransformer visitComparisonExpression(ComparisonExpression node, Context context) { ColumnTransformer comparisonTransformer; if (context.cache.containsKey(node)) { comparisonTransformer = context.cache.get(node); @@ -632,7 +629,7 @@ private ColumnTransformer getColumnTransformer(ComparisonExpression node, Contex } @Override - protected ColumnTransformer visitCurrentDatabase(CurrentDatabase node, Context context) { + public ColumnTransformer visitCurrentDatabase(CurrentDatabase node, Context context) { Optional currentDatabase = context.sessionInfo.getDatabaseName(); ColumnTransformer res; res = @@ -666,12 +663,12 @@ protected ColumnTransformer visitCurrentDatabase(CurrentDatabase node, Context c } @Override - protected ColumnTransformer visitCurrentTime(CurrentTime node, Context context) { + public ColumnTransformer visitCurrentTime(CurrentTime node, Context context) { throw new UnsupportedOperationException(String.format(UNSUPPORTED_EXPRESSION, node)); } @Override - protected ColumnTransformer visitCurrentUser(CurrentUser node, Context context) { + public ColumnTransformer visitCurrentUser(CurrentUser node, Context context) { String currentUser = context.sessionInfo.getUserName(); ColumnTransformer res = context.cache.computeIfAbsent( @@ -692,7 +689,7 @@ protected ColumnTransformer visitCurrentUser(CurrentUser node, Context context) } @Override - protected ColumnTransformer visitFunctionCall(FunctionCall node, Context context) { + public ColumnTransformer visitFunctionCall(FunctionCall node, Context context) { if (!context.cache.containsKey(node)) { if (context.hasSeen.containsKey(node)) { ColumnTransformer columnTransformer = context.hasSeen.get(node); @@ -1504,7 +1501,7 @@ private ColumnTransformer getFunctionColumnTransformer( } @Override - protected ColumnTransformer visitInPredicate(InPredicate node, Context context) { + public ColumnTransformer visitInPredicate(InPredicate node, Context context) { if (!context.cache.containsKey(node)) { if (context.hasSeen.containsKey(node)) { appendIdentityColumnTransformer(node, BOOLEAN, TSDataType.BOOLEAN, context); @@ -1638,7 +1635,7 @@ private static InMultiColumnTransformer constructInColumnTransformer( } @Override - protected ColumnTransformer visitNotExpression(NotExpression node, Context context) { + public ColumnTransformer visitNotExpression(NotExpression node, Context context) { if (!context.cache.containsKey(node)) { if (context.hasSeen.containsKey(node)) { appendIdentityColumnTransformer(node, BOOLEAN, TSDataType.BOOLEAN, context); @@ -1651,7 +1648,7 @@ protected ColumnTransformer visitNotExpression(NotExpression node, Context conte } @Override - protected ColumnTransformer visitLikePredicate(LikePredicate node, Context context) { + public ColumnTransformer visitLikePredicate(LikePredicate node, Context context) { if (!context.cache.containsKey(node)) { if (context.hasSeen.containsKey(node)) { appendIdentityColumnTransformer(node, BOOLEAN, TSDataType.BOOLEAN, context); @@ -1693,7 +1690,7 @@ protected ColumnTransformer visitLikePredicate(LikePredicate node, Context conte } @Override - protected ColumnTransformer visitIsNotNullPredicate(IsNotNullPredicate node, Context context) { + public ColumnTransformer visitIsNotNullPredicate(IsNotNullPredicate node, Context context) { if (!context.cache.containsKey(node)) { if (context.hasSeen.containsKey(node)) { appendIdentityColumnTransformer(node, BOOLEAN, TSDataType.BOOLEAN, context); @@ -1706,7 +1703,7 @@ protected ColumnTransformer visitIsNotNullPredicate(IsNotNullPredicate node, Con } @Override - protected ColumnTransformer visitIsNullPredicate(IsNullPredicate node, Context context) { + public ColumnTransformer visitIsNullPredicate(IsNullPredicate node, Context context) { if (!context.cache.containsKey(node)) { if (context.hasSeen.containsKey(node)) { appendIdentityColumnTransformer(node, BOOLEAN, TSDataType.BOOLEAN, context); @@ -1720,7 +1717,7 @@ protected ColumnTransformer visitIsNullPredicate(IsNullPredicate node, Context c } @Override - protected ColumnTransformer visitLogicalExpression(LogicalExpression node, Context context) { + public ColumnTransformer visitLogicalExpression(LogicalExpression node, Context context) { ColumnTransformer logicalTransformer; if (context.cache.containsKey(node)) { logicalTransformer = context.cache.get(node); @@ -1759,7 +1756,7 @@ private ColumnTransformer getColumnTransformer(LogicalExpression node, Context c } @Override - protected ColumnTransformer visitSymbolReference(SymbolReference node, Context context) { + public ColumnTransformer visitSymbolReference(SymbolReference node, Context context) { ColumnTransformer res = context.cache.computeIfAbsent( node, @@ -1782,7 +1779,7 @@ protected ColumnTransformer visitSymbolReference(SymbolReference node, Context c } @Override - protected ColumnTransformer visitCoalesceExpression(CoalesceExpression node, Context context) { + public ColumnTransformer visitCoalesceExpression(CoalesceExpression node, Context context) { if (!context.cache.containsKey(node)) { if (context.hasSeen.containsKey(node)) { ColumnTransformer columnTransformer = context.hasSeen.get(node); @@ -1804,8 +1801,7 @@ protected ColumnTransformer visitCoalesceExpression(CoalesceExpression node, Con } @Override - protected ColumnTransformer visitSimpleCaseExpression( - SimpleCaseExpression node, Context context) { + public ColumnTransformer visitSimpleCaseExpression(SimpleCaseExpression node, Context context) { if (!context.cache.containsKey(node)) { if (context.hasSeen.containsKey(node)) { ColumnTransformer columnTransformer = context.hasSeen.get(node); @@ -1841,7 +1837,7 @@ protected ColumnTransformer visitSimpleCaseExpression( } @Override - protected ColumnTransformer visitSearchedCaseExpression( + public ColumnTransformer visitSearchedCaseExpression( SearchedCaseExpression node, Context context) { if (!context.cache.containsKey(node)) { if (context.hasSeen.containsKey(node)) { @@ -1873,17 +1869,17 @@ protected ColumnTransformer visitSearchedCaseExpression( } @Override - protected ColumnTransformer visitTrim(Trim node, Context context) { + public ColumnTransformer visitTrim(Trim node, Context context) { throw new UnsupportedOperationException(String.format(UNSUPPORTED_EXPRESSION, node)); } @Override - protected ColumnTransformer visitIfExpression(IfExpression node, Context context) { + public ColumnTransformer visitIfExpression(IfExpression node, Context context) { throw new UnsupportedOperationException(String.format(UNSUPPORTED_EXPRESSION, node)); } @Override - protected ColumnTransformer visitNullIfExpression(NullIfExpression node, Context context) { + public ColumnTransformer visitNullIfExpression(NullIfExpression node, Context context) { throw new UnsupportedOperationException(String.format(UNSUPPORTED_EXPRESSION, node)); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java index bef1e2c9af5da..cf42b66085b4c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java @@ -33,35 +33,35 @@ import org.apache.tsfile.utils.Binary; // return NULL, if we cannot parse literal to blob type -public class CastToBlobLiteralVisitor extends CommonQueryAstVisitor { +public class CastToBlobLiteralVisitor implements CommonQueryAstVisitor { @Override - protected Binary visitLiteral(Literal node, Void context) { + public Binary visitLiteral(Literal node, Void context) { throw new UnsupportedOperationException("Unhandled literal type: " + node); } @Override - protected Binary visitBooleanLiteral(BooleanLiteral node, Void context) { + public Binary visitBooleanLiteral(BooleanLiteral node, Void context) { return null; } @Override - protected Binary visitLongLiteral(LongLiteral node, Void context) { + public Binary visitLongLiteral(LongLiteral node, Void context) { return null; } @Override - protected Binary visitDoubleLiteral(DoubleLiteral node, Void context) { + public Binary visitDoubleLiteral(DoubleLiteral node, Void context) { return null; } @Override - protected Binary visitFloatLiteral(FloatLiteral node, Void context) { + public Binary visitFloatLiteral(FloatLiteral node, Void context) { return null; } @Override - protected Binary visitStringLiteral(StringLiteral node, Void context) { + public Binary visitStringLiteral(StringLiteral node, Void context) { try { return new Binary(new BinaryLiteral(node.getValue()).getValue()); } catch (Exception e) { @@ -70,12 +70,12 @@ protected Binary visitStringLiteral(StringLiteral node, Void context) { } @Override - protected Binary visitBinaryLiteral(BinaryLiteral node, Void context) { + public Binary visitBinaryLiteral(BinaryLiteral node, Void context) { return new Binary(node.getValue()); } @Override - protected Binary visitGenericLiteral(GenericLiteral node, Void context) { + public Binary visitGenericLiteral(GenericLiteral node, Void context) { try { return new Binary(new BinaryLiteral(node.getValue()).getValue()); } catch (Exception e) { @@ -84,7 +84,7 @@ protected Binary visitGenericLiteral(GenericLiteral node, Void context) { } @Override - protected Binary visitNullLiteral(NullLiteral node, Void context) { + public Binary visitNullLiteral(NullLiteral node, Void context) { return null; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java index 8e973cdec388c..109cf0050536c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java @@ -31,35 +31,35 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to boolean type -public class CastToBooleanLiteralVisitor extends CommonQueryAstVisitor { +public class CastToBooleanLiteralVisitor implements CommonQueryAstVisitor { @Override - protected Boolean visitLiteral(Literal node, Void context) { + public Boolean visitLiteral(Literal node, Void context) { throw new UnsupportedOperationException("Unhandled literal type: " + node); } @Override - protected Boolean visitBooleanLiteral(BooleanLiteral node, Void context) { + public Boolean visitBooleanLiteral(BooleanLiteral node, Void context) { return node.getValue(); } @Override - protected Boolean visitLongLiteral(LongLiteral node, Void context) { + public Boolean visitLongLiteral(LongLiteral node, Void context) { return node.getParsedValue() != 0; } @Override - protected Boolean visitDoubleLiteral(DoubleLiteral node, Void context) { + public Boolean visitDoubleLiteral(DoubleLiteral node, Void context) { return node.getValue() != 0; } @Override - protected Boolean visitFloatLiteral(FloatLiteral node, Void context) { + public Boolean visitFloatLiteral(FloatLiteral node, Void context) { return node.getValue() != 0; } @Override - protected Boolean visitStringLiteral(StringLiteral node, Void context) { + public Boolean visitStringLiteral(StringLiteral node, Void context) { try { return Boolean.parseBoolean(node.getValue()); } catch (Exception e) { @@ -68,12 +68,12 @@ protected Boolean visitStringLiteral(StringLiteral node, Void context) { } @Override - protected Boolean visitBinaryLiteral(BinaryLiteral node, Void context) { + public Boolean visitBinaryLiteral(BinaryLiteral node, Void context) { return null; } @Override - protected Boolean visitGenericLiteral(GenericLiteral node, Void context) { + public Boolean visitGenericLiteral(GenericLiteral node, Void context) { try { return Boolean.parseBoolean(node.getValue()); } catch (Exception e) { @@ -82,7 +82,7 @@ protected Boolean visitGenericLiteral(GenericLiteral node, Void context) { } @Override - protected Boolean visitNullLiteral(NullLiteral node, Void context) { + public Boolean visitNullLiteral(NullLiteral node, Void context) { return null; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java index 20462fa84fa9d..dcb9e30da74db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java @@ -33,35 +33,35 @@ import org.apache.tsfile.utils.DateUtils; // return NULL, if we cannot parse literal to date type -public class CastToDateLiteralVisitor extends CommonQueryAstVisitor { +public class CastToDateLiteralVisitor implements CommonQueryAstVisitor { @Override - protected Integer visitLiteral(Literal node, Void context) { + public Integer visitLiteral(Literal node, Void context) { throw new UnsupportedOperationException("Unhandled literal type: " + node); } @Override - protected Integer visitBooleanLiteral(BooleanLiteral node, Void context) { + public Integer visitBooleanLiteral(BooleanLiteral node, Void context) { return null; } @Override - protected Integer visitLongLiteral(LongLiteral node, Void context) { + public Integer visitLongLiteral(LongLiteral node, Void context) { return (int) node.getParsedValue(); } @Override - protected Integer visitDoubleLiteral(DoubleLiteral node, Void context) { + public Integer visitDoubleLiteral(DoubleLiteral node, Void context) { return (int) node.getValue(); } @Override - protected Integer visitFloatLiteral(FloatLiteral node, Void context) { + public Integer visitFloatLiteral(FloatLiteral node, Void context) { return (int) node.getValue(); } @Override - protected Integer visitStringLiteral(StringLiteral node, Void context) { + public Integer visitStringLiteral(StringLiteral node, Void context) { try { return DateUtils.parseDateExpressionToInt(node.getValue()); } catch (Exception e) { @@ -70,12 +70,12 @@ protected Integer visitStringLiteral(StringLiteral node, Void context) { } @Override - protected Integer visitBinaryLiteral(BinaryLiteral node, Void context) { + public Integer visitBinaryLiteral(BinaryLiteral node, Void context) { return null; } @Override - protected Integer visitGenericLiteral(GenericLiteral node, Void context) { + public Integer visitGenericLiteral(GenericLiteral node, Void context) { try { return DateUtils.parseDateExpressionToInt(node.getValue()); } catch (Exception e) { @@ -84,7 +84,7 @@ protected Integer visitGenericLiteral(GenericLiteral node, Void context) { } @Override - protected Integer visitNullLiteral(NullLiteral node, Void context) { + public Integer visitNullLiteral(NullLiteral node, Void context) { return null; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java index be66a5867137d..bb384433cc2b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java @@ -31,35 +31,35 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to double type -public class CastToDoubleLiteralVisitor extends CommonQueryAstVisitor { +public class CastToDoubleLiteralVisitor implements CommonQueryAstVisitor { @Override - protected Double visitLiteral(Literal node, Void context) { + public Double visitLiteral(Literal node, Void context) { throw new UnsupportedOperationException("Unhandled literal type: " + node); } @Override - protected Double visitBooleanLiteral(BooleanLiteral node, Void context) { + public Double visitBooleanLiteral(BooleanLiteral node, Void context) { return node.getValue() ? 1.0d : 0.0d; } @Override - protected Double visitLongLiteral(LongLiteral node, Void context) { + public Double visitLongLiteral(LongLiteral node, Void context) { return (double) node.getParsedValue(); } @Override - protected Double visitDoubleLiteral(DoubleLiteral node, Void context) { + public Double visitDoubleLiteral(DoubleLiteral node, Void context) { return node.getValue(); } @Override - protected Double visitFloatLiteral(FloatLiteral node, Void context) { + public Double visitFloatLiteral(FloatLiteral node, Void context) { return (double) node.getValue(); } @Override - protected Double visitStringLiteral(StringLiteral node, Void context) { + public Double visitStringLiteral(StringLiteral node, Void context) { try { return Double.parseDouble(node.getValue()); } catch (Exception e) { @@ -68,12 +68,12 @@ protected Double visitStringLiteral(StringLiteral node, Void context) { } @Override - protected Double visitBinaryLiteral(BinaryLiteral node, Void context) { + public Double visitBinaryLiteral(BinaryLiteral node, Void context) { return null; } @Override - protected Double visitGenericLiteral(GenericLiteral node, Void context) { + public Double visitGenericLiteral(GenericLiteral node, Void context) { try { return Double.parseDouble(node.getValue()); } catch (Exception e) { @@ -82,7 +82,7 @@ protected Double visitGenericLiteral(GenericLiteral node, Void context) { } @Override - protected Double visitNullLiteral(NullLiteral node, Void context) { + public Double visitNullLiteral(NullLiteral node, Void context) { return null; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java index 65203715a9b87..c8e8c5c6b490c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java @@ -31,35 +31,35 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to float type -public class CastToFloatLiteralVisitor extends CommonQueryAstVisitor { +public class CastToFloatLiteralVisitor implements CommonQueryAstVisitor { @Override - protected Float visitLiteral(Literal node, Void context) { + public Float visitLiteral(Literal node, Void context) { throw new UnsupportedOperationException("Unhandled literal type: " + node); } @Override - protected Float visitBooleanLiteral(BooleanLiteral node, Void context) { + public Float visitBooleanLiteral(BooleanLiteral node, Void context) { return node.getValue() ? 1.0f : 0.0f; } @Override - protected Float visitLongLiteral(LongLiteral node, Void context) { + public Float visitLongLiteral(LongLiteral node, Void context) { return (float) node.getParsedValue(); } @Override - protected Float visitDoubleLiteral(DoubleLiteral node, Void context) { + public Float visitDoubleLiteral(DoubleLiteral node, Void context) { return (float) node.getValue(); } @Override - protected Float visitFloatLiteral(FloatLiteral node, Void context) { + public Float visitFloatLiteral(FloatLiteral node, Void context) { return node.getValue(); } @Override - protected Float visitStringLiteral(StringLiteral node, Void context) { + public Float visitStringLiteral(StringLiteral node, Void context) { try { return Float.parseFloat(node.getValue()); } catch (Exception e) { @@ -68,12 +68,12 @@ protected Float visitStringLiteral(StringLiteral node, Void context) { } @Override - protected Float visitBinaryLiteral(BinaryLiteral node, Void context) { + public Float visitBinaryLiteral(BinaryLiteral node, Void context) { return null; } @Override - protected Float visitGenericLiteral(GenericLiteral node, Void context) { + public Float visitGenericLiteral(GenericLiteral node, Void context) { try { return Float.parseFloat(node.getValue()); } catch (Exception e) { @@ -82,7 +82,7 @@ protected Float visitGenericLiteral(GenericLiteral node, Void context) { } @Override - protected Float visitNullLiteral(NullLiteral node, Void context) { + public Float visitNullLiteral(NullLiteral node, Void context) { return null; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java index 40a47fc9418ac..a9e92f3438cf3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java @@ -31,35 +31,35 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to INT32 type -public class CastToInt32LiteralVisitor extends CommonQueryAstVisitor { +public class CastToInt32LiteralVisitor implements CommonQueryAstVisitor { @Override - protected Integer visitLiteral(Literal node, Void context) { + public Integer visitLiteral(Literal node, Void context) { throw new UnsupportedOperationException("Unhandled literal type: " + node); } @Override - protected Integer visitBooleanLiteral(BooleanLiteral node, Void context) { + public Integer visitBooleanLiteral(BooleanLiteral node, Void context) { return node.getValue() ? 1 : 0; } @Override - protected Integer visitLongLiteral(LongLiteral node, Void context) { + public Integer visitLongLiteral(LongLiteral node, Void context) { return (int) node.getParsedValue(); } @Override - protected Integer visitDoubleLiteral(DoubleLiteral node, Void context) { + public Integer visitDoubleLiteral(DoubleLiteral node, Void context) { return (int) node.getValue(); } @Override - protected Integer visitFloatLiteral(FloatLiteral node, Void context) { + public Integer visitFloatLiteral(FloatLiteral node, Void context) { return (int) node.getValue(); } @Override - protected Integer visitStringLiteral(StringLiteral node, Void context) { + public Integer visitStringLiteral(StringLiteral node, Void context) { try { return Integer.parseInt(node.getValue()); } catch (Exception e) { @@ -68,12 +68,12 @@ protected Integer visitStringLiteral(StringLiteral node, Void context) { } @Override - protected Integer visitBinaryLiteral(BinaryLiteral node, Void context) { + public Integer visitBinaryLiteral(BinaryLiteral node, Void context) { return null; } @Override - protected Integer visitGenericLiteral(GenericLiteral node, Void context) { + public Integer visitGenericLiteral(GenericLiteral node, Void context) { try { return Integer.parseInt(node.getValue()); } catch (Exception e) { @@ -82,7 +82,7 @@ protected Integer visitGenericLiteral(GenericLiteral node, Void context) { } @Override - protected Integer visitNullLiteral(NullLiteral node, Void context) { + public Integer visitNullLiteral(NullLiteral node, Void context) { return null; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java index 62343667cce1d..a06d77d02ded7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java @@ -31,35 +31,35 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to INT64 type -public class CastToInt64LiteralVisitor extends CommonQueryAstVisitor { +public class CastToInt64LiteralVisitor implements CommonQueryAstVisitor { @Override - protected Long visitLiteral(Literal node, Void context) { + public Long visitLiteral(Literal node, Void context) { throw new UnsupportedOperationException("Unhandled literal type: " + node); } @Override - protected Long visitBooleanLiteral(BooleanLiteral node, Void context) { + public Long visitBooleanLiteral(BooleanLiteral node, Void context) { return node.getValue() ? 1L : 0L; } @Override - protected Long visitLongLiteral(LongLiteral node, Void context) { + public Long visitLongLiteral(LongLiteral node, Void context) { return node.getParsedValue(); } @Override - protected Long visitDoubleLiteral(DoubleLiteral node, Void context) { + public Long visitDoubleLiteral(DoubleLiteral node, Void context) { return (long) node.getValue(); } @Override - protected Long visitFloatLiteral(FloatLiteral node, Void context) { + public Long visitFloatLiteral(FloatLiteral node, Void context) { return (long) node.getValue(); } @Override - protected Long visitStringLiteral(StringLiteral node, Void context) { + public Long visitStringLiteral(StringLiteral node, Void context) { try { return Long.parseLong(node.getValue()); } catch (Exception e) { @@ -68,12 +68,12 @@ protected Long visitStringLiteral(StringLiteral node, Void context) { } @Override - protected Long visitBinaryLiteral(BinaryLiteral node, Void context) { + public Long visitBinaryLiteral(BinaryLiteral node, Void context) { return null; } @Override - protected Long visitGenericLiteral(GenericLiteral node, Void context) { + public Long visitGenericLiteral(GenericLiteral node, Void context) { try { return Long.parseLong(node.getValue()); } catch (Exception e) { @@ -82,7 +82,7 @@ protected Long visitGenericLiteral(GenericLiteral node, Void context) { } @Override - protected Long visitNullLiteral(NullLiteral node, Void context) { + public Long visitNullLiteral(NullLiteral node, Void context) { return null; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java index 862e5557880be..1b976f61e2736 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java @@ -36,7 +36,7 @@ import java.nio.charset.Charset; // return NULL, if we cannot parse literal to string/text type -public class CastToStringLiteralVisitor extends CommonQueryAstVisitor { +public class CastToStringLiteralVisitor implements CommonQueryAstVisitor { private final Charset charset; @@ -45,42 +45,42 @@ public CastToStringLiteralVisitor(Charset charset) { } @Override - protected Binary visitLiteral(Literal node, Void context) { + public Binary visitLiteral(Literal node, Void context) { throw new UnsupportedOperationException("Unhandled literal type: " + node); } @Override - protected Binary visitBooleanLiteral(BooleanLiteral node, Void context) { + public Binary visitBooleanLiteral(BooleanLiteral node, Void context) { return new Binary(String.valueOf(node.getValue()), charset); } @Override - protected Binary visitLongLiteral(LongLiteral node, Void context) { + public Binary visitLongLiteral(LongLiteral node, Void context) { return new Binary(node.getValue(), charset); } @Override - protected Binary visitDoubleLiteral(DoubleLiteral node, Void context) { + public Binary visitDoubleLiteral(DoubleLiteral node, Void context) { return new Binary(String.valueOf(node.getValue()), charset); } @Override - protected Binary visitFloatLiteral(FloatLiteral node, Void context) { + public Binary visitFloatLiteral(FloatLiteral node, Void context) { return new Binary(String.valueOf(node.getValue()), charset); } @Override - protected Binary visitStringLiteral(StringLiteral node, Void context) { + public Binary visitStringLiteral(StringLiteral node, Void context) { return new Binary(node.getValue(), charset); } @Override - protected Binary visitBinaryLiteral(BinaryLiteral node, Void context) { + public Binary visitBinaryLiteral(BinaryLiteral node, Void context) { return new Binary(BytesUtils.parseBlobByteArrayToString(node.getValue()), charset); } @Override - protected Binary visitGenericLiteral(GenericLiteral node, Void context) { + public Binary visitGenericLiteral(GenericLiteral node, Void context) { try { return new Binary(node.getValue(), charset); } catch (Exception e) { @@ -89,7 +89,7 @@ protected Binary visitGenericLiteral(GenericLiteral node, Void context) { } @Override - protected Binary visitNullLiteral(NullLiteral node, Void context) { + public Binary visitNullLiteral(NullLiteral node, Void context) { return null; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java index edd252ece7197..ffda563646b79 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java @@ -34,7 +34,7 @@ import java.time.ZoneId; // return NULL, if we cannot parse literal to timestamp type -public class CastToTimestampLiteralVisitor extends CommonQueryAstVisitor { +public class CastToTimestampLiteralVisitor implements CommonQueryAstVisitor { private final ZoneId zoneId; @@ -43,32 +43,32 @@ public CastToTimestampLiteralVisitor(ZoneId zoneId) { } @Override - protected Long visitLiteral(Literal node, Void context) { + public Long visitLiteral(Literal node, Void context) { throw new UnsupportedOperationException("Unhandled literal type: " + node); } @Override - protected Long visitBooleanLiteral(BooleanLiteral node, Void context) { + public Long visitBooleanLiteral(BooleanLiteral node, Void context) { return null; } @Override - protected Long visitLongLiteral(LongLiteral node, Void context) { + public Long visitLongLiteral(LongLiteral node, Void context) { return node.getParsedValue(); } @Override - protected Long visitDoubleLiteral(DoubleLiteral node, Void context) { + public Long visitDoubleLiteral(DoubleLiteral node, Void context) { return (long) node.getValue(); } @Override - protected Long visitFloatLiteral(FloatLiteral node, Void context) { + public Long visitFloatLiteral(FloatLiteral node, Void context) { return (long) node.getValue(); } @Override - protected Long visitStringLiteral(StringLiteral node, Void context) { + public Long visitStringLiteral(StringLiteral node, Void context) { try { return DateTimeUtils.convertDatetimeStrToLong(node.getValue(), zoneId); } catch (Exception e) { @@ -77,12 +77,12 @@ protected Long visitStringLiteral(StringLiteral node, Void context) { } @Override - protected Long visitBinaryLiteral(BinaryLiteral node, Void context) { + public Long visitBinaryLiteral(BinaryLiteral node, Void context) { return null; } @Override - protected Long visitGenericLiteral(GenericLiteral node, Void context) { + public Long visitGenericLiteral(GenericLiteral node, Void context) { try { return DateTimeUtils.convertDatetimeStrToLong(node.getValue(), zoneId); } catch (Exception e) { @@ -91,7 +91,7 @@ protected Long visitGenericLiteral(GenericLiteral node, Void context) { } @Override - protected Long visitNullLiteral(NullLiteral node, Void context) { + public Long visitNullLiteral(NullLiteral node, Void context) { return null; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java index 1eeb3106f0e3e..739ea869f6bf1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java @@ -51,7 +51,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; public class GlobalTimePredicateExtractVisitor - extends CommonQueryAstVisitor< + implements CommonQueryAstVisitor< Pair, GlobalTimePredicateExtractVisitor.Context> { private static final String NOT_SUPPORTED = @@ -70,14 +70,13 @@ public static Pair extractGlobalTimeFilter( predicate, new GlobalTimePredicateExtractVisitor.Context(true, true, timeColumnName)); } - protected Pair visitExpression( + public Pair visitExpression( Pair node, Context context) { throw new IllegalStateException(String.format(NOT_SUPPORTED, node.getClass())); } @Override - protected Pair visitLogicalExpression( - LogicalExpression node, Context context) { + public Pair visitLogicalExpression(LogicalExpression node, Context context) { if (node.getOperator() == AND) { List> resultPairs = new ArrayList<>(); for (Expression term : node.getTerms()) { @@ -157,7 +156,7 @@ private void getNewTimeValueExpressions( } @Override - protected Pair visitComparisonExpression( + public Pair visitComparisonExpression( ComparisonExpression node, Context context) { Expression leftExpression = node.getLeft(); Expression rightExpression = node.getRight(); @@ -169,30 +168,29 @@ protected Pair visitComparisonExpression( } @Override - protected Pair visitIsNullPredicate(IsNullPredicate node, Context context) { + public Pair visitIsNullPredicate(IsNullPredicate node, Context context) { // time filter don't support IS_NULL return new Pair<>(null, true); } @Override - protected Pair visitIsNotNullPredicate( + public Pair visitIsNotNullPredicate( IsNotNullPredicate node, Context context) { return new Pair<>(null, true); } @Override - protected Pair visitFunctionCall(FunctionCall node, Context context) { + public Pair visitFunctionCall(FunctionCall node, Context context) { return new Pair<>(null, true); } @Override - protected Pair visitLikePredicate(LikePredicate node, Context context) { + public Pair visitLikePredicate(LikePredicate node, Context context) { return new Pair<>(null, true); } @Override - protected Pair visitBetweenPredicate( - BetweenPredicate node, Context context) { + public Pair visitBetweenPredicate(BetweenPredicate node, Context context) { Expression firstExpression = node.getValue(); Expression secondExpression = node.getMin(); Expression thirdExpression = node.getMax(); @@ -215,7 +213,7 @@ protected Pair visitBetweenPredicate( } @Override - protected Pair visitInPredicate(InPredicate node, Context context) { + public Pair visitInPredicate(InPredicate node, Context context) { if (isTimeColumn(node.getValue(), context.timeColumnName)) { return new Pair<>(node, false); } @@ -224,7 +222,7 @@ protected Pair visitInPredicate(InPredicate node, Context c } @Override - protected Pair visitNotExpression(NotExpression node, Context context) { + public Pair visitNotExpression(NotExpression node, Context context) { Pair result = process( node.getValue(), @@ -238,31 +236,30 @@ protected Pair visitNotExpression(NotExpression node, Conte // ============================ not implemented ======================================= @Override - protected Pair visitArithmeticBinary( + public Pair visitArithmeticBinary( ArithmeticBinaryExpression node, Context context) { throw new IllegalStateException(String.format(NOT_SUPPORTED, node.getClass())); } @Override - protected Pair visitSimpleCaseExpression( + public Pair visitSimpleCaseExpression( SimpleCaseExpression node, Context context) { throw new IllegalStateException(String.format(NOT_SUPPORTED, node.getClass())); } @Override - protected Pair visitSearchedCaseExpression( + public Pair visitSearchedCaseExpression( SearchedCaseExpression node, Context context) { throw new IllegalStateException(String.format(NOT_SUPPORTED, node.getClass())); } @Override - protected Pair visitIfExpression(IfExpression node, Context context) { + public Pair visitIfExpression(IfExpression node, Context context) { throw new IllegalStateException(String.format(NOT_SUPPORTED, node.getClass())); } @Override - protected Pair visitNullIfExpression( - NullIfExpression node, Context context) { + public Pair visitNullIfExpression(NullIfExpression node, Context context) { throw new IllegalStateException(String.format(NOT_SUPPORTED, node.getClass())); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java index 174a07437f837..b1721897f8d8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java @@ -18,329 +18,329 @@ import javax.annotation.Nullable; -public abstract class CommonQueryAstVisitor implements IAstVisitor { +public interface CommonQueryAstVisitor extends IAstVisitor { - public R process(Node node) { + default R process(Node node) { return process(node, null); } - public R process(Node node, @Nullable C context) { + default R process(Node node, @Nullable C context) { return node.accept(this, context); } - protected R visitNode(Node node, C context) { + default R visitNode(Node node, C context) { return null; } - protected R visitStatement(Statement node, C context) { + default R visitStatement(Statement node, C context) { return visitNode(node, context); } - protected R visitQuery(Query node, C context) { + default R visitQuery(Query node, C context) { return visitStatement(node, context); } - protected R visitExpression(Expression node, C context) { + default R visitExpression(Expression node, C context) { return visitNode(node, context); } - protected R visitArithmeticBinary(ArithmeticBinaryExpression node, C context) { + default R visitArithmeticBinary(ArithmeticBinaryExpression node, C context) { return visitExpression(node, context); } - protected R visitArithmeticUnary(ArithmeticUnaryExpression node, C context) { + default R visitArithmeticUnary(ArithmeticUnaryExpression node, C context) { return visitExpression(node, context); } - protected R visitBetweenPredicate(BetweenPredicate node, C context) { + default R visitBetweenPredicate(BetweenPredicate node, C context) { return visitExpression(node, context); } - protected R visitCast(Cast node, C context) { + default R visitCast(Cast node, C context) { return visitExpression(node, context); } - protected R visitExtract(Extract node, C context) { + default R visitExtract(Extract node, C context) { return visitExpression(node, context); } - protected R visitBooleanLiteral(BooleanLiteral node, C context) { + default R visitBooleanLiteral(BooleanLiteral node, C context) { return visitLiteral(node, context); } - protected R visitLiteral(Literal node, C context) { + default R visitLiteral(Literal node, C context) { return visitExpression(node, context); } - protected R visitBinaryLiteral(BinaryLiteral node, C context) { + default R visitBinaryLiteral(BinaryLiteral node, C context) { return visitLiteral(node, context); } - protected R visitStringLiteral(StringLiteral node, C context) { + default R visitStringLiteral(StringLiteral node, C context) { return visitLiteral(node, context); } - protected R visitLongLiteral(LongLiteral node, C context) { + default R visitLongLiteral(LongLiteral node, C context) { return visitLiteral(node, context); } - protected R visitDoubleLiteral(DoubleLiteral node, C context) { + default R visitDoubleLiteral(DoubleLiteral node, C context) { return visitLiteral(node, context); } - protected R visitFloatLiteral(FloatLiteral node, C context) { + default R visitFloatLiteral(FloatLiteral node, C context) { return visitLiteral(node, context); } - protected R visitDecimalLiteral(DecimalLiteral node, C context) { + default R visitDecimalLiteral(DecimalLiteral node, C context) { return visitLiteral(node, context); } - protected R visitGenericLiteral(GenericLiteral node, C context) { + default R visitGenericLiteral(GenericLiteral node, C context) { return visitLiteral(node, context); } - protected R visitNullLiteral(NullLiteral node, C context) { + default R visitNullLiteral(NullLiteral node, C context) { return visitLiteral(node, context); } - protected R visitCurrentDatabase(CurrentDatabase node, C context) { + default R visitCurrentDatabase(CurrentDatabase node, C context) { return visitExpression(node, context); } - protected R visitCurrentTime(CurrentTime node, C context) { + default R visitCurrentTime(CurrentTime node, C context) { return visitExpression(node, context); } - protected R visitCurrentUser(CurrentUser node, C context) { + default R visitCurrentUser(CurrentUser node, C context) { return visitExpression(node, context); } - protected R visitComparisonExpression(ComparisonExpression node, C context) { + default R visitComparisonExpression(ComparisonExpression node, C context) { return visitExpression(node, context); } - protected R visitCoalesceExpression(CoalesceExpression node, C context) { + default R visitCoalesceExpression(CoalesceExpression node, C context) { return visitExpression(node, context); } - protected R visitInPredicate(InPredicate node, C context) { + default R visitInPredicate(InPredicate node, C context) { return visitExpression(node, context); } - protected R visitNotExpression(NotExpression node, C context) { + default R visitNotExpression(NotExpression node, C context) { return visitExpression(node, context); } - protected R visitLikePredicate(LikePredicate node, C context) { + default R visitLikePredicate(LikePredicate node, C context) { return visitExpression(node, context); } - protected R visitIsNotNullPredicate(IsNotNullPredicate node, C context) { + default R visitIsNotNullPredicate(IsNotNullPredicate node, C context) { return visitExpression(node, context); } - protected R visitIsNullPredicate(IsNullPredicate node, C context) { + default R visitIsNullPredicate(IsNullPredicate node, C context) { return visitExpression(node, context); } - protected R visitLogicalExpression(LogicalExpression node, C context) { + default R visitLogicalExpression(LogicalExpression node, C context) { return visitExpression(node, context); } - protected R visitSymbolReference(SymbolReference node, C context) { + default R visitSymbolReference(SymbolReference node, C context) { return visitExpression(node, context); } - protected R visitSimpleCaseExpression(SimpleCaseExpression node, C context) { + default R visitSimpleCaseExpression(SimpleCaseExpression node, C context) { return visitExpression(node, context); } - protected R visitSearchedCaseExpression(SearchedCaseExpression node, C context) { + default R visitSearchedCaseExpression(SearchedCaseExpression node, C context) { return visitExpression(node, context); } - protected R visitFunctionCall(FunctionCall node, C context) { + default R visitFunctionCall(FunctionCall node, C context) { return visitExpression(node, context); } - protected R visitTrim(Trim node, C context) { + default R visitTrim(Trim node, C context) { return visitExpression(node, context); } - protected R visitIfExpression(IfExpression node, C context) { + default R visitIfExpression(IfExpression node, C context) { return visitExpression(node, context); } - protected R visitNullIfExpression(NullIfExpression node, C context) { + default R visitNullIfExpression(NullIfExpression node, C context) { return visitExpression(node, context); } - protected R visitDataType(DataType node, C context) { + default R visitDataType(DataType node, C context) { return visitExpression(node, context); } - protected R visitGenericDataType(GenericDataType node, C context) { + default R visitGenericDataType(GenericDataType node, C context) { return visitDataType(node, context); } - protected R visitFrameBound(FrameBound node, C context) { + default R visitFrameBound(FrameBound node, C context) { return visitNode(node, context); } - protected R visitWindowFrame(WindowFrame node, C context) { + default R visitWindowFrame(WindowFrame node, C context) { return visitNode(node, context); } - protected R visitRow(Row node, C context) { + default R visitRow(Row node, C context) { return visitExpression(node, context); } - protected R visitIdentifier(Identifier node, C context) { + default R visitIdentifier(Identifier node, C context) { return visitExpression(node, context); } - protected R visitDataTypeParameter(DataTypeParameter node, C context) { + default R visitDataTypeParameter(DataTypeParameter node, C context) { return visitNode(node, context); } - protected R visitNumericTypeParameter(NumericParameter node, C context) { + default R visitNumericTypeParameter(NumericParameter node, C context) { return visitDataTypeParameter(node, context); } - protected R visitInListExpression(InListExpression node, C context) { + default R visitInListExpression(InListExpression node, C context) { return visitExpression(node, context); } - protected R visitWhenClause(WhenClause node, C context) { + default R visitWhenClause(WhenClause node, C context) { return visitExpression(node, context); } - protected R visitFieldReference(FieldReference node, C context) { + default R visitFieldReference(FieldReference node, C context) { return visitExpression(node, context); } - protected R visitGroupingElement(GroupingElement node, C context) { + default R visitGroupingElement(GroupingElement node, C context) { return visitNode(node, context); } - protected R visitGroupingSets(GroupingSets node, C context) { + default R visitGroupingSets(GroupingSets node, C context) { return visitGroupingElement(node, context); } - protected R visitDereferenceExpression(DereferenceExpression node, C context) { + default R visitDereferenceExpression(DereferenceExpression node, C context) { return visitExpression(node, context); } - protected R visitExists(ExistsPredicate node, C context) { + default R visitExists(ExistsPredicate node, C context) { return visitExpression(node, context); } - protected R visitColumns(Columns node, C context) { + default R visitColumns(Columns node, C context) { return visitExpression(node, context); } - protected R visitAllRows(AllRows node, C context) { + default R visitAllRows(AllRows node, C context) { return visitExpression(node, context); } - protected R visitAllColumns(AllColumns node, C context) { + default R visitAllColumns(AllColumns node, C context) { return visitSelectItem(node, context); } - protected R visitSelectItem(SelectItem node, C context) { + default R visitSelectItem(SelectItem node, C context) { return visitNode(node, context); } - protected R visitOrderBy(OrderBy node, C context) { + default R visitOrderBy(OrderBy node, C context) { return visitNode(node, context); } - protected R visitParameter(Parameter node, C context) { + default R visitParameter(Parameter node, C context) { return visitExpression(node, context); } - protected R visitGroupBy(GroupBy node, C context) { + default R visitGroupBy(GroupBy node, C context) { return visitNode(node, context); } - protected R visitSimpleGroupBy(SimpleGroupBy node, C context) { + default R visitSimpleGroupBy(SimpleGroupBy node, C context) { return visitGroupingElement(node, context); } - protected R visitQuantifiedComparisonExpression(QuantifiedComparisonExpression node, C context) { + default R visitQuantifiedComparisonExpression(QuantifiedComparisonExpression node, C context) { return visitExpression(node, context); } - protected R visitSubqueryExpression(SubqueryExpression node, C context) { + default R visitSubqueryExpression(SubqueryExpression node, C context) { throw new SemanticException("Only TableSubquery is supported now"); } - protected R visitSortItem(SortItem node, C context) { + default R visitSortItem(SortItem node, C context) { return visitNode(node, context); } - protected R visitWindowReference(WindowReference node, C context) { + default R visitWindowReference(WindowReference node, C context) { return visitNode(node, context); } - protected R visitWindowSpecification(WindowSpecification node, C context) { + default R visitWindowSpecification(WindowSpecification node, C context) { return visitNode(node, context); } - protected R visitTypeParameter(TypeParameter node, C context) { + default R visitTypeParameter(TypeParameter node, C context) { return visitDataTypeParameter(node, context); } - protected R visitValues(Values node, C context) { + default R visitValues(Values node, C context) { return visitQueryBody(node, context); } - protected R visitQueryBody(QueryBody node, C context) { + default R visitQueryBody(QueryBody node, C context) { return visitRelation(node, context); } - protected R visitTableSubquery(TableSubquery node, C context) { + default R visitTableSubquery(TableSubquery node, C context) { return visitQueryBody(node, context); } - protected R visitRelation(Relation node, C context) { + default R visitRelation(Relation node, C context) { return visitNode(node, context); } - protected R visitAliasedRelation(AliasedRelation node, C context) { + default R visitAliasedRelation(AliasedRelation node, C context) { return visitRelation(node, context); } - protected R visitJoin(Join node, C context) { + default R visitJoin(Join node, C context) { return visitRelation(node, context); } - protected R visitSingleColumn(SingleColumn node, C context) { + default R visitSingleColumn(SingleColumn node, C context) { return visitSelectItem(node, context); } - protected R visitProcessingMode(ProcessingMode node, C context) { + default R visitProcessingMode(ProcessingMode node, C context) { return visitNode(node, context); } - protected R visitWithQuery(WithQuery node, C context) { + default R visitWithQuery(WithQuery node, C context) { return visitNode(node, context); } - protected R visitWith(With node, C context) { + default R visitWith(With node, C context) { return visitNode(node, context); } - protected R visitFill(Fill node, C context) { + default R visitFill(Fill node, C context) { return visitNode(node, context); } - protected R visitOffset(Offset node, C context) { + default R visitOffset(Offset node, C context) { return visitNode(node, context); } - protected R visitLimit(Limit node, C context) { + default R visitLimit(Limit node, C context) { return visitNode(node, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StackableAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StackableAstVisitor.java index 14d5c785a7989..53a5671ee0923 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StackableAstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StackableAstVisitor.java @@ -25,7 +25,7 @@ import java.util.Optional; public class StackableAstVisitor - extends AstVisitor> { + implements AstVisitor> { @Override public R process(Node node, StackableAstVisitorContext context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java index 23360e55a72ae..4da7aa0b3c7f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java @@ -116,7 +116,7 @@ public static String formatExpression(Expression expression) { return new Formatter(Optional.empty(), Optional.empty()).process(expression, null); } - public static class Formatter extends CommonQueryAstVisitor { + public static class Formatter implements CommonQueryAstVisitor { private final Optional> literalFormatter; private final Optional> symbolReferenceFormatter; @@ -129,19 +129,19 @@ public Formatter( } @Override - protected String visitNode(Node node, Void context) { + public String visitNode(Node node, Void context) { throw new UnsupportedOperationException(); } @Override - protected String visitRow(Row node, Void context) { + public String visitRow(Row node, Void context) { return node.getItems().stream() .map(child -> process(child, context)) .collect(joining(", ", "ROW (", ")")); } @Override - protected String visitExpression(Expression node, Void context) { + public String visitExpression(Expression node, Void context) { throw new UnsupportedOperationException( String.format( "not yet implemented: %s.visit%s", @@ -149,17 +149,17 @@ protected String visitExpression(Expression node, Void context) { } @Override - protected String visitCurrentDatabase(CurrentDatabase node, Void context) { + public String visitCurrentDatabase(CurrentDatabase node, Void context) { return "CURRENT_DATABASE"; } @Override - protected String visitCurrentUser(CurrentUser node, Void context) { + public String visitCurrentUser(CurrentUser node, Void context) { return "CURRENT_USER"; } @Override - protected String visitTrim(Trim node, Void context) { + public String visitTrim(Trim node, Void context) { if (!node.getTrimCharacter().isPresent()) { return String.format( "trim(%s FROM %s)", node.getSpecification(), process(node.getTrimSource(), context)); @@ -173,7 +173,7 @@ protected String visitTrim(Trim node, Void context) { } @Override - protected String visitCurrentTime(CurrentTime node, Void context) { + public String visitCurrentTime(CurrentTime node, Void context) { StringBuilder builder = new StringBuilder(); builder.append(node.getFunction().getName()); @@ -186,48 +186,48 @@ protected String visitCurrentTime(CurrentTime node, Void context) { } @Override - protected String visitExtract(Extract node, Void context) { + public String visitExtract(Extract node, Void context) { return "EXTRACT(" + node.getField() + " FROM " + process(node.getExpression(), context) + ")"; } @Override - protected String visitBooleanLiteral(BooleanLiteral node, Void context) { + public String visitBooleanLiteral(BooleanLiteral node, Void context) { return literalFormatter .map(formatter -> formatter.apply(node)) .orElseGet(() -> String.valueOf(node.getValue())); } @Override - protected String visitStringLiteral(StringLiteral node, Void context) { + public String visitStringLiteral(StringLiteral node, Void context) { return literalFormatter .map(formatter -> formatter.apply(node)) .orElseGet(() -> formatStringLiteral(node.getValue())); } @Override - protected String visitBinaryLiteral(BinaryLiteral node, Void context) { + public String visitBinaryLiteral(BinaryLiteral node, Void context) { return literalFormatter .map(formatter -> formatter.apply(node)) .orElseGet(() -> "X'" + node.toHexString() + "'"); } @Override - protected String visitParameter(Parameter node, Void context) { + public String visitParameter(Parameter node, Void context) { return "?"; } @Override - protected String visitAllRows(AllRows node, Void context) { + public String visitAllRows(AllRows node, Void context) { return "ALL"; } @Override - protected String visitLongLiteral(LongLiteral node, Void context) { + public String visitLongLiteral(LongLiteral node, Void context) { return literalFormatter.map(formatter -> formatter.apply(node)).orElseGet(node::getValue); } @Override - protected String visitDoubleLiteral(DoubleLiteral node, Void context) { + public String visitDoubleLiteral(DoubleLiteral node, Void context) { return literalFormatter .map(formatter -> formatter.apply(node)) .orElseGet(() -> doubleFormatter.get().format(node.getValue())); @@ -235,14 +235,14 @@ protected String visitDoubleLiteral(DoubleLiteral node, Void context) { // do not use doubleFormatter, to prevent from introducing the precision noise @Override - protected String visitFloatLiteral(FloatLiteral node, Void context) { + public String visitFloatLiteral(FloatLiteral node, Void context) { return literalFormatter .map(formatter -> formatter.apply(node)) .orElseGet(() -> String.valueOf(node.getValue())); } @Override - protected String visitDecimalLiteral(DecimalLiteral node, Void context) { + public String visitDecimalLiteral(DecimalLiteral node, Void context) { return literalFormatter .map(formatter -> formatter.apply(node)) // TODO return node value without "DECIMAL '..'" when @@ -251,29 +251,29 @@ protected String visitDecimalLiteral(DecimalLiteral node, Void context) { } @Override - protected String visitGenericLiteral(GenericLiteral node, Void context) { + public String visitGenericLiteral(GenericLiteral node, Void context) { return literalFormatter .map(formatter -> formatter.apply(node)) .orElseGet(() -> node.getType() + " " + formatStringLiteral(node.getValue())); } @Override - protected String visitNullLiteral(NullLiteral node, Void context) { + public String visitNullLiteral(NullLiteral node, Void context) { return literalFormatter.map(formatter -> formatter.apply(node)).orElse("null"); } @Override - protected String visitSubqueryExpression(SubqueryExpression node, Void context) { + public String visitSubqueryExpression(SubqueryExpression node, Void context) { return "(" + formatSql(node.getQuery()) + ")"; } @Override - protected String visitExists(ExistsPredicate node, Void context) { + public String visitExists(ExistsPredicate node, Void context) { return "(EXISTS " + formatSql(node.getSubquery()) + ")"; } @Override - protected String visitIdentifier(Identifier node, Void context) { + public String visitIdentifier(Identifier node, Void context) { if (node.isDelimited() || reserved(node.getValue())) { return '"' + node.getValue().replace("\"", "\"\"") + '"'; } @@ -281,7 +281,7 @@ protected String visitIdentifier(Identifier node, Void context) { } @Override - protected String visitSymbolReference(SymbolReference node, Void context) { + public String visitSymbolReference(SymbolReference node, Void context) { if (symbolReferenceFormatter.isPresent()) { return symbolReferenceFormatter.get().apply(node); } @@ -293,7 +293,7 @@ private String formatIdentifier(String s) { } @Override - protected String visitDereferenceExpression(DereferenceExpression node, Void context) { + public String visitDereferenceExpression(DereferenceExpression node, Void context) { String baseString = process(node.getBase(), context); return baseString + "." + node.getField().map(this::process).orElse("*"); } @@ -305,7 +305,7 @@ public String visitFieldReference(FieldReference node, Void context) { } @Override - protected String visitFunctionCall(FunctionCall node, Void context) { + public String visitFunctionCall(FunctionCall node, Void context) { if (QualifiedName.of("LISTAGG").equals(node.getName())) { return visitListagg(node); } @@ -345,7 +345,7 @@ protected String visitFunctionCall(FunctionCall node, Void context) { } @Override - protected String visitLogicalExpression(LogicalExpression node, Void context) { + public String visitLogicalExpression(LogicalExpression node, Void context) { return "(" + node.getTerms().stream() .map(term -> process(term, context)) @@ -354,27 +354,27 @@ protected String visitLogicalExpression(LogicalExpression node, Void context) { } @Override - protected String visitNotExpression(NotExpression node, Void context) { + public String visitNotExpression(NotExpression node, Void context) { return "(NOT " + process(node.getValue(), context) + ")"; } @Override - protected String visitComparisonExpression(ComparisonExpression node, Void context) { + public String visitComparisonExpression(ComparisonExpression node, Void context) { return formatBinaryExpression(node.getOperator().getValue(), node.getLeft(), node.getRight()); } @Override - protected String visitIsNullPredicate(IsNullPredicate node, Void context) { + public String visitIsNullPredicate(IsNullPredicate node, Void context) { return "(" + process(node.getValue(), context) + " IS NULL)"; } @Override - protected String visitIsNotNullPredicate(IsNotNullPredicate node, Void context) { + public String visitIsNotNullPredicate(IsNotNullPredicate node, Void context) { return "(" + process(node.getValue(), context) + " IS NOT NULL)"; } @Override - protected String visitNullIfExpression(NullIfExpression node, Void context) { + public String visitNullIfExpression(NullIfExpression node, Void context) { return "NULLIF(" + process(node.getFirst(), context) + ", " @@ -383,7 +383,7 @@ protected String visitNullIfExpression(NullIfExpression node, Void context) { } @Override - protected String visitIfExpression(IfExpression node, Void context) { + public String visitIfExpression(IfExpression node, Void context) { StringBuilder builder = new StringBuilder(); builder .append("IF(") @@ -397,12 +397,12 @@ protected String visitIfExpression(IfExpression node, Void context) { } @Override - protected String visitCoalesceExpression(CoalesceExpression node, Void context) { + public String visitCoalesceExpression(CoalesceExpression node, Void context) { return "COALESCE(" + joinExpressions(node.getOperands()) + ")"; } @Override - protected String visitArithmeticUnary(ArithmeticUnaryExpression node, Void context) { + public String visitArithmeticUnary(ArithmeticUnaryExpression node, Void context) { String value = process(node.getValue(), context); switch (node.getSign()) { @@ -419,12 +419,12 @@ protected String visitArithmeticUnary(ArithmeticUnaryExpression node, Void conte } @Override - protected String visitArithmeticBinary(ArithmeticBinaryExpression node, Void context) { + public String visitArithmeticBinary(ArithmeticBinaryExpression node, Void context) { return formatBinaryExpression(node.getOperator().getValue(), node.getLeft(), node.getRight()); } @Override - protected String visitLikePredicate(LikePredicate node, Void context) { + public String visitLikePredicate(LikePredicate node, Void context) { StringBuilder builder = new StringBuilder(); builder @@ -442,7 +442,7 @@ protected String visitLikePredicate(LikePredicate node, Void context) { } @Override - protected String visitAllColumns(AllColumns node, Void context) { + public String visitAllColumns(AllColumns node, Void context) { StringBuilder builder = new StringBuilder(); if (node.getTarget().isPresent()) { builder.append(process(node.getTarget().get(), context)); @@ -474,7 +474,7 @@ public String visitCast(Cast node, Void context) { } @Override - protected String visitSearchedCaseExpression(SearchedCaseExpression node, Void context) { + public String visitSearchedCaseExpression(SearchedCaseExpression node, Void context) { ImmutableList.Builder parts = ImmutableList.builder(); parts.add("CASE"); for (WhenClause whenClause : node.getWhenClauses()) { @@ -489,7 +489,7 @@ protected String visitSearchedCaseExpression(SearchedCaseExpression node, Void c } @Override - protected String visitSimpleCaseExpression(SimpleCaseExpression node, Void context) { + public String visitSimpleCaseExpression(SimpleCaseExpression node, Void context) { ImmutableList.Builder parts = ImmutableList.builder(); parts.add("CASE").add(process(node.getOperand(), context)); @@ -506,7 +506,7 @@ protected String visitSimpleCaseExpression(SimpleCaseExpression node, Void conte } @Override - protected String visitWhenClause(WhenClause node, Void context) { + public String visitWhenClause(WhenClause node, Void context) { return "WHEN " + process(node.getOperand(), context) + " THEN " @@ -514,7 +514,7 @@ protected String visitWhenClause(WhenClause node, Void context) { } @Override - protected String visitBetweenPredicate(BetweenPredicate node, Void context) { + public String visitBetweenPredicate(BetweenPredicate node, Void context) { return "(" + process(node.getValue(), context) + " BETWEEN " @@ -525,7 +525,7 @@ protected String visitBetweenPredicate(BetweenPredicate node, Void context) { } @Override - protected String visitInPredicate(InPredicate node, Void context) { + public String visitInPredicate(InPredicate node, Void context) { return "(" + process(node.getValue(), context) + " IN " @@ -534,12 +534,12 @@ protected String visitInPredicate(InPredicate node, Void context) { } @Override - protected String visitInListExpression(InListExpression node, Void context) { + public String visitInListExpression(InListExpression node, Void context) { return "(" + joinExpressions(node.getValues()) + ")"; } @Override - protected String visitQuantifiedComparisonExpression( + public String visitQuantifiedComparisonExpression( QuantifiedComparisonExpression node, Void context) { return String.format( "(%s %s %s %s)", @@ -550,7 +550,7 @@ protected String visitQuantifiedComparisonExpression( } @Override - protected String visitGenericDataType(GenericDataType node, Void context) { + public String visitGenericDataType(GenericDataType node, Void context) { StringBuilder result = new StringBuilder(); result.append(node.getName()); @@ -563,17 +563,17 @@ protected String visitGenericDataType(GenericDataType node, Void context) { } @Override - protected String visitTypeParameter(TypeParameter node, Void context) { + public String visitTypeParameter(TypeParameter node, Void context) { return process(node.getValue(), context); } @Override - protected String visitNumericTypeParameter(NumericParameter node, Void context) { + public String visitNumericTypeParameter(NumericParameter node, Void context) { return node.getValue(); } @Override - protected String visitColumns(Columns node, Void context) { + public String visitColumns(Columns node, Void context) { return "COLUMNS(" + (node.isColumnsAsterisk() ? "*" : node.getPattern()) + ")"; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java index dc7b40877ee0f..e7481fdda8ee9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java @@ -27,7 +27,7 @@ import java.util.Optional; public class PipeStatementTablePatternParseVisitor - extends AstVisitor, TablePattern> { + implements AstVisitor, TablePattern> { @Override public Optional visitCreateOrUpdateDevice( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java index 9767fdf79db7f..5efef9e616693 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java @@ -26,7 +26,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateOrUpdateDevice; -public class PipeTableStatementToPlanVisitor extends AstVisitor { +public class PipeTableStatementToPlanVisitor implements AstVisitor { @Override public PlanNode visitNode(final Node node, final Void context) { throw new UnsupportedOperationException( 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 d5b1d177b3e8e..9d584c1188482 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 @@ -287,7 +287,7 @@ import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask.TTL_KEY; import static org.apache.tsfile.common.constant.TsFileConstant.PATH_SEPARATOR; -public class TableConfigTaskVisitor extends AstVisitor { +public class TableConfigTaskVisitor implements AstVisitor { public static final String DATABASE_NOT_SPECIFIED = "database is not specified"; @@ -311,20 +311,20 @@ public TableConfigTaskVisitor( } @Override - protected IConfigTask visitNode(final Node node, final MPPQueryContext context) { + public IConfigTask visitNode(final Node node, final MPPQueryContext context) { throw new UnsupportedOperationException( "Unsupported statement type: " + node.getClass().getName()); } @Override - protected IConfigTask visitCreateDB(final CreateDB node, final MPPQueryContext context) { + public IConfigTask visitCreateDB(final CreateDB node, final MPPQueryContext context) { accessControl.checkCanCreateDatabase( context.getSession().getUserName(), node.getDbName(), context); return visitDatabaseStatement(node, context); } @Override - protected IConfigTask visitAlterDB(final AlterDB node, final MPPQueryContext context) { + public IConfigTask visitAlterDB(final AlterDB node, final MPPQueryContext context) { accessControl.checkCanAlterDatabase( context.getSession().getUserName(), node.getDbName(), context); return visitDatabaseStatement(node, context); @@ -398,7 +398,7 @@ private IConfigTask visitDatabaseStatement( } @Override - protected IConfigTask visitUse(final Use node, final MPPQueryContext context) { + public IConfigTask visitUse(final Use node, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkCanShowOrUseDatabase( context.getSession().getUserName(), node.getDatabaseId().getValue(), context); @@ -406,7 +406,7 @@ protected IConfigTask visitUse(final Use node, final MPPQueryContext context) { } @Override - protected IConfigTask visitDropDB(final DropDB node, final MPPQueryContext context) { + public IConfigTask visitDropDB(final DropDB node, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkCanDropDatabase( context.getSession().getUserName(), node.getDbName().getValue(), context); @@ -414,7 +414,7 @@ protected IConfigTask visitDropDB(final DropDB node, final MPPQueryContext conte } @Override - protected IConfigTask visitShowDB(final ShowDB node, final MPPQueryContext context) { + public IConfigTask visitShowDB(final ShowDB node, final MPPQueryContext context) { context.setQueryType(QueryType.READ); return new ShowDBTask( node, @@ -436,7 +436,7 @@ public static boolean canShowDB( } @Override - protected IConfigTask visitShowCluster( + public IConfigTask visitShowCluster( final ShowCluster showCluster, final MPPQueryContext context) { context.setQueryType(QueryType.READ); accessControl.checkUserGlobalSysPrivilege(context); @@ -448,7 +448,7 @@ protected IConfigTask visitShowCluster( } @Override - protected IConfigTask visitShowRegions( + public IConfigTask visitShowRegions( final ShowRegions showRegions, final MPPQueryContext context) { context.setQueryType(QueryType.READ); accessControl.checkUserGlobalSysPrivilege(context); @@ -465,7 +465,7 @@ protected IConfigTask visitShowRegions( } @Override - protected IConfigTask visitRemoveDataNode( + public IConfigTask visitRemoveDataNode( final RemoveDataNode removeDataNode, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); @@ -477,7 +477,7 @@ protected IConfigTask visitRemoveDataNode( } @Override - protected IConfigTask visitRemoveConfigNode( + public IConfigTask visitRemoveConfigNode( final RemoveConfigNode removeConfigNode, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); @@ -489,7 +489,7 @@ protected IConfigTask visitRemoveConfigNode( } @Override - protected IConfigTask visitRemoveAINode( + public IConfigTask visitRemoveAINode( final RemoveAINode removeAINode, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); @@ -499,7 +499,7 @@ protected IConfigTask visitRemoveAINode( } @Override - protected IConfigTask visitShowDataNodes( + public IConfigTask visitShowDataNodes( final ShowDataNodes showDataNodesStatement, final MPPQueryContext context) { context.setQueryType(QueryType.READ); accessControl.checkUserGlobalSysPrivilege(context); @@ -507,7 +507,7 @@ protected IConfigTask visitShowDataNodes( } @Override - protected IConfigTask visitShowAvailableUrls( + public IConfigTask visitShowAvailableUrls( final ShowAvailableUrls showAvailableUrls, final MPPQueryContext context) { context.setQueryType(QueryType.READ); DNAuditLogger.getInstance() @@ -517,7 +517,7 @@ protected IConfigTask visitShowAvailableUrls( } @Override - protected IConfigTask visitShowConfigNodes( + public IConfigTask visitShowConfigNodes( final ShowConfigNodes showConfigNodesStatement, final MPPQueryContext context) { context.setQueryType(QueryType.READ); accessControl.checkUserGlobalSysPrivilege(context); @@ -525,7 +525,7 @@ protected IConfigTask visitShowConfigNodes( } @Override - protected IConfigTask visitShowAINodes( + public IConfigTask visitShowAINodes( final ShowAINodes showAINodesStatement, final MPPQueryContext context) { context.setQueryType(QueryType.READ); accessControl.checkUserGlobalSysPrivilege(context); @@ -533,7 +533,7 @@ protected IConfigTask visitShowAINodes( } @Override - protected IConfigTask visitClearCache( + public IConfigTask visitClearCache( final ClearCache clearCacheStatement, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); @@ -541,14 +541,14 @@ protected IConfigTask visitClearCache( } @Override - protected IConfigTask visitCreateTable(final CreateTable node, final MPPQueryContext context) { + public IConfigTask visitCreateTable(final CreateTable node, final MPPQueryContext context) { final Pair databaseTablePair = parseTable4CreateTableOrView(node, context); return new CreateTableTask( databaseTablePair.getRight(), databaseTablePair.getLeft(), node.isIfNotExists()); } @Override - protected IConfigTask visitCreateView(final CreateView node, final MPPQueryContext context) { + public IConfigTask visitCreateView(final CreateView node, final MPPQueryContext context) { final Pair databaseTablePair = parseTable4CreateTableOrView(node, context); final TsTable table = databaseTablePair.getRight(); accessControl.checkCanCreateViewFromTreePath(node.getPrefixPath(), context); @@ -664,8 +664,7 @@ private void validateAndGenerateTimeColumn( } @Override - protected IConfigTask visitAlterColumnDataType( - AlterColumnDataType node, MPPQueryContext context) { + public IConfigTask visitAlterColumnDataType(AlterColumnDataType node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); final Pair databaseTablePair = splitQualifiedName(node.getTableName()); final String columnName = node.getColumnName().getValue(); @@ -688,7 +687,7 @@ protected IConfigTask visitAlterColumnDataType( } @Override - protected IConfigTask visitRenameTable(final RenameTable node, final MPPQueryContext context) { + public IConfigTask visitRenameTable(final RenameTable node, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); final Pair databaseTablePair = splitQualifiedName(node.getSource()); final String database = databaseTablePair.getLeft(); @@ -712,7 +711,7 @@ protected IConfigTask visitRenameTable(final RenameTable node, final MPPQueryCon } @Override - protected IConfigTask visitAddColumn(final AddColumn node, final MPPQueryContext context) { + public IConfigTask visitAddColumn(final AddColumn node, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); final Pair databaseTablePair = splitQualifiedName(node.getTableName()); final String database = databaseTablePair.getLeft(); @@ -745,7 +744,7 @@ protected IConfigTask visitAddColumn(final AddColumn node, final MPPQueryContext } @Override - protected IConfigTask visitRenameColumn(final RenameColumn node, final MPPQueryContext context) { + public IConfigTask visitRenameColumn(final RenameColumn node, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); final Pair databaseTablePair = splitQualifiedName(node.getTable()); final String database = databaseTablePair.getLeft(); @@ -772,7 +771,7 @@ protected IConfigTask visitRenameColumn(final RenameColumn node, final MPPQueryC } @Override - protected IConfigTask visitDropColumn(final DropColumn node, final MPPQueryContext context) { + public IConfigTask visitDropColumn(final DropColumn node, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); final Pair databaseTablePair = splitQualifiedName(node.getTable()); final String database = databaseTablePair.getLeft(); @@ -792,8 +791,7 @@ protected IConfigTask visitDropColumn(final DropColumn node, final MPPQueryConte } @Override - protected IConfigTask visitSetProperties( - final SetProperties node, final MPPQueryContext context) { + public IConfigTask visitSetProperties(final SetProperties node, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); final Pair databaseTablePair = splitQualifiedName(node.getName()); final String database = databaseTablePair.getLeft(); @@ -812,7 +810,7 @@ protected IConfigTask visitSetProperties( } @Override - protected IConfigTask visitSetTableComment( + public IConfigTask visitSetTableComment( final SetTableComment node, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); final Pair databaseTablePair = splitQualifiedName(node.getTableName()); @@ -832,7 +830,7 @@ protected IConfigTask visitSetTableComment( } @Override - protected IConfigTask visitSetColumnComment( + public IConfigTask visitSetColumnComment( final SetColumnComment node, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); final Pair databaseTablePair = splitQualifiedName(node.getTable()); @@ -919,7 +917,7 @@ private TSDataType getDataType(final DataType dataType) { } @Override - protected IConfigTask visitDropTable(final DropTable node, final MPPQueryContext context) { + public IConfigTask visitDropTable(final DropTable node, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); final Pair databaseTablePair = splitQualifiedName(node.getTableName()); final String database = databaseTablePair.getLeft(); @@ -933,7 +931,7 @@ protected IConfigTask visitDropTable(final DropTable node, final MPPQueryContext } @Override - protected IConfigTask visitDeleteDevice(final DeleteDevice node, final MPPQueryContext context) { + public IConfigTask visitDeleteDevice(final DeleteDevice node, final MPPQueryContext context) { new Analyzer( context, context.getSession(), @@ -952,7 +950,7 @@ protected IConfigTask visitDeleteDevice(final DeleteDevice node, final MPPQueryC } @Override - protected IConfigTask visitShowTables(final ShowTables node, final MPPQueryContext context) { + public IConfigTask visitShowTables(final ShowTables node, final MPPQueryContext context) { context.setQueryType(QueryType.READ); String database = clientSession.getDatabaseName(); if (node.getDbName().isPresent()) { @@ -991,8 +989,7 @@ public static boolean canShowTable( } @Override - protected IConfigTask visitDescribeTable( - final DescribeTable node, final MPPQueryContext context) { + public IConfigTask visitDescribeTable(final DescribeTable node, final MPPQueryContext context) { context.setQueryType(QueryType.READ); final Pair databaseTablePair = splitQualifiedName(node.getTable()); final String database = databaseTablePair.getLeft(); @@ -1012,14 +1009,14 @@ protected IConfigTask visitDescribeTable( } @Override - protected IConfigTask visitFlush(final Flush node, final MPPQueryContext context) { + public IConfigTask visitFlush(final Flush node, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new FlushTask(((FlushStatement) node.getInnerTreeStatement())); } @Override - protected IConfigTask visitSetConfiguration(SetConfiguration node, MPPQueryContext context) { + public IConfigTask visitSetConfiguration(SetConfiguration node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); SetConfigurationStatement setConfigurationStatement = (SetConfigurationStatement) node.getInnerTreeStatement(); @@ -1036,7 +1033,7 @@ protected IConfigTask visitSetConfiguration(SetConfiguration node, MPPQueryConte } @Override - protected IConfigTask visitShowConfiguration(ShowConfiguration node, MPPQueryContext context) { + public IConfigTask visitShowConfiguration(ShowConfiguration node, MPPQueryContext context) { context.setQueryType(QueryType.READ); ShowConfigurationStatement showConfigurationStatement = (ShowConfigurationStatement) node.getInnerTreeStatement(); @@ -1049,28 +1046,28 @@ protected IConfigTask visitShowConfiguration(ShowConfiguration node, MPPQueryCon } @Override - protected IConfigTask visitStartRepairData(StartRepairData node, MPPQueryContext context) { + public IConfigTask visitStartRepairData(StartRepairData node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new StartRepairDataTask(((StartRepairDataStatement) node.getInnerTreeStatement())); } @Override - protected IConfigTask visitStopRepairData(StopRepairData node, MPPQueryContext context) { + public IConfigTask visitStopRepairData(StopRepairData node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new StopRepairDataTask(((StopRepairDataStatement) node.getInnerTreeStatement())); } @Override - protected IConfigTask visitLoadConfiguration(LoadConfiguration node, MPPQueryContext context) { + public IConfigTask visitLoadConfiguration(LoadConfiguration node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserIsAdmin(context.getSession().getUserEntity()); return new LoadConfigurationTask(((LoadConfigurationStatement) node.getInnerTreeStatement())); } @Override - protected IConfigTask visitSetSystemStatus(SetSystemStatus node, MPPQueryContext context) { + public IConfigTask visitSetSystemStatus(SetSystemStatus node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new SetSystemStatusTask(((SetSystemStatusStatement) node.getInnerTreeStatement())); @@ -1121,7 +1118,7 @@ private int parseIntFromLiteral(final Object value, final String name) { } @Override - protected IConfigTask visitCreatePipe(final CreatePipe node, final MPPQueryContext context) { + public IConfigTask visitCreatePipe(final CreatePipe node, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); @@ -1268,7 +1265,7 @@ public static void checkAndEnrichSinkUser( } @Override - protected IConfigTask visitAlterPipe(final AlterPipe node, final MPPQueryContext context) { + public IConfigTask visitAlterPipe(final AlterPipe node, final MPPQueryContext context) { context.setQueryType(QueryType.WRITE); final String userName = context.getSession().getUserName(); @@ -1315,34 +1312,34 @@ protected IConfigTask visitAlterPipe(final AlterPipe node, final MPPQueryContext } @Override - protected IConfigTask visitDropPipe(DropPipe node, MPPQueryContext context) { + public IConfigTask visitDropPipe(DropPipe node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new DropPipeTask(node); } @Override - protected IConfigTask visitStartPipe(StartPipe node, MPPQueryContext context) { + public IConfigTask visitStartPipe(StartPipe node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new StartPipeTask(node); } @Override - protected IConfigTask visitStopPipe(StopPipe node, MPPQueryContext context) { + public IConfigTask visitStopPipe(StopPipe node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new StopPipeTask(node); } @Override - protected IConfigTask visitShowPipes(ShowPipes node, MPPQueryContext context) { + public IConfigTask visitShowPipes(ShowPipes node, MPPQueryContext context) { context.setQueryType(QueryType.READ); return new ShowPipeTask(node, context.getSession().getUserName()); } @Override - protected IConfigTask visitCreatePipePlugin(CreatePipePlugin node, MPPQueryContext context) { + public IConfigTask visitCreatePipePlugin(CreatePipePlugin node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); if (node.getUriString() != null && isUriTrusted(node.getUriString())) { @@ -1356,21 +1353,21 @@ protected IConfigTask visitCreatePipePlugin(CreatePipePlugin node, MPPQueryConte } @Override - protected IConfigTask visitDropPipePlugin(DropPipePlugin node, MPPQueryContext context) { + public IConfigTask visitDropPipePlugin(DropPipePlugin node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new DropPipePluginTask(node); } @Override - protected IConfigTask visitShowPipePlugins(ShowPipePlugins node, MPPQueryContext context) { + public IConfigTask visitShowPipePlugins(ShowPipePlugins node, MPPQueryContext context) { context.setQueryType(QueryType.READ); accessControl.checkUserGlobalSysPrivilege(context); return new ShowPipePluginsTask(node); } @Override - protected IConfigTask visitCreateTopic(CreateTopic node, MPPQueryContext context) { + public IConfigTask visitCreateTopic(CreateTopic node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); @@ -1382,100 +1379,98 @@ protected IConfigTask visitCreateTopic(CreateTopic node, MPPQueryContext context } @Override - protected IConfigTask visitDropTopic(DropTopic node, MPPQueryContext context) { + public IConfigTask visitDropTopic(DropTopic node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new DropTopicTask(node); } @Override - protected IConfigTask visitShowTopics(ShowTopics node, MPPQueryContext context) { + public IConfigTask visitShowTopics(ShowTopics node, MPPQueryContext context) { context.setQueryType(QueryType.READ); accessControl.checkUserGlobalSysPrivilege(context); return new ShowTopicsTask(node); } @Override - protected IConfigTask visitShowSubscriptions(ShowSubscriptions node, MPPQueryContext context) { + public IConfigTask visitShowSubscriptions(ShowSubscriptions node, MPPQueryContext context) { context.setQueryType(QueryType.READ); accessControl.checkUserGlobalSysPrivilege(context); return new ShowSubscriptionsTask(node); } @Override - protected IConfigTask visitDropSubscription(DropSubscription node, MPPQueryContext context) { + public IConfigTask visitDropSubscription(DropSubscription node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new DropSubscriptionTask(node); } @Override - protected IConfigTask visitShowCurrentUser(ShowCurrentUser node, MPPQueryContext context) { + public IConfigTask visitShowCurrentUser(ShowCurrentUser node, MPPQueryContext context) { context.setQueryType(QueryType.READ); return new ShowCurrentUserTask(context.getSession().getUserName()); } @Override - protected IConfigTask visitShowCurrentSqlDialect( + public IConfigTask visitShowCurrentSqlDialect( ShowCurrentSqlDialect node, MPPQueryContext context) { context.setQueryType(QueryType.READ); return new ShowCurrentSqlDialectTask(context.getSession().getSqlDialect().name()); } @Override - protected IConfigTask visitSetSqlDialect(SetSqlDialect node, MPPQueryContext context) { + public IConfigTask visitSetSqlDialect(SetSqlDialect node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); return new SetSqlDialectTask(node.getSqlDialect()); } @Override - protected IConfigTask visitPrepare(Prepare node, MPPQueryContext context) { + public IConfigTask visitPrepare(Prepare node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); return new PrepareTask(node.getStatementName().getValue(), node.getSql()); } @Override - protected IConfigTask visitDeallocate(Deallocate node, MPPQueryContext context) { + public IConfigTask visitDeallocate(Deallocate node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); return new DeallocateTask(node.getStatementName().getValue()); } @Override - protected IConfigTask visitShowCurrentDatabase( - ShowCurrentDatabase node, MPPQueryContext context) { + public IConfigTask visitShowCurrentDatabase(ShowCurrentDatabase node, MPPQueryContext context) { context.setQueryType(QueryType.READ); return new ShowCurrentDatabaseTask(context.getSession().getDatabaseName().orElse(null)); } @Override - protected IConfigTask visitShowVersion(ShowVersion node, MPPQueryContext context) { + public IConfigTask visitShowVersion(ShowVersion node, MPPQueryContext context) { context.setQueryType(QueryType.READ); return new ShowVersionTask(); } @Override - protected IConfigTask visitShowVariables(ShowVariables node, MPPQueryContext context) { + public IConfigTask visitShowVariables(ShowVariables node, MPPQueryContext context) { context.setQueryType(QueryType.READ); accessControl.checkUserGlobalSysPrivilege(context); return new ShowVariablesTask(); } @Override - protected IConfigTask visitShowClusterId(ShowClusterId node, MPPQueryContext context) { + public IConfigTask visitShowClusterId(ShowClusterId node, MPPQueryContext context) { context.setQueryType(QueryType.READ); accessControl.checkUserGlobalSysPrivilege(context); return new ShowClusterIdTask(); } @Override - protected IConfigTask visitShowCurrentTimestamp( - ShowCurrentTimestamp node, MPPQueryContext context) { + public IConfigTask visitShowCurrentTimestamp(ShowCurrentTimestamp node, MPPQueryContext context) { context.setQueryType(QueryType.READ); return new ShowCurrentTimestampTask(); } @Override - protected IConfigTask visitRelationalAuthorPlan( + public IConfigTask visitRelationalAuthorPlan( RelationalAuthorStatement node, MPPQueryContext context) { context.setQueryType(node.getQueryType()); node.setExecutedByUserId(context.getUserId()); @@ -1501,7 +1496,7 @@ private void visitUpdateUser(RelationalAuthorStatement node) { } @Override - protected IConfigTask visitKillQuery(KillQuery node, MPPQueryContext context) { + public IConfigTask visitKillQuery(KillQuery node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); String allowedUsername = context.getSession().getUserName(); if (accessControl.hasGlobalPrivilege( @@ -1512,7 +1507,7 @@ protected IConfigTask visitKillQuery(KillQuery node, MPPQueryContext context) { } @Override - protected IConfigTask visitCreateFunction(CreateFunction node, MPPQueryContext context) { + public IConfigTask visitCreateFunction(CreateFunction node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); if (node.getUriString().map(ExecutableManager::isUriTrusted).orElse(true)) { @@ -1526,20 +1521,20 @@ protected IConfigTask visitCreateFunction(CreateFunction node, MPPQueryContext c } @Override - protected IConfigTask visitShowFunctions(ShowFunctions node, MPPQueryContext context) { + public IConfigTask visitShowFunctions(ShowFunctions node, MPPQueryContext context) { context.setQueryType(QueryType.READ); return new ShowFunctionsTask(Model.TABLE); } @Override - protected IConfigTask visitDropFunction(DropFunction node, MPPQueryContext context) { + public IConfigTask visitDropFunction(DropFunction node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new DropFunctionTask(Model.TABLE, node.getUdfName()); } @Override - protected IConfigTask visitCreateExternalService( + public IConfigTask visitCreateExternalService( CreateExternalService node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); @@ -1547,31 +1542,28 @@ protected IConfigTask visitCreateExternalService( } @Override - protected IConfigTask visitStartExternalService( - StartExternalService node, MPPQueryContext context) { + public IConfigTask visitStartExternalService(StartExternalService node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new StartExternalServiceTask(node.getServiceName()); } @Override - protected IConfigTask visitStopExternalService( - StopExternalService node, MPPQueryContext context) { + public IConfigTask visitStopExternalService(StopExternalService node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new StopExternalServiceTask(node.getServiceName()); } @Override - protected IConfigTask visitDropExternalService( - DropExternalService node, MPPQueryContext context) { + public IConfigTask visitDropExternalService(DropExternalService node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new DropExternalServiceTask(node.getServiceName(), node.isForcedly()); } @Override - protected IConfigTask visitMigrateRegion(MigrateRegion migrateRegion, MPPQueryContext context) { + public IConfigTask visitMigrateRegion(MigrateRegion migrateRegion, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); // As the implementation is identical, we'll simply translate to the @@ -1580,7 +1572,7 @@ protected IConfigTask visitMigrateRegion(MigrateRegion migrateRegion, MPPQueryCo } @Override - protected IConfigTask visitReconstructRegion( + public IConfigTask visitReconstructRegion( ReconstructRegion reconstructRegion, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); @@ -1590,7 +1582,7 @@ protected IConfigTask visitReconstructRegion( } @Override - protected IConfigTask visitExtendRegion(ExtendRegion extendRegion, MPPQueryContext context) { + public IConfigTask visitExtendRegion(ExtendRegion extendRegion, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); // As the implementation is identical, we'll simply translate to the @@ -1599,7 +1591,7 @@ protected IConfigTask visitExtendRegion(ExtendRegion extendRegion, MPPQueryConte } @Override - protected IConfigTask visitRemoveRegion(RemoveRegion removeRegion, MPPQueryContext context) { + public IConfigTask visitRemoveRegion(RemoveRegion removeRegion, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); // As the implementation is identical, we'll simply translate to the @@ -1608,7 +1600,7 @@ protected IConfigTask visitRemoveRegion(RemoveRegion removeRegion, MPPQueryConte } @Override - protected IConfigTask visitCreateTraining(CreateTraining node, MPPQueryContext context) { + public IConfigTask visitCreateTraining(CreateTraining node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new CreateTuningTask( @@ -1616,7 +1608,7 @@ protected IConfigTask visitCreateTraining(CreateTraining node, MPPQueryContext c } @Override - protected IConfigTask visitCreateModel(CreateModel node, MPPQueryContext context) { + public IConfigTask visitCreateModel(CreateModel node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); String uri = node.getUri(); @@ -1629,40 +1621,40 @@ protected IConfigTask visitCreateModel(CreateModel node, MPPQueryContext context } @Override - protected IConfigTask visitShowModels(ShowModels node, MPPQueryContext context) { + public IConfigTask visitShowModels(ShowModels node, MPPQueryContext context) { context.setQueryType(QueryType.READ); return new ShowModelsTask(node.getModelId()); } @Override - protected IConfigTask visitDropModel(DropModel node, MPPQueryContext context) { + public IConfigTask visitDropModel(DropModel node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new DropModelTask(node.getModelId()); } @Override - protected IConfigTask visitShowLoadedModels(ShowLoadedModels node, MPPQueryContext context) { + public IConfigTask visitShowLoadedModels(ShowLoadedModels node, MPPQueryContext context) { context.setQueryType(QueryType.READ); accessControl.checkUserGlobalSysPrivilege(context); return new ShowLoadedModelsTask(node.getDeviceIdList()); } @Override - protected IConfigTask visitShowAIDevices(ShowAIDevices node, MPPQueryContext context) { + public IConfigTask visitShowAIDevices(ShowAIDevices node, MPPQueryContext context) { context.setQueryType(QueryType.READ); return new ShowAIDevicesTask(); } @Override - protected IConfigTask visitLoadModel(LoadModel node, MPPQueryContext context) { + public IConfigTask visitLoadModel(LoadModel node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new LoadModelTask(node.getModelId(), node.getDeviceIdList()); } @Override - protected IConfigTask visitUnloadModel(UnloadModel node, MPPQueryContext context) { + public IConfigTask visitUnloadModel(UnloadModel node, MPPQueryContext context) { context.setQueryType(QueryType.WRITE); accessControl.checkUserGlobalSysPrivilege(context); return new UnloadModelTask(node.getModelId(), node.getDeviceIdList()); 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 e6d966f401024..6f8fdb12c92b0 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 @@ -56,7 +56,7 @@ import static org.apache.iotdb.db.queryengine.plan.execution.memory.StatementMemorySourceVisitor.getStatementMemorySource; public class TableModelStatementMemorySourceVisitor - extends AstVisitor { + implements AstVisitor { @Override public StatementMemorySource visitNode( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java index ae1769cebd0a7..5d97d2edda73a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java @@ -166,15 +166,15 @@ private void analyze(Expression expression) { } /** visitor returns true if all expressions are constant with respect to the group. */ - private class Visitor extends AstVisitor { + private class Visitor implements AstVisitor { @Override - protected Boolean visitExpression(Expression node, Void context) { + public Boolean visitExpression(Expression node, Void context) { throw new UnsupportedOperationException( "aggregation analysis not yet implemented for: " + node.getClass().getName()); } @Override - protected Boolean visitSubqueryExpression(SubqueryExpression node, Void context) { + public Boolean visitSubqueryExpression(SubqueryExpression node, Void context) { /* * Column reference can resolve to (a) some subquery's scope, (b) a projection (ORDER BY scope), * (c) source scope or (d) outer query scope (effectively a constant). @@ -194,98 +194,98 @@ protected Boolean visitSubqueryExpression(SubqueryExpression node, Void context) } @Override - protected Boolean visitExists(ExistsPredicate node, Void context) { + public Boolean visitExists(ExistsPredicate node, Void context) { checkState(node.getSubquery() instanceof SubqueryExpression); return process(node.getSubquery(), context); } @Override - protected Boolean visitCast(Cast node, Void context) { + public Boolean visitCast(Cast node, Void context) { return process(node.getExpression(), context); } @Override - protected Boolean visitCoalesceExpression(CoalesceExpression node, Void context) { + public Boolean visitCoalesceExpression(CoalesceExpression node, Void context) { return node.getOperands().stream().allMatch(expression -> process(expression, context)); } @Override - protected Boolean visitNullIfExpression(NullIfExpression node, Void context) { + public Boolean visitNullIfExpression(NullIfExpression node, Void context) { return process(node.getFirst(), context) && process(node.getSecond(), context); } @Override - protected Boolean visitExtract(Extract node, Void context) { + public Boolean visitExtract(Extract node, Void context) { return process(node.getExpression(), context); } @Override - protected Boolean visitBetweenPredicate(BetweenPredicate node, Void context) { + public Boolean visitBetweenPredicate(BetweenPredicate node, Void context) { return process(node.getMin(), context) && process(node.getValue(), context) && process(node.getMax(), context); } @Override - protected Boolean visitCurrentTime(CurrentTime node, Void context) { + public Boolean visitCurrentTime(CurrentTime node, Void context) { return true; } @Override - protected Boolean visitArithmeticBinary(ArithmeticBinaryExpression node, Void context) { + public Boolean visitArithmeticBinary(ArithmeticBinaryExpression node, Void context) { return process(node.getLeft(), context) && process(node.getRight(), context); } @Override - protected Boolean visitComparisonExpression(ComparisonExpression node, Void context) { + public Boolean visitComparisonExpression(ComparisonExpression node, Void context) { return process(node.getLeft(), context) && process(node.getRight(), context); } @Override - protected Boolean visitLiteral(Literal node, Void context) { + public Boolean visitLiteral(Literal node, Void context) { return true; } @Override - protected Boolean visitIsNotNullPredicate(IsNotNullPredicate node, Void context) { + public Boolean visitIsNotNullPredicate(IsNotNullPredicate node, Void context) { return process(node.getValue(), context); } @Override - protected Boolean visitIsNullPredicate(IsNullPredicate node, Void context) { + public Boolean visitIsNullPredicate(IsNullPredicate node, Void context) { return process(node.getValue(), context); } @Override - protected Boolean visitLikePredicate(LikePredicate node, Void context) { + public Boolean visitLikePredicate(LikePredicate node, Void context) { return process(node.getValue(), context) && process(node.getPattern(), context); } @Override - protected Boolean visitInListExpression(InListExpression node, Void context) { + public Boolean visitInListExpression(InListExpression node, Void context) { return node.getValues().stream().allMatch(expression -> process(expression, context)); } @Override - protected Boolean visitInPredicate(InPredicate node, Void context) { + public Boolean visitInPredicate(InPredicate node, Void context) { return process(node.getValue(), context) && process(node.getValueList(), context); } @Override - protected Boolean visitQuantifiedComparisonExpression( + public Boolean visitQuantifiedComparisonExpression( QuantifiedComparisonExpression node, Void context) { return process(node.getValue(), context) && process(node.getSubquery(), context); } @Override - protected Boolean visitTrim(Trim node, Void context) { + public Boolean visitTrim(Trim node, Void context) { return process(node.getTrimSource(), context) && (!node.getTrimCharacter().isPresent() || process(node.getTrimCharacter().get(), context)); } @Override - protected Boolean visitFunctionCall(FunctionCall node, Void context) { + public Boolean visitFunctionCall(FunctionCall node, Void context) { if (isAggregationFunction(node.getName().toString())) { List aggregateFunctions = extractAggregateFunctions(node.getArguments()); @@ -303,7 +303,7 @@ protected Boolean visitFunctionCall(FunctionCall node, Void context) { } @Override - protected Boolean visitIdentifier(Identifier node, Void context) { + public Boolean visitIdentifier(Identifier node, Void context) { // if (analysis.getLambdaArgumentReferences().containsKey(NodeRef.of(node))) { // return true; // } @@ -317,7 +317,7 @@ protected Boolean visitIdentifier(Identifier node, Void context) { } @Override - protected Boolean visitDereferenceExpression(DereferenceExpression node, Void context) { + public Boolean visitDereferenceExpression(DereferenceExpression node, Void context) { if (!hasReferencesToScope(node, analysis, sourceScope)) { // reference to outer scope is group-invariant @@ -345,7 +345,7 @@ private boolean isGroupingKey(Expression node) { } @Override - protected Boolean visitFieldReference(FieldReference node, Void context) { + public Boolean visitFieldReference(FieldReference node, Void context) { if (orderByScope.isPresent()) { return true; } @@ -372,22 +372,22 @@ protected Boolean visitFieldReference(FieldReference node, Void context) { } @Override - protected Boolean visitArithmeticUnary(ArithmeticUnaryExpression node, Void context) { + public Boolean visitArithmeticUnary(ArithmeticUnaryExpression node, Void context) { return process(node.getValue(), context); } @Override - protected Boolean visitNotExpression(NotExpression node, Void context) { + public Boolean visitNotExpression(NotExpression node, Void context) { return process(node.getValue(), context); } @Override - protected Boolean visitLogicalExpression(LogicalExpression node, Void context) { + public Boolean visitLogicalExpression(LogicalExpression node, Void context) { return node.getTerms().stream().allMatch(item -> process(item, context)); } @Override - protected Boolean visitIfExpression(IfExpression node, Void context) { + public Boolean visitIfExpression(IfExpression node, Void context) { ImmutableList.Builder expressions = ImmutableList.builder().add(node.getCondition()).add(node.getTrueValue()); @@ -399,7 +399,7 @@ protected Boolean visitIfExpression(IfExpression node, Void context) { } @Override - protected Boolean visitSimpleCaseExpression(SimpleCaseExpression node, Void context) { + public Boolean visitSimpleCaseExpression(SimpleCaseExpression node, Void context) { if (!process(node.getOperand(), context)) { return false; } @@ -415,7 +415,7 @@ protected Boolean visitSimpleCaseExpression(SimpleCaseExpression node, Void cont } @Override - protected Boolean visitSearchedCaseExpression(SearchedCaseExpression node, Void context) { + public Boolean visitSearchedCaseExpression(SearchedCaseExpression node, Void context) { for (WhenClause whenClause : node.getWhenClauses()) { if (!process(whenClause.getOperand(), context) || !process(whenClause.getResult(), context)) { @@ -427,12 +427,12 @@ protected Boolean visitSearchedCaseExpression(SearchedCaseExpression node, Void } @Override - protected Boolean visitRow(Row node, Void context) { + public Boolean visitRow(Row node, Void context) { return node.getItems().stream().allMatch(item -> process(item, context)); } @Override - protected Boolean visitParameter(Parameter node, Void context) { + public Boolean visitParameter(Parameter node, Void context) { // if (analysis.isDescribe()) { // return true; // } @@ -453,7 +453,7 @@ public Boolean process(Node node, @Nullable Void context) { return true; } - return super.process(node, context); + return AstVisitor.super.process(node, context); } private boolean hasOrderByReferencesToOutputColumns(Node node) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 2c6fe7ff2db99..923bf22b3fee3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -481,7 +481,7 @@ public Type process(Node node, @Nullable StackableAstVisitorContext con } @Override - protected Type visitRow(Row node, StackableAstVisitorContext context) { + public Type visitRow(Row node, StackableAstVisitorContext context) { List types = node.getItems().stream().map(child -> process(child, context)).collect(toImmutableList()); @@ -490,7 +490,7 @@ protected Type visitRow(Row node, StackableAstVisitorContext context) { } @Override - protected Type visitCurrentTime(CurrentTime node, StackableAstVisitorContext context) { + public Type visitCurrentTime(CurrentTime node, StackableAstVisitorContext context) { if (requireNonNull(node.getFunction()) == CurrentTime.Function.TIMESTAMP) { return setExpressionType(node, INT64); } @@ -498,7 +498,7 @@ protected Type visitCurrentTime(CurrentTime node, StackableAstVisitorContext context) { // if (context.getContext().isInLambda()) { // Optional resolvedField = @@ -515,7 +515,7 @@ protected Type visitSymbolReference( } @Override - protected Type visitIdentifier(Identifier node, StackableAstVisitorContext context) { + public Type visitIdentifier(Identifier node, StackableAstVisitorContext context) { ResolvedField resolvedField = context.getContext().getScope().resolveField(node, QualifiedName.of(node.getValue())); @@ -576,7 +576,7 @@ private Type handleResolvedField( } @Override - protected Type visitDereferenceExpression( + public Type visitDereferenceExpression( DereferenceExpression node, StackableAstVisitorContext context) { if (isQualifiedAllFieldsReference(node)) { throw new SemanticException(".* not allowed in this context"); @@ -677,7 +677,7 @@ protected Type visitDereferenceExpression( } @Override - protected Type visitNotExpression( + public Type visitNotExpression( NotExpression node, StackableAstVisitorContext context) { coerceType(context, node.getValue(), BOOLEAN, "Value of logical NOT expression"); @@ -685,7 +685,7 @@ protected Type visitNotExpression( } @Override - protected Type visitLogicalExpression( + public Type visitLogicalExpression( LogicalExpression node, StackableAstVisitorContext context) { for (Expression term : node.getTerms()) { coerceType(context, term, BOOLEAN, "Logical expression term"); @@ -695,7 +695,7 @@ protected Type visitLogicalExpression( } @Override - protected Type visitComparisonExpression( + public Type visitComparisonExpression( ComparisonExpression node, StackableAstVisitorContext context) { OperatorType operatorType = null; switch (node.getOperator()) { @@ -720,7 +720,7 @@ protected Type visitComparisonExpression( } @Override - protected Type visitIsNullPredicate( + public Type visitIsNullPredicate( IsNullPredicate node, StackableAstVisitorContext context) { process(node.getValue(), context); @@ -728,7 +728,7 @@ protected Type visitIsNullPredicate( } @Override - protected Type visitIsNotNullPredicate( + public Type visitIsNotNullPredicate( IsNotNullPredicate node, StackableAstVisitorContext context) { process(node.getValue(), context); @@ -736,7 +736,7 @@ protected Type visitIsNotNullPredicate( } @Override - protected Type visitNullIfExpression( + public Type visitNullIfExpression( NullIfExpression node, StackableAstVisitorContext context) { Type firstType = process(node.getFirst(), context); Type secondType = process(node.getSecond(), context); @@ -750,8 +750,7 @@ protected Type visitNullIfExpression( } @Override - protected Type visitIfExpression( - IfExpression node, StackableAstVisitorContext context) { + public Type visitIfExpression(IfExpression node, StackableAstVisitorContext context) { coerceType(context, node.getCondition(), BOOLEAN, "IF condition"); Type type; @@ -771,7 +770,7 @@ protected Type visitIfExpression( } @Override - protected Type visitSearchedCaseExpression( + public Type visitSearchedCaseExpression( SearchedCaseExpression node, StackableAstVisitorContext context) { for (WhenClause whenClause : node.getWhenClauses()) { coerceType(context, whenClause.getOperand(), BOOLEAN, "CASE WHEN clause"); @@ -793,7 +792,7 @@ protected Type visitSearchedCaseExpression( } @Override - protected Type visitSimpleCaseExpression( + public Type visitSimpleCaseExpression( SimpleCaseExpression node, StackableAstVisitorContext context) { coerceCaseOperandToToSingleType(node, context); @@ -856,7 +855,7 @@ private List getCaseResultExpressions( } @Override - protected Type visitCoalesceExpression( + public Type visitCoalesceExpression( CoalesceExpression node, StackableAstVisitorContext context) { Type type = coerceToSingleType(context, "All COALESCE operands", node.getOperands()); @@ -864,7 +863,7 @@ protected Type visitCoalesceExpression( } @Override - protected Type visitArithmeticUnary( + public Type visitArithmeticUnary( ArithmeticUnaryExpression node, StackableAstVisitorContext context) { switch (node.getSign()) { case PLUS: @@ -887,7 +886,7 @@ protected Type visitArithmeticUnary( } @Override - protected Type visitArithmeticBinary( + public Type visitArithmeticBinary( ArithmeticBinaryExpression node, StackableAstVisitorContext context) { return getOperator( context, @@ -898,7 +897,7 @@ protected Type visitArithmeticBinary( } @Override - protected Type visitLikePredicate( + public Type visitLikePredicate( LikePredicate node, StackableAstVisitorContext context) { Type valueType = process(node.getValue(), context); if (!isCharType(valueType)) { @@ -930,19 +929,19 @@ protected Type visitLikePredicate( } @Override - protected Type visitStringLiteral( + public Type visitStringLiteral( StringLiteral node, StackableAstVisitorContext context) { return setExpressionType(node, STRING); } @Override - protected Type visitBinaryLiteral( + public Type visitBinaryLiteral( BinaryLiteral node, StackableAstVisitorContext context) { return setExpressionType(node, BLOB); } @Override - protected Type visitLongLiteral(LongLiteral node, StackableAstVisitorContext context) { + public Type visitLongLiteral(LongLiteral node, StackableAstVisitorContext context) { if (node.getParsedValue() >= Integer.MIN_VALUE && node.getParsedValue() <= Integer.MAX_VALUE) { return setExpressionType(node, INT32); @@ -952,43 +951,41 @@ protected Type visitLongLiteral(LongLiteral node, StackableAstVisitorContext context) { return setExpressionType(node, DOUBLE); } @Override - protected Type visitFloatLiteral( - FloatLiteral node, StackableAstVisitorContext context) { + public Type visitFloatLiteral(FloatLiteral node, StackableAstVisitorContext context) { return setExpressionType(node, FLOAT); } @Override - protected Type visitDecimalLiteral( + public Type visitDecimalLiteral( DecimalLiteral node, StackableAstVisitorContext context) { throw new SemanticException("DecimalLiteral is not supported yet."); } @Override - protected Type visitBooleanLiteral( + public Type visitBooleanLiteral( BooleanLiteral node, StackableAstVisitorContext context) { return setExpressionType(node, BOOLEAN); } @Override - protected Type visitGenericLiteral( + public Type visitGenericLiteral( GenericLiteral node, StackableAstVisitorContext context) { throw new SemanticException("GenericLiteral is not supported yet."); } @Override - protected Type visitNullLiteral(NullLiteral node, StackableAstVisitorContext context) { + public Type visitNullLiteral(NullLiteral node, StackableAstVisitorContext context) { return setExpressionType(node, UNKNOWN); } @Override - protected Type visitFunctionCall( - FunctionCall node, StackableAstVisitorContext context) { + public Type visitFunctionCall(FunctionCall node, StackableAstVisitorContext context) { String functionName = node.getName().getSuffix(); boolean isAggregation = metadata.isAggregationFunction(session, functionName, accessControl); boolean isRowPatternCount = @@ -1617,18 +1614,18 @@ private void checkNoNestedNavigations(FunctionCall node) { } @Override - protected Type visitCurrentDatabase( + public Type visitCurrentDatabase( CurrentDatabase node, StackableAstVisitorContext context) { return setExpressionType(node, STRING); } @Override - protected Type visitCurrentUser(CurrentUser node, StackableAstVisitorContext context) { + public Type visitCurrentUser(CurrentUser node, StackableAstVisitorContext context) { return setExpressionType(node, STRING); } @Override - protected Type visitTrim(Trim node, StackableAstVisitorContext context) { + public Type visitTrim(Trim node, StackableAstVisitorContext context) { ImmutableList.Builder argumentTypes = ImmutableList.builder(); argumentTypes.add(process(node.getTrimSource(), context)); @@ -1643,7 +1640,7 @@ protected Type visitTrim(Trim node, StackableAstVisitorContext context) } @Override - protected Type visitParameter(Parameter node, StackableAstVisitorContext context) { + public Type visitParameter(Parameter node, StackableAstVisitorContext context) { if (parameters.isEmpty()) { throw new SemanticException("Query takes no parameters"); @@ -1664,7 +1661,7 @@ protected Type visitParameter(Parameter node, StackableAstVisitorContext context) { + public Type visitExtract(Extract node, StackableAstVisitorContext context) { if (node.getExpression() instanceof LongLiteral) { // Don't visit child here to avoid setting its Type to INT32 setExpressionType(node.getExpression(), INT64); @@ -1680,7 +1677,7 @@ protected Type visitExtract(Extract node, StackableAstVisitorContext co } @Override - protected Type visitBetweenPredicate( + public Type visitBetweenPredicate( BetweenPredicate node, StackableAstVisitorContext context) { Type valueType = process(node.getValue(), context); Type minType = process(node.getMin(), context); @@ -1723,7 +1720,7 @@ public Type visitCast(Cast node, StackableAstVisitorContext context) { } @Override - protected Type visitInPredicate(InPredicate node, StackableAstVisitorContext context) { + public Type visitInPredicate(InPredicate node, StackableAstVisitorContext context) { Expression value = node.getValue(); // Attention: remove this check after supporting RowType if (value instanceof Row) { @@ -1775,7 +1772,7 @@ protected Type visitInPredicate(InPredicate node, StackableAstVisitorContext context) { Type type = analyzeSubquery(node, context); @@ -2037,7 +2034,7 @@ private void analyzeFrameRangeOffset( } @Override - protected Type visitExists(ExistsPredicate node, StackableAstVisitorContext context) { + public Type visitExists(ExistsPredicate node, StackableAstVisitorContext context) { StatementAnalyzer analyzer = statementAnalyzerFactory.apply(node, context.getContext().getCorrelationSupport()); Scope subqueryScope = Scope.builder().withParent(context.getContext().getScope()).build(); @@ -2067,7 +2064,7 @@ protected Type visitExists(ExistsPredicate node, StackableAstVisitorContext context) { quantifiedComparisons.add(NodeRef.of(node)); @@ -2113,19 +2110,19 @@ public Type visitFieldReference( } @Override - protected Type visitExpression(Expression node, StackableAstVisitorContext context) { + public Type visitExpression(Expression node, StackableAstVisitorContext context) { throw new SemanticException( String.format("not yet implemented: %s", node.getClass().getName())); } @Override - protected Type visitNode(Node node, StackableAstVisitorContext context) { + public Type visitNode(Node node, StackableAstVisitorContext context) { throw new SemanticException( String.format("not yet implemented: %s", node.getClass().getName())); } @Override - protected Type visitColumns(Columns node, StackableAstVisitorContext context) { + public Type visitColumns(Columns node, StackableAstVisitorContext context) { throw new SemanticException("Columns only support to be used in SELECT and WHERE clause"); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index 4de1227515b9b..05b6d98459dfb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -366,7 +366,7 @@ private enum UpdateKind { * Visitor context represents local query scope (if exists). The invariant is that the local query * scopes hierarchy should always have outer query scope (if provided) as ancestor. */ - private final class Visitor extends AstVisitor> { + private final class Visitor implements AstVisitor> { private final boolean isTopLevel; private final Optional outerQueryScope; @@ -386,7 +386,7 @@ private Visitor( @Override public Scope process(Node node, final Optional scope) { - final Scope returnScope = super.process(node, scope); + final Scope returnScope = AstVisitor.super.process(node, scope); if (node instanceof PipeEnriched) { node = ((PipeEnriched) node).getInnerStatement(); } @@ -414,100 +414,100 @@ private Scope process(Node node, Scope scope) { } @Override - protected Scope visitNode(Node node, Optional context) { + public Scope visitNode(Node node, Optional context) { throw new IllegalStateException("Unsupported node type: " + node.getClass().getName()); } @Override - protected Scope visitCreateDB(CreateDB node, Optional context) { + public Scope visitCreateDB(CreateDB node, Optional context) { throw new SemanticException("Create Database statement is not supported yet."); } @Override - protected Scope visitAlterDB(AlterDB node, Optional context) { + public Scope visitAlterDB(AlterDB node, Optional context) { throw new SemanticException("Alter Database statement is not supported yet."); } @Override - protected Scope visitDropDB(DropDB node, Optional context) { + public Scope visitDropDB(DropDB node, Optional context) { throw new SemanticException("Drop Database statement is not supported yet."); } @Override - protected Scope visitShowDB(ShowDB node, Optional context) { + public Scope visitShowDB(ShowDB node, Optional context) { throw new SemanticException("Show Database statement is not supported yet."); } @Override - protected Scope visitCreateTable(final CreateTable node, final Optional context) { + public Scope visitCreateTable(final CreateTable node, final Optional context) { validateProperties(node.getProperties(), context); return createAndAssignScope(node, context); } @Override - protected Scope visitCreateView(final CreateView node, final Optional context) { + public Scope visitCreateView(final CreateView node, final Optional context) { validateProperties(node.getProperties(), context); return createAndAssignScope(node, context); } @Override - protected Scope visitDropTable(final DropTable node, final Optional context) { + public Scope visitDropTable(final DropTable node, final Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitShowTables(ShowTables node, Optional context) { + public Scope visitShowTables(ShowTables node, Optional context) { throw new SemanticException("Show Tables statement is not supported yet."); } @Override - protected Scope visitRenameTable(RenameTable node, Optional context) { + public Scope visitRenameTable(RenameTable node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitDescribeTable(DescribeTable node, Optional context) { + public Scope visitDescribeTable(DescribeTable node, Optional context) { throw new SemanticException("Describe Table statement is not supported yet."); } @Override - protected Scope visitSetProperties(final SetProperties node, final Optional context) { + public Scope visitSetProperties(final SetProperties node, final Optional context) { validateProperties(node.getProperties(), context); return createAndAssignScope(node, context); } @Override - protected Scope visitRenameColumn(RenameColumn node, Optional context) { + public Scope visitRenameColumn(RenameColumn node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitDropColumn(DropColumn node, Optional context) { + public Scope visitDropColumn(DropColumn node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitAddColumn(AddColumn node, Optional context) { + public Scope visitAddColumn(AddColumn node, Optional context) { throw new SemanticException("Add Column statement is not supported yet."); } @Override - protected Scope visitCreateIndex(CreateIndex node, Optional context) { + public Scope visitCreateIndex(CreateIndex node, Optional context) { throw new SemanticException("Create Index statement is not supported yet."); } @Override - protected Scope visitDropIndex(DropIndex node, Optional context) { + public Scope visitDropIndex(DropIndex node, Optional context) { throw new SemanticException("Drop Index statement is not supported yet."); } @Override - protected Scope visitShowIndex(ShowIndex node, Optional context) { + public Scope visitShowIndex(ShowIndex node, Optional context) { throw new SemanticException("Show Index statement is not supported yet."); } @Override - protected Scope visitUpdate(final Update node, final Optional context) { + public Scope visitUpdate(final Update node, final Optional context) { queryContext.setQueryType(QueryType.WRITE); node.parseTable(sessionContext); accessControl.checkCanInsertIntoTable( @@ -589,7 +589,7 @@ protected Scope visitUpdate(final Update node, final Optional context) { } @Override - protected Scope visitDeleteDevice(final DeleteDevice node, final Optional context) { + public Scope visitDeleteDevice(final DeleteDevice node, final Optional context) { // Actually write, but will return the result queryContext.setQueryType(QueryType.READ); node.parseTable(sessionContext); @@ -616,17 +616,17 @@ protected Scope visitDeleteDevice(final DeleteDevice node, final Optional } @Override - protected Scope visitDropFunction(DropFunction node, Optional context) { + public Scope visitDropFunction(DropFunction node, Optional context) { throw new SemanticException("Drop Function statement is not supported yet."); } @Override - protected Scope visitShowFunctions(ShowFunctions node, Optional context) { + public Scope visitShowFunctions(ShowFunctions node, Optional context) { throw new SemanticException("Show Function statement is not supported yet."); } @Override - protected Scope visitUse(Use node, Optional scope) { + public Scope visitUse(Use node, Optional scope) { throw new SemanticException("USE statement is not supported yet."); } @@ -657,7 +657,7 @@ private boolean typesMatchForInsert(List tableTypes, List queryTypes } @Override - protected Scope visitInsert(Insert insert, Optional scope) { + public Scope visitInsert(Insert insert, Optional scope) { queryContext.setQueryType(QueryType.READ_WRITE); // analyze the query that creates the data Scope queryScope = analyze(insert.getQuery(), Optional.empty(), false); @@ -761,16 +761,16 @@ protected Scope visitInsert(Insert insert, Optional scope) { } @Override - protected Scope visitInsertRow(InsertRow node, Optional context) { + public Scope visitInsertRow(InsertRow node, Optional context) { return visitInsert(node, context); } - protected Scope visitInsertTablet(InsertTablet insert, Optional scope) { + public Scope visitInsertTablet(InsertTablet insert, Optional scope) { return visitInsert(insert, scope); } @Override - protected Scope visitInsertRows(InsertRows node, Optional context) { + public Scope visitInsertRows(InsertRows node, Optional context) { return visitInsert(node, context); } @@ -798,7 +798,7 @@ private Scope visitInsert(WrappedInsertStatement insert, Optional scope) } @Override - protected Scope visitDelete(Delete node, Optional scope) { + public Scope visitDelete(Delete node, Optional scope) { final Scope ret = Scope.create(); accessControl.checkCanDeleteFromTable( sessionContext.getUserName(), @@ -813,7 +813,7 @@ protected Scope visitDelete(Delete node, Optional scope) { } @Override - protected Scope visitPipeEnriched(PipeEnriched node, Optional scope) { + public Scope visitPipeEnriched(PipeEnriched node, Optional scope) { // The LoadTsFile statement is a special case, it needs isGeneratedByPipe information // in the analyzer to execute the tsfile-tablet conversion in some cases. if (node.getInnerStatement() instanceof LoadTsFile) { @@ -827,7 +827,7 @@ protected Scope visitPipeEnriched(PipeEnriched node, Optional scope) { } @Override - protected Scope visitLoadTsFile(final LoadTsFile node, final Optional scope) { + public Scope visitLoadTsFile(final LoadTsFile node, final Optional scope) { queryContext.setQueryType(QueryType.WRITE); try (final LoadTsFileAnalyzer loadTsFileAnalyzer = @@ -846,14 +846,14 @@ protected Scope visitLoadTsFile(final LoadTsFile node, final Optional sco } @Override - protected Scope visitExplain(Explain node, Optional context) { + public Scope visitExplain(Explain node, Optional context) { queryContext.setExplainType(ExplainType.EXPLAIN); analysis.setFinishQueryAfterAnalyze(); return visitQuery((Query) node.getStatement(), context); } @Override - protected Scope visitCopyTo(CopyTo node, Optional context) { + public Scope visitCopyTo(CopyTo node, Optional context) { accessControl.checkUserGlobalSysPrivilege(queryContext); Scope innerQueryScope = visitQuery((Query) node.getQueryStatement(), context); analysis.setScope(node, innerQueryScope); @@ -861,14 +861,14 @@ protected Scope visitCopyTo(CopyTo node, Optional context) { } @Override - protected Scope visitExplainAnalyze(ExplainAnalyze node, Optional context) { + public Scope visitExplainAnalyze(ExplainAnalyze node, Optional context) { queryContext.setExplainType(ExplainType.EXPLAIN_ANALYZE); queryContext.setVerbose(node.isVerbose()); return visitQuery((Query) node.getStatement(), context); } @Override - protected Scope visitQuery(Query node, Optional context) { + public Scope visitQuery(Query node, Optional context) { analysis.setQuery(true); Scope withScope = analyzeWith(node, context); hasFillInParentScope = node.getFill().isPresent() || hasFillInParentScope; @@ -1138,7 +1138,7 @@ private boolean tryProcessRecursiveQuery( } @Override - protected Scope visitTableSubquery(TableSubquery node, Optional scope) { + public Scope visitTableSubquery(TableSubquery node, Optional scope) { StatementAnalyzer analyzer = statementAnalyzerFactory.createStatementAnalyzer( analysis, queryContext, sessionContext, warningCollector, CorrelationSupport.ALLOWED); @@ -1151,7 +1151,7 @@ protected Scope visitTableSubquery(TableSubquery node, Optional scope) { } @Override - protected Scope visitQuerySpecification(QuerySpecification node, Optional scope) { + public Scope visitQuerySpecification(QuerySpecification node, Optional scope) { // TODO: extract candidate names from SELECT, WHERE, HAVING, GROUP BY and ORDER BY expressions // to pass down to analyzeFrom hasFillInParentScope = node.getFill().isPresent() || hasFillInParentScope; @@ -1583,7 +1583,7 @@ private Node containsColumnsHelper(Node node) { return target; } - private class ExpandColumnsVisitor extends AstVisitor, Scope> { + private class ExpandColumnsVisitor implements AstVisitor, Scope> { private final Identifier alias; // Record Columns expanded result in process, not always equals with final result private List expandedExpressions; @@ -1598,12 +1598,12 @@ public List getAccordingColumnNames() { return accordingColumnNames; } - protected List visitNode(Node node, Scope scope) { + public List visitNode(Node node, Scope scope) { throw new UnsupportedOperationException( "This Visitor only supported process of Expression"); } - protected List visitExpression(Expression node, Scope scope) { + public List visitExpression(Expression node, Scope scope) { if (node.getChildren().isEmpty()) { return Collections.singletonList(node); } @@ -1680,7 +1680,7 @@ public List visitColumns(Columns node, Scope context) { } @Override - protected List visitArithmeticBinary( + public List visitArithmeticBinary( ArithmeticBinaryExpression node, Scope context) { List leftResult = process(node.getLeft(), context); List rightResult = process(node.getRight(), context); @@ -1713,8 +1713,7 @@ protected List visitArithmeticBinary( } @Override - protected List visitArithmeticUnary( - ArithmeticUnaryExpression node, Scope context) { + public List visitArithmeticUnary(ArithmeticUnaryExpression node, Scope context) { List childResult = process(node.getValue(), context); if (expandedExpressions == null) { // no Columns need to be expanded @@ -1730,7 +1729,7 @@ protected List visitArithmeticUnary( } @Override - protected List visitBetweenPredicate(BetweenPredicate node, Scope context) { + public List visitBetweenPredicate(BetweenPredicate node, Scope context) { List valueResult = process(node.getValue(), context); List minResult = process(node.getMin(), context); List maxResult = process(node.getMax(), context); @@ -1764,7 +1763,7 @@ protected List visitBetweenPredicate(BetweenPredicate node, Scope co } @Override - protected List visitCast(Cast node, Scope context) { + public List visitCast(Cast node, Scope context) { List childResult = process(node.getExpression(), context); if (expandedExpressions == null) { // no Columns need to be expanded @@ -1780,7 +1779,7 @@ protected List visitCast(Cast node, Scope context) { } @Override - protected List visitCoalesceExpression(CoalesceExpression node, Scope context) { + public List visitCoalesceExpression(CoalesceExpression node, Scope context) { ImmutableList.Builder> childrenResultListBuilder = new ImmutableList.Builder<>(); node.getOperands() @@ -1815,8 +1814,7 @@ protected List visitCoalesceExpression(CoalesceExpression node, Scop } @Override - protected List visitComparisonExpression( - ComparisonExpression node, Scope context) { + public List visitComparisonExpression(ComparisonExpression node, Scope context) { List leftResult = process(node.getLeft(), context); List rightResult = process(node.getRight(), context); @@ -1848,7 +1846,7 @@ protected List visitComparisonExpression( } @Override - protected List visitDereferenceExpression( + public List visitDereferenceExpression( DereferenceExpression node, Scope context) { process(node.getBase(), context); if (expandedExpressions == null) { @@ -1858,13 +1856,13 @@ protected List visitDereferenceExpression( } @Override - protected List visitExists(ExistsPredicate node, Scope context) { + public List visitExists(ExistsPredicate node, Scope context) { // We don't need to process Query here return Collections.singletonList(node); } @Override - protected List visitFunctionCall(FunctionCall node, Scope context) { + public List visitFunctionCall(FunctionCall node, Scope context) { ImmutableList.Builder> childrenResultListBuilder = new ImmutableList.Builder<>(); node.getArguments() @@ -1899,12 +1897,12 @@ protected List visitFunctionCall(FunctionCall node, Scope context) { } @Override - protected List visitIdentifier(Identifier node, Scope context) { + public List visitIdentifier(Identifier node, Scope context) { return Collections.singletonList(node); } @Override - protected List visitIfExpression(IfExpression node, Scope context) { + public List visitIfExpression(IfExpression node, Scope context) { List firstResult = process(node.getCondition(), context); List secondResult = process(node.getTrueValue(), context); List thirdResult = @@ -1939,7 +1937,7 @@ protected List visitIfExpression(IfExpression node, Scope context) { } @Override - protected List visitInListExpression(InListExpression node, Scope context) { + public List visitInListExpression(InListExpression node, Scope context) { ImmutableList.Builder> childrenResultListBuilder = new ImmutableList.Builder<>(); node.getValues() @@ -1974,7 +1972,7 @@ protected List visitInListExpression(InListExpression node, Scope co } @Override - protected List visitInPredicate(InPredicate node, Scope context) { + public List visitInPredicate(InPredicate node, Scope context) { List leftResult = process(node.getValue(), context); List rightResult = process(node.getValueList(), context); @@ -2003,7 +2001,7 @@ protected List visitInPredicate(InPredicate node, Scope context) { } @Override - protected List visitIsNotNullPredicate(IsNotNullPredicate node, Scope context) { + public List visitIsNotNullPredicate(IsNotNullPredicate node, Scope context) { List childResult = process(node.getValue(), context); if (expandedExpressions == null) { // no Columns need to be expanded @@ -2019,7 +2017,7 @@ protected List visitIsNotNullPredicate(IsNotNullPredicate node, Scop } @Override - protected List visitIsNullPredicate(IsNullPredicate node, Scope context) { + public List visitIsNullPredicate(IsNullPredicate node, Scope context) { List childResult = process(node.getValue(), context); if (expandedExpressions == null) { // no Columns need to be expanded @@ -2035,7 +2033,7 @@ protected List visitIsNullPredicate(IsNullPredicate node, Scope cont } @Override - protected List visitLikePredicate(LikePredicate node, Scope context) { + public List visitLikePredicate(LikePredicate node, Scope context) { List firstResult = process(node.getValue(), context); List secondResult = process(node.getPattern(), context); List thirdResult = @@ -2070,12 +2068,12 @@ protected List visitLikePredicate(LikePredicate node, Scope context) } @Override - protected List visitLiteral(Literal node, Scope context) { + public List visitLiteral(Literal node, Scope context) { return Collections.singletonList(node); } @Override - protected List visitLogicalExpression(LogicalExpression node, Scope context) { + public List visitLogicalExpression(LogicalExpression node, Scope context) { ImmutableList.Builder> childrenResultListBuilder = new ImmutableList.Builder<>(); node.getTerms() @@ -2110,7 +2108,7 @@ protected List visitLogicalExpression(LogicalExpression node, Scope } @Override - protected List visitNotExpression(NotExpression node, Scope context) { + public List visitNotExpression(NotExpression node, Scope context) { List childResult = process(node.getValue(), context); if (expandedExpressions == null) { // no Columns need to be expanded @@ -2126,13 +2124,13 @@ protected List visitNotExpression(NotExpression node, Scope context) } @Override - protected List visitNullIfExpression(NullIfExpression node, Scope context) { + public List visitNullIfExpression(NullIfExpression node, Scope context) { throw new SemanticException( String.format("%s are not supported now", node.getClass().getSimpleName())); } @Override - protected List visitQuantifiedComparisonExpression( + public List visitQuantifiedComparisonExpression( QuantifiedComparisonExpression node, Scope context) { List childResult = process(node.getValue(), context); if (expandedExpressions == null) { @@ -2151,13 +2149,13 @@ protected List visitQuantifiedComparisonExpression( } @Override - protected List visitRow(Row node, Scope context) { + public List visitRow(Row node, Scope context) { throw new SemanticException( String.format("%s are not supported now", node.getClass().getSimpleName())); } @Override - protected List visitExtract(Extract node, Scope context) { + public List visitExtract(Extract node, Scope context) { List childResult = process(node.getExpression(), context); if (expandedExpressions == null) { // no Columns need to be expanded @@ -2173,7 +2171,7 @@ protected List visitExtract(Extract node, Scope context) { } @Override - protected List visitSearchedCaseExpression( + public List visitSearchedCaseExpression( SearchedCaseExpression node, Scope context) { ImmutableList.Builder> firstChildResultListBuilder = new ImmutableList.Builder<>(); @@ -2222,8 +2220,7 @@ protected List visitSearchedCaseExpression( } @Override - protected List visitSimpleCaseExpression( - SimpleCaseExpression node, Scope context) { + public List visitSimpleCaseExpression(SimpleCaseExpression node, Scope context) { List firstResult = process(node.getOperand(), context); ImmutableList.Builder> whenResultListBuilder = new ImmutableList.Builder<>(); @@ -2273,13 +2270,13 @@ protected List visitSimpleCaseExpression( } @Override - protected List visitSubqueryExpression(SubqueryExpression node, Scope context) { + public List visitSubqueryExpression(SubqueryExpression node, Scope context) { // We don't need to process Query here return Collections.singletonList(node); } @Override - protected List visitTrim(Trim node, Scope context) { + public List visitTrim(Trim node, Scope context) { List firstResult = process(node.getTrimSource(), context); List secondResult = node.getTrimCharacter().isPresent() @@ -2313,7 +2310,7 @@ protected List visitTrim(Trim node, Scope context) { } @Override - protected List visitWhenClause(WhenClause node, Scope context) { + public List visitWhenClause(WhenClause node, Scope context) { List leftResult = process(node.getOperand(), context); List rightResult = process(node.getResult(), context); @@ -2993,12 +2990,12 @@ private Scope computeAndAssignFillScope(Fill node, Scope sourceScope, Scope outp } @Override - protected Scope visitSubqueryExpression(SubqueryExpression node, Optional context) { + public Scope visitSubqueryExpression(SubqueryExpression node, Optional context) { return process(node.getQuery(), context); } @Override - protected Scope visitSetOperation(SetOperation node, Optional scope) { + public Scope visitSetOperation(SetOperation node, Optional scope) { checkState(node.getRelations().size() >= 2); List childrenTypes = @@ -3088,7 +3085,7 @@ protected Scope visitSetOperation(SetOperation node, Optional scope) { } @Override - protected Scope visitTable(Table table, Optional scope) { + public Scope visitTable(Table table, Optional scope) { if (!table.getName().getPrefix().isPresent()) { scope.ifPresent(s -> s.addTable(table)); // is this a reference to a WITH query? @@ -3289,7 +3286,7 @@ private List analyzeTableOutputFields( // accessControlScope, filter)); // } - protected Scope visitPatternRecognitionRelation( + public Scope visitPatternRecognitionRelation( PatternRecognitionRelation relation, Optional scope) { Scope inputScope = process(relation.getInput(), scope); @@ -3501,7 +3498,7 @@ private ExpressionAnalysis analyzePatternRecognitionExpression( } @Override - protected Scope visitValues(Values node, Optional scope) { + public Scope visitValues(Values node, Optional scope) { checkState(!node.getRows().isEmpty()); List rowTypes = @@ -3600,7 +3597,7 @@ protected Scope visitValues(Values node, Optional scope) { } @Override - protected Scope visitAliasedRelation(AliasedRelation relation, Optional scope) { + public Scope visitAliasedRelation(AliasedRelation relation, Optional scope) { analysis.setRelationName(relation, QualifiedName.of(ImmutableList.of(relation.getAlias()))); analysis.addAliased(relation.getRelation()); Scope relationScope = process(relation.getRelation(), scope); @@ -3647,7 +3644,7 @@ protected Scope visitAliasedRelation(AliasedRelation relation, Optional s } @Override - protected Scope visitJoin(Join node, Optional scope) { + public Scope visitJoin(Join node, Optional scope) { JoinCriteria criteria = node.getCriteria().orElse(null); joinConditionCheck(criteria); @@ -4547,7 +4544,7 @@ private Scope.Builder scopeBuilder(Optional parentScope) { } @Override - protected Scope visitCreateOrUpdateDevice( + public Scope visitCreateOrUpdateDevice( final CreateOrUpdateDevice node, final Optional context) { queryContext.setQueryType(QueryType.WRITE); DataNodeSchemaLockManager.getInstance() @@ -4558,12 +4555,12 @@ protected Scope visitCreateOrUpdateDevice( } @Override - protected Scope visitFetchDevice(final FetchDevice node, final Optional context) { + public Scope visitFetchDevice(final FetchDevice node, final Optional context) { return null; } @Override - protected Scope visitShowDevice(final ShowDevice node, final Optional context) { + public Scope visitShowDevice(final ShowDevice node, final Optional context) { analyzeQueryDevice(node, context); // TODO: use real scope when parameter in offset and limit is supported if (Objects.nonNull(node.getOffset())) { @@ -4576,7 +4573,7 @@ protected Scope visitShowDevice(final ShowDevice node, final Optional con } @Override - protected Scope visitCountDevice(final CountDevice node, final Optional context) { + public Scope visitCountDevice(final CountDevice node, final Optional context) { analyzeQueryDevice(node, context); return null; } @@ -4697,72 +4694,72 @@ private Pair analyzeAndRewriteExpression( } @Override - protected Scope visitCreatePipe(CreatePipe node, Optional context) { + public Scope visitCreatePipe(CreatePipe node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitAlterPipe(AlterPipe node, Optional context) { + public Scope visitAlterPipe(AlterPipe node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitDropPipe(DropPipe node, Optional context) { + public Scope visitDropPipe(DropPipe node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitStartPipe(StartPipe node, Optional context) { + public Scope visitStartPipe(StartPipe node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitStopPipe(StopPipe node, Optional context) { + public Scope visitStopPipe(StopPipe node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitShowPipes(ShowPipes node, Optional context) { + public Scope visitShowPipes(ShowPipes node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitCreatePipePlugin(CreatePipePlugin node, Optional context) { + public Scope visitCreatePipePlugin(CreatePipePlugin node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitDropPipePlugin(DropPipePlugin node, Optional context) { + public Scope visitDropPipePlugin(DropPipePlugin node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitShowPipePlugins(ShowPipePlugins node, Optional context) { + public Scope visitShowPipePlugins(ShowPipePlugins node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitCreateTopic(CreateTopic node, Optional context) { + public Scope visitCreateTopic(CreateTopic node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitDropTopic(DropTopic node, Optional context) { + public Scope visitDropTopic(DropTopic node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitShowTopics(ShowTopics node, Optional context) { + public Scope visitShowTopics(ShowTopics node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitShowSubscriptions(ShowSubscriptions node, Optional context) { + public Scope visitShowSubscriptions(ShowSubscriptions node, Optional context) { return createAndAssignScope(node, context); } @Override - protected Scope visitDropSubscription(DropSubscription node, Optional context) { + public Scope visitDropSubscription(DropSubscription node, Optional context) { return createAndAssignScope(node, context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java index 5374a575858b7..d1af74d677c1c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java @@ -103,7 +103,7 @@ public ConvertPredicateToFilterVisitor( } @Override - protected Filter visitInPredicate(InPredicate node, Context context) { + public Filter visitInPredicate(InPredicate node, Context context) { Expression operand = node.getValue(); if (isTimeColumn(operand, timeColumnName)) { return timeFilterVisitor.process(node, null); @@ -376,12 +376,12 @@ public static > T getValue(Literal value, Type dataType) } @Override - protected Filter visitIsNullPredicate(IsNullPredicate node, Context context) { + public Filter visitIsNullPredicate(IsNullPredicate node, Context context) { throw new IllegalArgumentException("IS NULL cannot be pushed down"); } @Override - protected Filter visitIsNotNullPredicate(IsNotNullPredicate node, Context context) { + public Filter visitIsNotNullPredicate(IsNotNullPredicate node, Context context) { checkArgument(isSymbolReference(node.getValue())); SymbolReference operand = (SymbolReference) node.getValue(); checkArgument(context.isMeasurementColumn(operand)); @@ -390,7 +390,7 @@ protected Filter visitIsNotNullPredicate(IsNotNullPredicate node, Context contex } @Override - protected Filter visitLikePredicate(LikePredicate node, Context context) { + public Filter visitLikePredicate(LikePredicate node, Context context) { checkArgument(isSymbolReference(node.getValue())); SymbolReference operand = (SymbolReference) node.getValue(); checkArgument(context.isMeasurementColumn(operand)); @@ -408,7 +408,7 @@ protected Filter visitLikePredicate(LikePredicate node, Context context) { } @Override - protected Filter visitLogicalExpression(LogicalExpression node, Context context) { + public Filter visitLogicalExpression(LogicalExpression node, Context context) { switch (node.getOperator()) { case OR: return FilterFactory.or( @@ -423,12 +423,12 @@ protected Filter visitLogicalExpression(LogicalExpression node, Context context) } @Override - protected Filter visitNotExpression(NotExpression node, Context context) { + public Filter visitNotExpression(NotExpression node, Context context) { return FilterFactory.not(process(node.getValue(), context)); } @Override - protected Filter visitComparisonExpression(ComparisonExpression node, Context context) { + public Filter visitComparisonExpression(ComparisonExpression node, Context context) { if (isTimeColumn(node.getLeft(), timeColumnName) || isTimeColumn(node.getRight(), timeColumnName)) { return timeFilterVisitor.process(node, null); @@ -470,27 +470,27 @@ && isSymbolReference(right) } @Override - protected Filter visitSimpleCaseExpression(SimpleCaseExpression node, Context context) { + public Filter visitSimpleCaseExpression(SimpleCaseExpression node, Context context) { throw new UnsupportedOperationException("Filter push down does not support CASE WHEN"); } @Override - protected Filter visitSearchedCaseExpression(SearchedCaseExpression node, Context context) { + public Filter visitSearchedCaseExpression(SearchedCaseExpression node, Context context) { throw new UnsupportedOperationException("Filter push down does not support CASE WHEN"); } @Override - protected Filter visitIfExpression(IfExpression node, Context context) { + public Filter visitIfExpression(IfExpression node, Context context) { throw new UnsupportedOperationException("Filter push down does not support IF"); } @Override - protected Filter visitNullIfExpression(NullIfExpression node, Context context) { + public Filter visitNullIfExpression(NullIfExpression node, Context context) { throw new UnsupportedOperationException("Filter push down does not support NULLIF"); } @Override - protected Filter visitBetweenPredicate(BetweenPredicate node, Context context) { + public Filter visitBetweenPredicate(BetweenPredicate node, Context context) { Expression firstExpression = node.getValue(); Expression secondExpression = node.getMin(); Expression thirdExpression = node.getMax(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java index f86b74028c8ba..279a37ce45ce6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -64,7 +64,7 @@ public ConvertPredicateToTimeFilterVisitor(ZoneId zoneId, TimeUnit currPrecision } @Override - protected Filter visitInPredicate(InPredicate node, Void context) { + public Filter visitInPredicate(InPredicate node, Void context) { Expression valueList = node.getValueList(); checkArgument(valueList instanceof InListExpression); List values = ((InListExpression) valueList).getValues(); @@ -82,22 +82,22 @@ protected Filter visitInPredicate(InPredicate node, Void context) { } @Override - protected Filter visitIsNullPredicate(IsNullPredicate node, Void context) { + public Filter visitIsNullPredicate(IsNullPredicate node, Void context) { throw new UnsupportedOperationException("TIMESTAMP does not support IS NULL"); } @Override - protected Filter visitIsNotNullPredicate(IsNotNullPredicate node, Void context) { + public Filter visitIsNotNullPredicate(IsNotNullPredicate node, Void context) { throw new UnsupportedOperationException("TIMESTAMP does not support IS NOT NULL"); } @Override - protected Filter visitLikePredicate(LikePredicate node, Void context) { + public Filter visitLikePredicate(LikePredicate node, Void context) { throw new UnsupportedOperationException("TIMESTAMP does not support LIKE"); } @Override - protected Filter visitLogicalExpression(LogicalExpression node, Void context) { + public Filter visitLogicalExpression(LogicalExpression node, Void context) { List filterList = node.getTerms().stream() .map(n -> n.accept(this, context)) @@ -114,12 +114,12 @@ protected Filter visitLogicalExpression(LogicalExpression node, Void context) { } @Override - protected Filter visitNotExpression(NotExpression node, Void context) { + public Filter visitNotExpression(NotExpression node, Void context) { return FilterFactory.not(node.getValue().accept(this, context)); } @Override - protected Filter visitComparisonExpression(ComparisonExpression node, Void context) { + public Filter visitComparisonExpression(ComparisonExpression node, Void context) { long value; if (node.getRight() instanceof SymbolReference) { value = getLongValue(node.getLeft()); @@ -206,27 +206,27 @@ protected Filter visitComparisonExpression(ComparisonExpression node, Void conte } @Override - protected Filter visitSimpleCaseExpression(SimpleCaseExpression node, Void context) { + public Filter visitSimpleCaseExpression(SimpleCaseExpression node, Void context) { throw new UnsupportedOperationException("TIMESTAMP does not CASE WHEN"); } @Override - protected Filter visitSearchedCaseExpression(SearchedCaseExpression node, Void context) { + public Filter visitSearchedCaseExpression(SearchedCaseExpression node, Void context) { throw new UnsupportedOperationException("TIMESTAMP does not CASE WHEN"); } @Override - protected Filter visitIfExpression(IfExpression node, Void context) { + public Filter visitIfExpression(IfExpression node, Void context) { throw new UnsupportedOperationException("TIMESTAMP does not IF"); } @Override - protected Filter visitNullIfExpression(NullIfExpression node, Void context) { + public Filter visitNullIfExpression(NullIfExpression node, Void context) { throw new UnsupportedOperationException("TIMESTAMP does not NULLIF"); } @Override - protected Filter visitBetweenPredicate(BetweenPredicate node, Void context) { + public Filter visitBetweenPredicate(BetweenPredicate node, Void context) { Expression firstExpression = node.getValue(); Expression secondExpression = node.getMin(); Expression thirdExpression = node.getMax(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java index e93882ba70054..729aa04b4aa99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java @@ -61,17 +61,17 @@ public Boolean visitExpression(Expression expression, Void context) { } @Override - protected Boolean visitNotExpression(NotExpression node, Void context) { + public Boolean visitNotExpression(NotExpression node, Void context) { return Boolean.FALSE; } @Override - protected Boolean visitIsNullPredicate(IsNullPredicate node, Void context) { + public Boolean visitIsNullPredicate(IsNullPredicate node, Void context) { return Boolean.FALSE; } @Override - protected Boolean visitInPredicate(InPredicate node, Void context) { + public Boolean visitInPredicate(InPredicate node, Void context) { return isTimeOrMeasurementColumn(node.getValue()) && isInListAllLiteral(node); } @@ -90,14 +90,14 @@ public static Boolean isInListAllLiteral(InPredicate node) { } @Override - protected Boolean visitLikePredicate(LikePredicate node, Void context) { + public Boolean visitLikePredicate(LikePredicate node, Void context) { return isTimeOrMeasurementColumn(node.getValue()) && isLiteral(node.getPattern()) && node.getEscape().map(PredicatePushIntoScanChecker::isLiteral).orElse(true); } @Override - protected Boolean visitLogicalExpression(LogicalExpression node, Void context) { + public Boolean visitLogicalExpression(LogicalExpression node, Void context) { List children = node.getTerms(); for (Expression child : children) { Boolean result = process(child, context); @@ -114,7 +114,7 @@ protected Boolean visitLogicalExpression(LogicalExpression node, Void context) { } @Override - protected Boolean visitComparisonExpression(ComparisonExpression node, Void context) { + public Boolean visitComparisonExpression(ComparisonExpression node, Void context) { return (isTimeOrMeasurementColumn(node.getLeft()) && isLiteral(node.getRight())) || (isTimeOrMeasurementColumn(node.getRight()) && isLiteral(node.getLeft())) || (isExtractTimeOrMeasurementColumn(node.getLeft()) && isLiteral(node.getRight())) @@ -122,7 +122,7 @@ protected Boolean visitComparisonExpression(ComparisonExpression node, Void cont } @Override - protected Boolean visitBetweenPredicate(BetweenPredicate node, Void context) { + public Boolean visitBetweenPredicate(BetweenPredicate node, Void context) { return (isTimeOrMeasurementColumn(node.getValue()) && isLiteral(node.getMin()) && isLiteral(node.getMax())) @@ -139,28 +139,28 @@ && isLiteral(node.getMin()) } @Override - protected Boolean visitIsNotNullPredicate(IsNotNullPredicate node, Void context) { + public Boolean visitIsNotNullPredicate(IsNotNullPredicate node, Void context) { return isTimeOrMeasurementColumn(node.getValue()); } // expression below will be supported later @Override - protected Boolean visitSimpleCaseExpression(SimpleCaseExpression node, Void context) { + public Boolean visitSimpleCaseExpression(SimpleCaseExpression node, Void context) { return Boolean.FALSE; } @Override - protected Boolean visitSearchedCaseExpression(SearchedCaseExpression node, Void context) { + public Boolean visitSearchedCaseExpression(SearchedCaseExpression node, Void context) { return Boolean.FALSE; } @Override - protected Boolean visitIfExpression(IfExpression node, Void context) { + public Boolean visitIfExpression(IfExpression node, Void context) { return Boolean.FALSE; } @Override - protected Boolean visitNullIfExpression(NullIfExpression node, Void context) { + public Boolean visitNullIfExpression(NullIfExpression node, Void context) { return Boolean.FALSE; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java index 8d6d716156702..5a0c32e862c3f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java @@ -63,7 +63,7 @@ * attributeColumn = 'XXX' 4. 'XXX' = attributeColumn 5. tagColumn/attributeColumn IS NULL 6. using * or to combine the above expression */ -public class PredicatePushIntoMetadataChecker extends AstVisitor { +public class PredicatePushIntoMetadataChecker implements AstVisitor { private final Set idOrAttributeColumnNames; @@ -82,125 +82,124 @@ public Boolean visitExpression(final Expression expression, final Void context) } @Override - protected Boolean visitArithmeticBinary( - final ArithmeticBinaryExpression node, final Void context) { + public Boolean visitArithmeticBinary(final ArithmeticBinaryExpression node, final Void context) { return node.getLeft().accept(this, context) && node.getRight().accept(this, context); } @Override - protected Boolean visitArithmeticUnary(final ArithmeticUnaryExpression node, final Void context) { + public Boolean visitArithmeticUnary(final ArithmeticUnaryExpression node, final Void context) { return node.getValue().accept(this, context); } @Override - protected Boolean visitBetweenPredicate(final BetweenPredicate node, final Void context) { + public Boolean visitBetweenPredicate(final BetweenPredicate node, final Void context) { return node.getValue().accept(this, context) && node.getMin().accept(this, context) && node.getMax().accept(this, context); } @Override - protected Boolean visitCast(final Cast node, final Void context) { + public Boolean visitCast(final Cast node, final Void context) { return node.getExpression().accept(this, context); } @Override - protected Boolean visitBooleanLiteral(final BooleanLiteral node, final Void context) { + public Boolean visitBooleanLiteral(final BooleanLiteral node, final Void context) { return true; } @Override - protected Boolean visitBinaryLiteral(final BinaryLiteral node, final Void context) { + public Boolean visitBinaryLiteral(final BinaryLiteral node, final Void context) { return true; } @Override - protected Boolean visitStringLiteral(final StringLiteral node, final Void context) { + public Boolean visitStringLiteral(final StringLiteral node, final Void context) { return true; } @Override - protected Boolean visitLongLiteral(final LongLiteral node, final Void context) { + public Boolean visitLongLiteral(final LongLiteral node, final Void context) { return true; } @Override - protected Boolean visitDoubleLiteral(final DoubleLiteral node, final Void context) { + public Boolean visitDoubleLiteral(final DoubleLiteral node, final Void context) { return true; } @Override - protected Boolean visitFloatLiteral(final FloatLiteral node, final Void context) { + public Boolean visitFloatLiteral(final FloatLiteral node, final Void context) { return true; } @Override - protected Boolean visitDecimalLiteral(final DecimalLiteral node, final Void context) { + public Boolean visitDecimalLiteral(final DecimalLiteral node, final Void context) { return true; } @Override - protected Boolean visitGenericLiteral(final GenericLiteral node, final Void context) { + public Boolean visitGenericLiteral(final GenericLiteral node, final Void context) { return true; } @Override - protected Boolean visitNullLiteral(final NullLiteral node, final Void context) { + public Boolean visitNullLiteral(final NullLiteral node, final Void context) { return true; } @Override - protected Boolean visitComparisonExpression(final ComparisonExpression node, final Void context) { + public Boolean visitComparisonExpression(final ComparisonExpression node, final Void context) { return node.getLeft().accept(this, context) && node.getRight().accept(this, context); } @Override - protected Boolean visitCurrentDatabase(final CurrentDatabase node, final Void context) { + public Boolean visitCurrentDatabase(final CurrentDatabase node, final Void context) { return true; } @Override - protected Boolean visitCurrentTime(final CurrentTime node, final Void context) { + public Boolean visitCurrentTime(final CurrentTime node, final Void context) { return true; } @Override - protected Boolean visitCurrentUser(final CurrentUser node, final Void context) { + public Boolean visitCurrentUser(final CurrentUser node, final Void context) { return true; } @Override - protected Boolean visitFunctionCall(final FunctionCall node, final Void context) { + public Boolean visitFunctionCall(final FunctionCall node, final Void context) { return node.getArguments().stream().allMatch(expression -> expression.accept(this, context)); } @Override - protected Boolean visitInPredicate(final InPredicate node, final Void context) { + public Boolean visitInPredicate(final InPredicate node, final Void context) { return node.getValue().accept(this, context) && node.getValueList().accept(this, context); } @Override - protected Boolean visitInListExpression(final InListExpression node, final Void context) { + public Boolean visitInListExpression(final InListExpression node, final Void context) { return node.getValues().stream().allMatch(expression -> expression.accept(this, context)); } @Override - protected Boolean visitIsNullPredicate(final IsNullPredicate node, final Void context) { + public Boolean visitIsNullPredicate(final IsNullPredicate node, final Void context) { return node.getValue().accept(this, context); } @Override - protected Boolean visitIsNotNullPredicate(final IsNotNullPredicate node, final Void context) { + public Boolean visitIsNotNullPredicate(final IsNotNullPredicate node, final Void context) { return node.getValue().accept(this, context); } @Override - protected Boolean visitLikePredicate(final LikePredicate node, final Void context) { + public Boolean visitLikePredicate(final LikePredicate node, final Void context) { return node.getValue().accept(this, context); } @Override - protected Boolean visitLogicalExpression(final LogicalExpression node, final Void context) { + public Boolean visitLogicalExpression(final LogicalExpression node, final Void context) { final List children = node.getTerms(); for (final Expression child : children) { final Boolean result = process(child, context); @@ -215,7 +214,7 @@ protected Boolean visitLogicalExpression(final LogicalExpression node, final Voi } @Override - protected Boolean visitNotExpression(final NotExpression node, final Void context) { + public Boolean visitNotExpression(final NotExpression node, final Void context) { if (node.getValue() instanceof Literal) { return Boolean.FALSE; } @@ -223,40 +222,40 @@ protected Boolean visitNotExpression(final NotExpression node, final Void contex } @Override - protected Boolean visitSymbolReference(final SymbolReference node, final Void context) { + public Boolean visitSymbolReference(final SymbolReference node, final Void context) { return idOrAttributeColumnNames.contains(node.getName()); } @Override - protected Boolean visitCoalesceExpression(final CoalesceExpression node, final Void context) { + public Boolean visitCoalesceExpression(final CoalesceExpression node, final Void context) { return Boolean.FALSE; } @Override - protected Boolean visitSimpleCaseExpression(final SimpleCaseExpression node, final Void context) { + public Boolean visitSimpleCaseExpression(final SimpleCaseExpression node, final Void context) { return Boolean.FALSE; } @Override - protected Boolean visitSearchedCaseExpression( + public Boolean visitSearchedCaseExpression( final SearchedCaseExpression node, final Void context) { return Boolean.FALSE; } @Override - protected Boolean visitTrim(final Trim node, final Void context) { + public Boolean visitTrim(final Trim node, final Void context) { return node.getTrimSource().accept(this, context) && (!node.getTrimCharacter().isPresent() || node.getTrimCharacter().orElse(null).accept(this, context)); } @Override - protected Boolean visitIfExpression(final IfExpression node, final Void context) { + public Boolean visitIfExpression(final IfExpression node, final Void context) { return Boolean.FALSE; } @Override - protected Boolean visitNullIfExpression(final NullIfExpression node, final Void context) { + public Boolean visitNullIfExpression(final NullIfExpression node, final Void context) { return Boolean.FALSE; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java index 7dca4f07e49a0..43be54a6faa1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java @@ -45,29 +45,29 @@ public Boolean visitExpression(Expression expression, Void context) { } @Override - protected Boolean visitInPredicate(InPredicate node, Void context) { + public Boolean visitInPredicate(InPredicate node, Void context) { return isSymbolReference(node.getValue()); } @Override - protected Boolean visitIsNullPredicate(IsNullPredicate node, Void context) { + public Boolean visitIsNullPredicate(IsNullPredicate node, Void context) { throw new IllegalArgumentException("IS NULL Expression can't be pushed down"); } @Override - protected Boolean visitIsNotNullPredicate(IsNotNullPredicate node, Void context) { + public Boolean visitIsNotNullPredicate(IsNotNullPredicate node, Void context) { return isSymbolReference(node.getValue()); } @Override - protected Boolean visitLikePredicate(LikePredicate node, Void context) { + public Boolean visitLikePredicate(LikePredicate node, Void context) { return isSymbolReference(node.getValue()) && isLiteral(node.getPattern()) && node.getEscape().map(PredicatePushIntoScanChecker::isLiteral).orElse(true); } @Override - protected Boolean visitLogicalExpression(LogicalExpression node, Void context) { + public Boolean visitLogicalExpression(LogicalExpression node, Void context) { List children = node.getTerms(); for (Expression child : children) { if (!process(child, context)) { @@ -78,38 +78,38 @@ protected Boolean visitLogicalExpression(LogicalExpression node, Void context) { } @Override - protected Boolean visitNotExpression(NotExpression node, Void context) { + public Boolean visitNotExpression(NotExpression node, Void context) { throw new IllegalArgumentException("Not Expression can't be pushed down"); } @Override - protected Boolean visitComparisonExpression(ComparisonExpression node, Void context) { + public Boolean visitComparisonExpression(ComparisonExpression node, Void context) { return (isSymbolReference(node.getLeft()) && isLiteral(node.getRight())) || (isSymbolReference(node.getRight()) && isLiteral(node.getLeft())); } @Override - protected Boolean visitSimpleCaseExpression(SimpleCaseExpression node, Void context) { + public Boolean visitSimpleCaseExpression(SimpleCaseExpression node, Void context) { return Boolean.FALSE; } @Override - protected Boolean visitSearchedCaseExpression(SearchedCaseExpression node, Void context) { + public Boolean visitSearchedCaseExpression(SearchedCaseExpression node, Void context) { return Boolean.FALSE; } @Override - protected Boolean visitIfExpression(IfExpression node, Void context) { + public Boolean visitIfExpression(IfExpression node, Void context) { return Boolean.FALSE; } @Override - protected Boolean visitNullIfExpression(NullIfExpression node, Void context) { + public Boolean visitNullIfExpression(NullIfExpression node, Void context) { return Boolean.FALSE; } @Override - protected Boolean visitBetweenPredicate(BetweenPredicate node, Void context) { + public Boolean visitBetweenPredicate(BetweenPredicate node, Void context) { return (isSymbolReference(node.getValue()) && isLiteral(node.getMin()) && isLiteral(node.getMax())) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java index edae4682aeef5..6757b94a0d791 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java @@ -41,7 +41,7 @@ * @param The return type of the visit operation. * @param The context information during visiting. */ -public abstract class PredicateVisitor extends AstVisitor { +public abstract class PredicateVisitor implements AstVisitor { @Override public R visitExpression(Expression expression, C context) { @@ -50,38 +50,38 @@ public R visitExpression(Expression expression, C context) { } @Override - protected abstract R visitInPredicate(InPredicate node, C context); + public abstract R visitInPredicate(InPredicate node, C context); @Override - protected abstract R visitIsNullPredicate(IsNullPredicate node, C context); + public abstract R visitIsNullPredicate(IsNullPredicate node, C context); @Override - protected abstract R visitIsNotNullPredicate(IsNotNullPredicate node, C context); + public abstract R visitIsNotNullPredicate(IsNotNullPredicate node, C context); @Override - protected abstract R visitLikePredicate(LikePredicate node, C context); + public abstract R visitLikePredicate(LikePredicate node, C context); @Override - protected abstract R visitLogicalExpression(LogicalExpression node, C context); + public abstract R visitLogicalExpression(LogicalExpression node, C context); @Override - protected abstract R visitNotExpression(NotExpression node, C context); + public abstract R visitNotExpression(NotExpression node, C context); @Override - protected abstract R visitComparisonExpression(ComparisonExpression node, C context); + public abstract R visitComparisonExpression(ComparisonExpression node, C context); @Override - protected abstract R visitSimpleCaseExpression(SimpleCaseExpression node, C context); + public abstract R visitSimpleCaseExpression(SimpleCaseExpression node, C context); @Override - protected abstract R visitSearchedCaseExpression(SearchedCaseExpression node, C context); + public abstract R visitSearchedCaseExpression(SearchedCaseExpression node, C context); @Override - protected abstract R visitIfExpression(IfExpression node, C context); + public abstract R visitIfExpression(IfExpression node, C context); @Override - protected abstract R visitNullIfExpression(NullIfExpression node, C context); + public abstract R visitNullIfExpression(NullIfExpression node, C context); @Override - protected abstract R visitBetweenPredicate(BetweenPredicate node, C context); + public abstract R visitBetweenPredicate(BetweenPredicate node, C context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java index e593edc504b8e..84f99855658f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java @@ -41,7 +41,7 @@ // Return whether input expression can not be bounded to a single ID public class CheckSchemaPredicateVisitor - extends AstVisitor { + implements AstVisitor { private static final Logger LOGGER = LoggerFactory.getLogger(CheckSchemaPredicateVisitor.class); private static final long LOG_INTERVAL_MS = 60_000L; @@ -53,7 +53,7 @@ public Boolean visitExpression(final Expression node, final Context context) { } @Override - protected Boolean visitLogicalExpression(final LogicalExpression node, final Context context) { + public Boolean visitLogicalExpression(final LogicalExpression node, final Context context) { if (node.getOperator().equals(LogicalExpression.Operator.AND)) { if (System.currentTimeMillis() - lastLogTime >= LOG_INTERVAL_MS) { LOGGER.info( @@ -71,7 +71,7 @@ protected Boolean visitLogicalExpression(final LogicalExpression node, final Con } @Override - protected Boolean visitNotExpression(final NotExpression node, final Context context) { + public Boolean visitNotExpression(final NotExpression node, final Context context) { if (node.getValue().getExpressionType().equals(TableExpressionType.LOGICAL_EXPRESSION)) { if (System.currentTimeMillis() - lastLogTime >= LOG_INTERVAL_MS) { LOGGER.info( @@ -85,14 +85,13 @@ protected Boolean visitNotExpression(final NotExpression node, final Context con } @Override - protected Boolean visitComparisonExpression( - final ComparisonExpression node, final Context context) { + public Boolean visitComparisonExpression(final ComparisonExpression node, final Context context) { return !(node.getLeft() instanceof Literal) && !(node.getRight() instanceof Literal) || processColumn(node, context); } @Override - protected Boolean visitBetweenPredicate(final BetweenPredicate node, final Context context) { + public Boolean visitBetweenPredicate(final BetweenPredicate node, final Context context) { return node.getValue() instanceof SymbolReference && (node.getMin() instanceof SymbolReference || node.getMax() instanceof SymbolReference) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java index 49725a3abaaa3..6733f1b15e755 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java @@ -74,7 +74,7 @@ public class ConvertSchemaPredicateToFilterVisitor extends PredicateVisitor { @Override - protected @Nullable SchemaFilter visitInPredicate(final InPredicate node, final Context context) { + public @Nullable SchemaFilter visitInPredicate(final InPredicate node, final Context context) { final Expression valueList = node.getValueList(); checkArgument(valueList instanceof InListExpression); final List values = ((InListExpression) valueList).getValues(); @@ -94,13 +94,13 @@ public class ConvertSchemaPredicateToFilterVisitor } @Override - protected SchemaFilter visitIsNullPredicate(final IsNullPredicate node, final Context context) { + public SchemaFilter visitIsNullPredicate(final IsNullPredicate node, final Context context) { return wrapIdOrAttributeFilter( new PreciseFilter((String) null), ((SymbolReference) node.getValue()).getName(), context); } @Override - protected SchemaFilter visitIsNotNullPredicate( + public SchemaFilter visitIsNotNullPredicate( final IsNotNullPredicate node, final Context context) { return wrapIdOrAttributeFilter( new NotFilter(new PreciseFilter((String) null)), @@ -109,7 +109,7 @@ protected SchemaFilter visitIsNotNullPredicate( } @Override - protected @Nullable SchemaFilter visitLikePredicate( + public @Nullable SchemaFilter visitLikePredicate( final LikePredicate node, final Context context) { // TODO: Support stringLiteral like id/attr? if (!(node.getValue() instanceof SymbolReference) @@ -127,7 +127,7 @@ protected SchemaFilter visitIsNotNullPredicate( } @Override - protected @Nullable SchemaFilter visitLogicalExpression( + public @Nullable SchemaFilter visitLogicalExpression( final LogicalExpression node, final Context context) { final List children = new ArrayList<>(); for (final Expression term : node.getTerms()) { @@ -144,14 +144,14 @@ protected SchemaFilter visitIsNotNullPredicate( } @Override - protected @Nullable SchemaFilter visitNotExpression( + public @Nullable SchemaFilter visitNotExpression( final NotExpression node, final Context context) { final SchemaFilter result = node.getValue().accept(this, context); return Objects.nonNull(result) ? new NotFilter(result) : null; } @Override - protected @Nullable SchemaFilter visitComparisonExpression( + public @Nullable SchemaFilter visitComparisonExpression( final ComparisonExpression node, final Context context) { final String columnName; final String value; @@ -210,29 +210,29 @@ private ComparisonFilter.Operator convertExpressionOperator2SchemaOperator( } @Override - protected SchemaFilter visitSimpleCaseExpression( + public SchemaFilter visitSimpleCaseExpression( final SimpleCaseExpression node, final Context context) { return visitExpression(node, context); } @Override - protected SchemaFilter visitSearchedCaseExpression( + public SchemaFilter visitSearchedCaseExpression( final SearchedCaseExpression node, final Context context) { return visitExpression(node, context); } @Override - protected SchemaFilter visitIfExpression(final IfExpression node, final Context context) { + public SchemaFilter visitIfExpression(final IfExpression node, final Context context) { return visitExpression(node, context); } @Override - protected SchemaFilter visitNullIfExpression(final NullIfExpression node, final Context context) { + public SchemaFilter visitNullIfExpression(final NullIfExpression node, final Context context) { return visitExpression(node, context); } @Override - protected SchemaFilter visitBetweenPredicate(final BetweenPredicate node, final Context context) { + public SchemaFilter visitBetweenPredicate(final BetweenPredicate node, final Context context) { return visitExpression(node, context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java index 267f58dfc6cf5..4c18c086fbecf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java @@ -46,44 +46,44 @@ public String visitExpression(final Expression expression, final Void context) { } @Override - protected String visitInPredicate(final InPredicate node, final Void context) { + public String visitInPredicate(final InPredicate node, final Void context) { return node.getValue().accept(this, context); } @Override - protected String visitIsNullPredicate(final IsNullPredicate node, final Void context) { + public String visitIsNullPredicate(final IsNullPredicate node, final Void context) { return node.getValue().accept(this, context); } @Override - protected String visitIsNotNullPredicate(final IsNotNullPredicate node, final Void context) { + public String visitIsNotNullPredicate(final IsNotNullPredicate node, final Void context) { return node.getValue().accept(this, context); } @Override - protected String visitLikePredicate(final LikePredicate node, final Void context) { + public String visitLikePredicate(final LikePredicate node, final Void context) { return node.getValue().accept(this, context); } @Override - protected String visitLogicalExpression(final LogicalExpression node, final Void context) { + public String visitLogicalExpression(final LogicalExpression node, final Void context) { throw new UnsupportedOperationException("The logical expression has no bounded column"); } @Override - protected String visitNotExpression(final NotExpression node, final Void context) { + public String visitNotExpression(final NotExpression node, final Void context) { throw new UnsupportedOperationException("The not expression has no bounded column"); } @Override - protected String visitComparisonExpression(final ComparisonExpression node, final Void context) { + public String visitComparisonExpression(final ComparisonExpression node, final Void context) { return node.getLeft() instanceof Literal ? node.getRight().accept(this, context) : node.getLeft().accept(this, context); } @Override - protected String visitBetweenPredicate(final BetweenPredicate node, final Void context) { + public String visitBetweenPredicate(final BetweenPredicate node, final Void context) { if (node.getValue() instanceof SymbolReference) { return node.getValue().accept(this, context); } @@ -97,28 +97,27 @@ protected String visitBetweenPredicate(final BetweenPredicate node, final Void c } @Override - protected String visitSymbolReference(final SymbolReference node, final Void context) { + public String visitSymbolReference(final SymbolReference node, final Void context) { return node.getName(); } @Override - protected String visitSimpleCaseExpression(final SimpleCaseExpression node, final Void context) { + public String visitSimpleCaseExpression(final SimpleCaseExpression node, final Void context) { return null; } @Override - protected String visitSearchedCaseExpression( - final SearchedCaseExpression node, final Void context) { + public String visitSearchedCaseExpression(final SearchedCaseExpression node, final Void context) { return null; } @Override - protected String visitIfExpression(final IfExpression node, final Void context) { + public String visitIfExpression(final IfExpression node, final Void context) { return null; } @Override - protected String visitNullIfExpression(final NullIfExpression node, final Void context) { + public String visitNullIfExpression(final NullIfExpression node, final Void context) { return null; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java index dc4c105512cdd..f2ad010f07cb3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java @@ -143,7 +143,7 @@ public Object optimize(SymbolResolver inputs) { return new Visitor(true).processWithExceptionHandling(expression, inputs); } - private class Visitor extends AstVisitor { + private class Visitor implements AstVisitor { private final boolean optimize; private Visitor(boolean optimize) { @@ -173,17 +173,17 @@ private Object processWithExceptionHandling(Expression expression, Object contex } @Override - protected Object visitSymbolReference(SymbolReference node, Object context) { + public Object visitSymbolReference(SymbolReference node, Object context) { return ((SymbolResolver) context).getValue(Symbol.from(node)); } @Override - protected Object visitLiteral(Literal node, Object context) { + public Object visitLiteral(Literal node, Object context) { return literalInterpreter.evaluate(node, type(node)); } @Override - protected Object visitIsNullPredicate(IsNullPredicate node, Object context) { + public Object visitIsNullPredicate(IsNullPredicate node, Object context) { Object value = processWithExceptionHandling(node.getValue(), context); if (value instanceof Expression) { @@ -194,7 +194,7 @@ protected Object visitIsNullPredicate(IsNullPredicate node, Object context) { } @Override - protected Object visitIsNotNullPredicate(IsNotNullPredicate node, Object context) { + public Object visitIsNotNullPredicate(IsNotNullPredicate node, Object context) { Object value = processWithExceptionHandling(node.getValue(), context); if (value instanceof Expression) { @@ -205,7 +205,7 @@ protected Object visitIsNotNullPredicate(IsNotNullPredicate node, Object context } @Override - protected Object visitSearchedCaseExpression(SearchedCaseExpression node, Object context) { + public Object visitSearchedCaseExpression(SearchedCaseExpression node, Object context) { Object newDefault = null; boolean foundNewDefault = false; @@ -248,7 +248,7 @@ protected Object visitSearchedCaseExpression(SearchedCaseExpression node, Object } @Override - protected Object visitIfExpression(IfExpression node, Object context) { + public Object visitIfExpression(IfExpression node, Object context) { Object condition = processWithExceptionHandling(node.getCondition(), context); if (condition instanceof Expression) { @@ -269,7 +269,7 @@ protected Object visitIfExpression(IfExpression node, Object context) { } @Override - protected Object visitSimpleCaseExpression(SimpleCaseExpression node, Object context) { + public Object visitSimpleCaseExpression(SimpleCaseExpression node, Object context) { Object operand = processWithExceptionHandling(node.getOperand(), context); Type operandType = type(node.getOperand()); @@ -336,7 +336,7 @@ private Type type(Expression expression) { } @Override - protected Object visitCoalesceExpression(CoalesceExpression node, Object context) { + public Object visitCoalesceExpression(CoalesceExpression node, Object context) { List newOperands = processOperands(node, context); if (newOperands.isEmpty()) { return null; @@ -391,7 +391,7 @@ private List processOperands(CoalesceExpression node, Object context) { } @Override - protected Object visitInPredicate(InPredicate node, Object context) { + public Object visitInPredicate(InPredicate node, Object context) { Object value = processWithExceptionHandling(node.getValue(), context); InListExpression valueList = (InListExpression) node.getValueList(); @@ -494,7 +494,7 @@ protected Object visitInPredicate(InPredicate node, Object context) { } @Override - protected Object visitArithmeticUnary(ArithmeticUnaryExpression node, Object context) { + public Object visitArithmeticUnary(ArithmeticUnaryExpression node, Object context) { Object value = processWithExceptionHandling(node.getValue(), context); if (value == null) { return null; @@ -535,7 +535,7 @@ protected Object visitArithmeticUnary(ArithmeticUnaryExpression node, Object con } @Override - protected Object visitArithmeticBinary(ArithmeticBinaryExpression node, Object context) { + public Object visitArithmeticBinary(ArithmeticBinaryExpression node, Object context) { Object left = processWithExceptionHandling(node.getLeft(), context); if (left == null) { return null; @@ -563,7 +563,7 @@ protected Object visitArithmeticBinary(ArithmeticBinaryExpression node, Object c } @Override - protected Object visitComparisonExpression(ComparisonExpression node, Object context) { + public Object visitComparisonExpression(ComparisonExpression node, Object context) { ComparisonExpression.Operator operator = node.getOperator(); Expression left = node.getLeft(); Expression right = node.getRight(); @@ -747,7 +747,7 @@ private ComparisonExpression flipComparison(ComparisonExpression comparisonExpre } @Override - protected Object visitBetweenPredicate(BetweenPredicate node, Object context) { + public Object visitBetweenPredicate(BetweenPredicate node, Object context) { Object value = processWithExceptionHandling(node.getValue(), context); if (value == null) { return null; @@ -792,7 +792,7 @@ protected Object visitBetweenPredicate(BetweenPredicate node, Object context) { } @Override - protected Object visitNotExpression(NotExpression node, Object context) { + public Object visitNotExpression(NotExpression node, Object context) { Object value = processWithExceptionHandling(node.getValue(), context); if (value == null) { return null; @@ -806,7 +806,7 @@ protected Object visitNotExpression(NotExpression node, Object context) { } @Override - protected Object visitLogicalExpression(LogicalExpression node, Object context) { + public Object visitLogicalExpression(LogicalExpression node, Object context) { List terms = new ArrayList<>(); List types = new ArrayList<>(); @@ -859,12 +859,12 @@ protected Object visitLogicalExpression(LogicalExpression node, Object context) } @Override - protected Object visitBooleanLiteral(BooleanLiteral node, Object context) { + public Object visitBooleanLiteral(BooleanLiteral node, Object context) { return node.equals(BooleanLiteral.TRUE_LITERAL); } @Override - protected Object visitFunctionCall(FunctionCall node, Object context) { + public Object visitFunctionCall(FunctionCall node, Object context) { List argumentTypes = new ArrayList<>(); List argumentValues = new ArrayList<>(); for (Expression expr : node.getArguments()) { @@ -920,7 +920,7 @@ public Object visitCast(Cast node, Object context) { } @Override - protected Object visitExtract(Extract node, Object context) { + public Object visitExtract(Extract node, Object context) { Object value = processWithExceptionHandling(node.getExpression(), context); if (value == null) { return null; @@ -937,7 +937,7 @@ protected Object visitExtract(Extract node, Object context) { } @Override - protected Object visitExpression(Expression node, Object context) { + public Object visitExpression(Expression node, Object context) { throw new SemanticException("not yet implemented: " + node.getClass().getName()); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java index 97136d60ca0e3..b503a5fbb37de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java @@ -125,7 +125,7 @@ public Type getType(SessionInfo session, TypeProvider inputTypes, Expression exp return getTypes(session, inputTypes, expression).get(NodeRef.of(expression)); } - private static class Visitor extends AstVisitor { + private static class Visitor implements AstVisitor { private static final AccessControl ALLOW_ALL_ACCESS_CONTROL = new AllowAllAccessControl(); private final PlannerContext plannerContext; @@ -161,11 +161,11 @@ public Type process(Node node, Context context) { return type; } } - return super.process(node, context); + return AstVisitor.super.process(node, context); } @Override - protected Type visitSymbolReference(SymbolReference node, Context context) { + public Type visitSymbolReference(SymbolReference node, Context context) { Symbol symbol = Symbol.from(node); Type type = context.getArgumentTypes().get(symbol); if (type == null) { @@ -176,38 +176,38 @@ protected Type visitSymbolReference(SymbolReference node, Context context) { } @Override - protected Type visitNotExpression(NotExpression node, Context context) { + public Type visitNotExpression(NotExpression node, Context context) { process(node.getValue(), context); return setExpressionType(node, BOOLEAN); } @Override - protected Type visitLogicalExpression(LogicalExpression node, Context context) { + public Type visitLogicalExpression(LogicalExpression node, Context context) { node.getTerms().forEach(term -> process(term, context)); return setExpressionType(node, BOOLEAN); } @Override - protected Type visitComparisonExpression(ComparisonExpression node, Context context) { + public Type visitComparisonExpression(ComparisonExpression node, Context context) { process(node.getLeft(), context); process(node.getRight(), context); return setExpressionType(node, BOOLEAN); } @Override - protected Type visitIsNullPredicate(IsNullPredicate node, Context context) { + public Type visitIsNullPredicate(IsNullPredicate node, Context context) { process(node.getValue(), context); return setExpressionType(node, BOOLEAN); } @Override - protected Type visitIsNotNullPredicate(IsNotNullPredicate node, Context context) { + public Type visitIsNotNullPredicate(IsNotNullPredicate node, Context context) { process(node.getValue(), context); return setExpressionType(node, BOOLEAN); } @Override - protected Type visitNullIfExpression(NullIfExpression node, Context context) { + public Type visitNullIfExpression(NullIfExpression node, Context context) { Type firstType = process(node.getFirst(), context); Type ignored = process(node.getSecond(), context); @@ -222,7 +222,7 @@ protected Type visitNullIfExpression(NullIfExpression node, Context context) { } @Override - protected Type visitIfExpression(IfExpression node, Context context) { + public Type visitIfExpression(IfExpression node, Context context) { Type conditionType = process(node.getCondition(), context); checkArgument(conditionType.equals(BOOLEAN), "Condition must be boolean: %s", conditionType); @@ -237,7 +237,7 @@ protected Type visitIfExpression(IfExpression node, Context context) { } @Override - protected Type visitSearchedCaseExpression(SearchedCaseExpression node, Context context) { + public Type visitSearchedCaseExpression(SearchedCaseExpression node, Context context) { for (WhenClause whenClause : node.getWhenClauses()) { coerceType( context, @@ -266,7 +266,7 @@ protected Type visitSearchedCaseExpression(SearchedCaseExpression node, Context } @Override - protected Type visitSimpleCaseExpression(SimpleCaseExpression node, Context context) { + public Type visitSimpleCaseExpression(SimpleCaseExpression node, Context context) { Type operandType = process(node.getOperand(), context); LinkedHashSet resultTypes = @@ -306,7 +306,7 @@ protected Type visitSimpleCaseExpression(SimpleCaseExpression node, Context cont } @Override - protected Type visitCoalesceExpression(CoalesceExpression node, Context context) { + public Type visitCoalesceExpression(CoalesceExpression node, Context context) { LinkedHashSet types = node.getOperands().stream() .map(operand -> process(operand, context)) @@ -320,18 +320,18 @@ protected Type visitCoalesceExpression(CoalesceExpression node, Context context) } @Override - protected Type visitArithmeticUnary(ArithmeticUnaryExpression node, Context context) { + public Type visitArithmeticUnary(ArithmeticUnaryExpression node, Context context) { return setExpressionType(node, process(node.getValue(), context)); } @Override - protected Type visitExtract(Extract node, Context context) { + public Type visitExtract(Extract node, Context context) { process(node.getExpression(), context); return setExpressionType(node, INT64); } @Override - protected Type visitArithmeticBinary(ArithmeticBinaryExpression node, Context context) { + public Type visitArithmeticBinary(ArithmeticBinaryExpression node, Context context) { ImmutableList.Builder argumentTypes = ImmutableList.builder(); argumentTypes.add(process(node.getLeft(), context)); argumentTypes.add(process(node.getRight(), context)); @@ -349,17 +349,17 @@ protected Type visitArithmeticBinary(ArithmeticBinaryExpression node, Context co } @Override - protected Type visitStringLiteral(StringLiteral node, Context context) { + public Type visitStringLiteral(StringLiteral node, Context context) { return setExpressionType(node, StringType.STRING); } @Override - protected Type visitBinaryLiteral(BinaryLiteral node, Context context) { + public Type visitBinaryLiteral(BinaryLiteral node, Context context) { return setExpressionType(node, BlobType.BLOB); } @Override - protected Type visitLongLiteral(LongLiteral node, Context context) { + public Type visitLongLiteral(LongLiteral node, Context context) { if (node.getParsedValue() >= Integer.MIN_VALUE && node.getParsedValue() <= Integer.MAX_VALUE) { return setExpressionType(node, INT32); @@ -369,22 +369,22 @@ protected Type visitLongLiteral(LongLiteral node, Context context) { } @Override - protected Type visitDoubleLiteral(DoubleLiteral node, Context context) { + public Type visitDoubleLiteral(DoubleLiteral node, Context context) { return setExpressionType(node, DOUBLE); } @Override - protected Type visitFloatLiteral(FloatLiteral node, Context context) { + public Type visitFloatLiteral(FloatLiteral node, Context context) { return setExpressionType(node, FLOAT); } @Override - protected Type visitBooleanLiteral(BooleanLiteral node, Context context) { + public Type visitBooleanLiteral(BooleanLiteral node, Context context) { return setExpressionType(node, BOOLEAN); } @Override - protected Type visitGenericLiteral(GenericLiteral node, Context context) { + public Type visitGenericLiteral(GenericLiteral node, Context context) { Type type; if (DateType.DATE.getTypeEnum().name().equals(node.getType())) { type = DateType.DATE; @@ -399,12 +399,12 @@ protected Type visitGenericLiteral(GenericLiteral node, Context context) { } @Override - protected Type visitNullLiteral(NullLiteral node, Context context) { + public Type visitNullLiteral(NullLiteral node, Context context) { return setExpressionType(node, UNKNOWN); } @Override - protected Type visitFunctionCall(FunctionCall node, Context context) { + public Type visitFunctionCall(FunctionCall node, Context context) { // Function should already be resolved in IR List argumentTypes = new ArrayList<>(node.getArguments().size()); for (int i = 0; i < node.getArguments().size(); i++) { @@ -420,7 +420,7 @@ protected Type visitFunctionCall(FunctionCall node, Context context) { } @Override - protected Type visitBetweenPredicate(BetweenPredicate node, Context context) { + public Type visitBetweenPredicate(BetweenPredicate node, Context context) { process(node.getValue(), context); process(node.getMin(), context); process(node.getMax(), context); @@ -436,7 +436,7 @@ public Type visitCast(Cast node, Context context) { } @Override - protected Type visitInPredicate(InPredicate node, Context context) { + public Type visitInPredicate(InPredicate node, Context context) { Expression value = node.getValue(); InListExpression valueList = (InListExpression) node.getValueList(); @@ -451,7 +451,7 @@ protected Type visitInPredicate(InPredicate node, Context context) { } @Override - protected Type visitRow(Row node, Context context) { + public Type visitRow(Row node, Context context) { List types = node.getItems().stream().map(child -> process(child, context)).collect(toImmutableList()); @@ -459,7 +459,7 @@ protected Type visitRow(Row node, Context context) { } @Override - protected Type visitLikePredicate(LikePredicate node, Context context) { + public Type visitLikePredicate(LikePredicate node, Context context) { process(node.getValue(), context); process(node.getPattern(), context); node.getEscape().ifPresent(e -> process(e, context)); @@ -467,23 +467,23 @@ protected Type visitLikePredicate(LikePredicate node, Context context) { } @Override - protected Type visitCurrentDatabase(final CurrentDatabase node, final Context context) { + public Type visitCurrentDatabase(final CurrentDatabase node, final Context context) { return setExpressionType(node, StringType.STRING); } @Override - protected Type visitCurrentUser(final CurrentUser node, final Context context) { + public Type visitCurrentUser(final CurrentUser node, final Context context) { return setExpressionType(node, StringType.STRING); } @Override - protected Type visitExpression(Expression node, Context context) { + public Type visitExpression(Expression node, Context context) { throw new UnsupportedOperationException( "Not a valid IR expression: " + node.getClass().getName()); } @Override - protected Type visitNode(Node node, Context context) { + public Type visitNode(Node node, Context context) { throw new UnsupportedOperationException( "Not a valid IR expression: " + node.getClass().getName()); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java index 0305bab99cdbe..d078c89a1374a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java @@ -59,7 +59,7 @@ public Object evaluate(Expression node, Type type) { return new LiteralVisitor(type).process(node, null); } - private class LiteralVisitor extends AstVisitor { + private class LiteralVisitor implements AstVisitor { private final Type type; private LiteralVisitor(Type type) { @@ -67,42 +67,42 @@ private LiteralVisitor(Type type) { } @Override - protected Object visitLiteral(Literal node, Void context) { + public Object visitLiteral(Literal node, Void context) { throw new UnsupportedOperationException("Unhandled literal type: " + node); } @Override - protected Boolean visitBooleanLiteral(BooleanLiteral node, Void context) { + public Boolean visitBooleanLiteral(BooleanLiteral node, Void context) { return node.getValue(); } @Override - protected Long visitLongLiteral(LongLiteral node, Void context) { + public Long visitLongLiteral(LongLiteral node, Void context) { return node.getParsedValue(); } @Override - protected Double visitDoubleLiteral(DoubleLiteral node, Void context) { + public Double visitDoubleLiteral(DoubleLiteral node, Void context) { return node.getValue(); } @Override - protected Float visitFloatLiteral(FloatLiteral node, Void context) { + public Float visitFloatLiteral(FloatLiteral node, Void context) { return node.getValue(); } @Override - protected Binary visitStringLiteral(StringLiteral node, Void context) { + public Binary visitStringLiteral(StringLiteral node, Void context) { return new Binary(node.getValue(), TSFileConfig.STRING_CHARSET); } @Override - protected Binary visitBinaryLiteral(BinaryLiteral node, Void context) { + public Binary visitBinaryLiteral(BinaryLiteral node, Void context) { return new Binary(node.getValue()); } @Override - protected Object visitGenericLiteral(GenericLiteral node, Void context) { + public Object visitGenericLiteral(GenericLiteral node, Void context) { if (type.equals(TimestampType.TIMESTAMP)) { return Long.parseLong(node.getValue()); } else if (type.equals(DateType.DATE)) { @@ -113,7 +113,7 @@ protected Object visitGenericLiteral(GenericLiteral node, Void context) { } @Override - protected Object visitNullLiteral(NullLiteral node, Void context) { + public Object visitNullLiteral(NullLiteral node, Void context) { return null; } } 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 2c09ecedb9fd7..1b717e1edad62 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 @@ -184,7 +184,7 @@ import static org.apache.tsfile.read.common.type.LongType.INT64; import static org.apache.tsfile.read.common.type.StringType.STRING; -public class RelationPlanner extends AstVisitor { +public class RelationPlanner implements AstVisitor { private final Analysis analysis; private final SymbolAllocator symbolAllocator; @@ -238,7 +238,7 @@ public RelationPlanner( } @Override - protected RelationPlan visitQuery(final Query node, final Void context) { + public RelationPlan visitQuery(final Query node, final Void context) { return new QueryPlanner( analysis, symbolAllocator, @@ -251,7 +251,7 @@ protected RelationPlan visitQuery(final Query node, final Void context) { } @Override - protected RelationPlan visitTable(final Table table, final Void context) { + public RelationPlan visitTable(final Table table, final Void context) { // is this a recursive reference in expandable named query? If so, there's base relation already // planned. final RelationPlan expansion = recursiveSubqueries.get(NodeRef.of(table)); @@ -408,8 +408,7 @@ private RelationPlan processPhysicalTable(Table table, Scope scope) { } @Override - protected RelationPlan visitQuerySpecification( - final QuerySpecification node, final Void context) { + public RelationPlan visitQuerySpecification(final QuerySpecification node, final Void context) { return new QueryPlanner( analysis, symbolAllocator, @@ -422,19 +421,19 @@ protected RelationPlan visitQuerySpecification( } @Override - protected RelationPlan visitNode(final Node node, final Void context) { + public RelationPlan visitNode(final Node node, final Void context) { throw new IllegalStateException("Unsupported node type: " + node.getClass().getName()); } @Override - protected RelationPlan visitTableSubquery(final TableSubquery node, final Void context) { + public RelationPlan visitTableSubquery(final TableSubquery node, final Void context) { final RelationPlan plan = process(node.getQuery(), context); return new RelationPlan( plan.getRoot(), analysis.getScope(node), plan.getFieldMappings(), outerContext); } @Override - protected RelationPlan visitJoin(final Join node, final Void context) { + public RelationPlan visitJoin(final Join node, final Void context) { final RelationPlan leftPlan = process(node.getLeft(), context); final RelationPlan rightPlan = process(node.getRight(), context); @@ -864,7 +863,7 @@ private static boolean isEqualComparisonExpression(Expression conjunct) { } @Override - protected RelationPlan visitAliasedRelation(AliasedRelation node, Void context) { + public RelationPlan visitAliasedRelation(AliasedRelation node, Void context) { RelationPlan subPlan = process(node.getRelation(), context); PlanNode root = subPlan.getRoot(); @@ -887,12 +886,12 @@ protected RelationPlan visitAliasedRelation(AliasedRelation node, Void context) } @Override - protected RelationPlan visitSubqueryExpression(SubqueryExpression node, Void context) { + public RelationPlan visitSubqueryExpression(SubqueryExpression node, Void context) { return process(node.getQuery(), context); } @Override - protected RelationPlan visitPatternRecognitionRelation( + public RelationPlan visitPatternRecognitionRelation( PatternRecognitionRelation node, Void context) { RelationPlan subPlan = process(node.getInput(), context); @@ -1213,7 +1212,7 @@ private SkipToPosition mapSkipToPosition(SkipTo.Position position) { } @Override - protected RelationPlan visitUnion(Union node, Void context) { + public RelationPlan visitUnion(Union node, Void context) { Preconditions.checkArgument(!node.getRelations().isEmpty(), "No relations specified for UNION"); SetOperationPlan setOperationPlan = process(node); @@ -1232,7 +1231,7 @@ protected RelationPlan visitUnion(Union node, Void context) { } @Override - protected RelationPlan visitIntersect(Intersect node, Void context) { + public RelationPlan visitIntersect(Intersect node, Void context) { Preconditions.checkArgument( !node.getRelations().isEmpty(), "No relations specified for intersect"); SetOperationPlan setOperationPlan = process(node); @@ -1250,7 +1249,7 @@ protected RelationPlan visitIntersect(Intersect node, Void context) { } @Override - protected RelationPlan visitExcept(Except node, Void context) { + public RelationPlan visitExcept(Except node, Void context) { Preconditions.checkArgument( !node.getRelations().isEmpty(), "No relations specified for except"); SetOperationPlan setOperationPlan = process(node); @@ -1309,12 +1308,12 @@ private PlanNode distinct(PlanNode node) { // ================================ Implemented later ===================================== @Override - protected RelationPlan visitValues(Values node, Void context) { + public RelationPlan visitValues(Values node, Void context) { throw new IllegalStateException("Values is not supported in current version."); } @Override - protected RelationPlan visitInsertTablet(InsertTablet node, Void context) { + public RelationPlan visitInsertTablet(InsertTablet node, Void context) { final InsertTabletStatement insertTabletStatement = node.getInnerTreeStatement(); String[] measurements = insertTabletStatement.getMeasurements(); @@ -1343,14 +1342,14 @@ protected RelationPlan visitInsertTablet(InsertTablet node, Void context) { } @Override - protected RelationPlan visitInsertRow(InsertRow node, Void context) { + public RelationPlan visitInsertRow(InsertRow node, Void context) { InsertRowStatement insertRowStatement = node.getInnerTreeStatement(); RelationalInsertRowNode insertNode = fromInsertRowStatement(insertRowStatement); return new RelationPlan( insertNode, analysis.getRootScope(), Collections.emptyList(), outerContext); } - protected RelationalInsertRowNode fromInsertRowStatement( + public RelationalInsertRowNode fromInsertRowStatement( final InsertRowStatement insertRowStatement) { String[] measurements = insertRowStatement.getMeasurements(); @@ -1374,7 +1373,7 @@ protected RelationalInsertRowNode fromInsertRowStatement( } @Override - protected RelationPlan visitInsertRows(final InsertRows node, final Void context) { + public RelationPlan visitInsertRows(final InsertRows node, final Void context) { final InsertRowsStatement insertRowsStatement = node.getInnerTreeStatement(); final List indices = new ArrayList<>(); final List insertRowStatements = new ArrayList<>(); @@ -1390,7 +1389,7 @@ protected RelationPlan visitInsertRows(final InsertRows node, final Void context } @Override - protected RelationPlan visitLoadTsFile(final LoadTsFile node, final Void context) { + public RelationPlan visitLoadTsFile(final LoadTsFile node, final Void context) { final List isTableModel = new ArrayList<>(); for (int i = 0; i < node.getResources().size(); i++) { isTableModel.add(node.getIsTableModel().get(i)); @@ -1408,7 +1407,7 @@ protected RelationPlan visitLoadTsFile(final LoadTsFile node, final Void context } @Override - protected RelationPlan visitPipeEnriched(final PipeEnriched node, final Void context) { + public RelationPlan visitPipeEnriched(final PipeEnriched node, final Void context) { final RelationPlan relationPlan = node.getInnerStatement().accept(this, context); if (relationPlan.getRoot() instanceof LoadTsFileNode) { @@ -1435,7 +1434,7 @@ protected RelationPlan visitPipeEnriched(final PipeEnriched node, final Void con } @Override - protected RelationPlan visitDelete(final Delete node, final Void context) { + public RelationPlan visitDelete(final Delete node, final Void context) { return new RelationPlan( new RelationalDeleteDataNode(idAllocator.genPlanNodeId(), node), analysis.getRootScope(), diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java index ca5fed1b160d0..4d28fa64b2d74 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java @@ -150,14 +150,13 @@ public static Set extractOutputSymbols(PlanNode planNode, Lookup lookup) private static class SymbolBuilderVisitor extends DefaultExpressionTraversalVisitor> { @Override - protected Void visitSymbolReference( - SymbolReference node, ImmutableList.Builder builder) { + public Void visitSymbolReference(SymbolReference node, ImmutableList.Builder builder) { builder.add(Symbol.from(node)); return null; } /*@Override - protected Void visitLambdaExpression(LambdaExpression node, ImmutableList.Builder context) + public Void visitLambdaExpression(LambdaExpression node, ImmutableList.Builder context) { // Symbols in lambda expression are bound to lambda arguments, so no need to extract them return null; @@ -176,7 +175,7 @@ private QualifiedNameBuilderVisitor( } @Override - protected Void visitDereferenceExpression( + public Void visitDereferenceExpression( DereferenceExpression node, ImmutableSet.Builder builder) { if (columnReferences.contains(NodeRef.of(node))) { builder.add(DereferenceExpression.getQualifiedName(node)); @@ -187,13 +186,13 @@ protected Void visitDereferenceExpression( } @Override - protected Void visitIdentifier(Identifier node, ImmutableSet.Builder builder) { + public Void visitIdentifier(Identifier node, ImmutableSet.Builder builder) { builder.add(QualifiedName.of(node.getValue())); return null; } @Override - protected Void visitSubqueryExpression( + public Void visitSubqueryExpression( SubqueryExpression node, ImmutableSet.Builder context) { if (!recurseIntoSubqueries) { return null; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java index 9771240137076..caa012287eb0f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java @@ -37,15 +37,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -public abstract class DefaultTraversalVisitor extends AstVisitor { +public abstract class DefaultTraversalVisitor implements AstVisitor { @Override - protected Void visitCast(Cast node, C context) { + public Void visitCast(Cast node, C context) { process(node.getExpression(), context); return null; } @Override - protected Void visitArithmeticBinary(ArithmeticBinaryExpression node, C context) { + public Void visitArithmeticBinary(ArithmeticBinaryExpression node, C context) { process(node.getLeft(), context); process(node.getRight(), context); @@ -53,7 +53,7 @@ protected Void visitArithmeticBinary(ArithmeticBinaryExpression node, C context) } @Override - protected Void visitBetweenPredicate(BetweenPredicate node, C context) { + public Void visitBetweenPredicate(BetweenPredicate node, C context) { process(node.getValue(), context); process(node.getMin(), context); process(node.getMax(), context); @@ -62,7 +62,7 @@ protected Void visitBetweenPredicate(BetweenPredicate node, C context) { } @Override - protected Void visitCoalesceExpression(CoalesceExpression node, C context) { + public Void visitCoalesceExpression(CoalesceExpression node, C context) { for (Expression operand : node.getOperands()) { process(operand, context); } @@ -71,7 +71,7 @@ protected Void visitCoalesceExpression(CoalesceExpression node, C context) { } // @Override - // protected Void visitSubscriptExpression(SubscriptExpression node, C context) + // public Void visitSubscriptExpression(SubscriptExpression node, C context) // { // process(node.getBase(), context); // process(node.getIndex(), context); @@ -80,7 +80,7 @@ protected Void visitCoalesceExpression(CoalesceExpression node, C context) { // } @Override - protected Void visitComparisonExpression(ComparisonExpression node, C context) { + public Void visitComparisonExpression(ComparisonExpression node, C context) { process(node.getLeft(), context); process(node.getRight(), context); @@ -88,7 +88,7 @@ protected Void visitComparisonExpression(ComparisonExpression node, C context) { } @Override - protected Void visitInPredicate(InPredicate node, C context) { + public Void visitInPredicate(InPredicate node, C context) { process(node.getValue(), context); process(node.getValueList(), context); @@ -96,7 +96,7 @@ protected Void visitInPredicate(InPredicate node, C context) { } @Override - protected Void visitFunctionCall(FunctionCall node, C context) { + public Void visitFunctionCall(FunctionCall node, C context) { for (Expression argument : node.getArguments()) { process(argument, context); } @@ -105,7 +105,7 @@ protected Void visitFunctionCall(FunctionCall node, C context) { } @Override - protected Void visitSimpleCaseExpression(SimpleCaseExpression node, C context) { + public Void visitSimpleCaseExpression(SimpleCaseExpression node, C context) { process(node.getOperand(), context); for (WhenClause clause : node.getWhenClauses()) { process(clause.getOperand(), context); @@ -118,7 +118,7 @@ protected Void visitSimpleCaseExpression(SimpleCaseExpression node, C context) { } @Override - protected Void visitNullIfExpression(NullIfExpression node, C context) { + public Void visitNullIfExpression(NullIfExpression node, C context) { process(node.getFirst(), context); process(node.getSecond(), context); @@ -126,7 +126,7 @@ protected Void visitNullIfExpression(NullIfExpression node, C context) { } // @Override - // protected Void visitBindExpression(BindExpression node, C context) + // public Void visitBindExpression(BindExpression node, C context) // { // for (Expression value : node.getValues()) { // process(value, context); @@ -137,20 +137,20 @@ protected Void visitNullIfExpression(NullIfExpression node, C context) { // } // @Override - // protected Void visitArithmeticNegation(ArithmeticNegation node, C context) + // public Void visitArithmeticNegation(ArithmeticNegation node, C context) // { // process(node.getValue(), context); // return null; // } @Override - protected Void visitNotExpression(NotExpression node, C context) { + public Void visitNotExpression(NotExpression node, C context) { process(node.getValue(), context); return null; } @Override - protected Void visitSearchedCaseExpression(SearchedCaseExpression node, C context) { + public Void visitSearchedCaseExpression(SearchedCaseExpression node, C context) { for (WhenClause clause : node.getWhenClauses()) { process(clause.getOperand(), context); process(clause.getResult(), context); @@ -161,13 +161,13 @@ protected Void visitSearchedCaseExpression(SearchedCaseExpression node, C contex } @Override - protected Void visitIsNullPredicate(IsNullPredicate node, C context) { + public Void visitIsNullPredicate(IsNullPredicate node, C context) { process(node.getValue(), context); return null; } @Override - protected Void visitLogicalExpression(LogicalExpression node, C context) { + public Void visitLogicalExpression(LogicalExpression node, C context) { for (Expression child : node.getTerms()) { process(child, context); } @@ -176,7 +176,7 @@ protected Void visitLogicalExpression(LogicalExpression node, C context) { } @Override - protected Void visitRow(Row node, C context) { + public Void visitRow(Row node, C context) { for (Expression expression : node.getItems()) { process(expression, context); } @@ -184,7 +184,7 @@ protected Void visitRow(Row node, C context) { } // @Override - // protected Void visitLambdaExpression(LambdaExpression node, C context) + // public Void visitLambdaExpression(LambdaExpression node, C context) // { // process(node.getBody(), context); // diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java index 55293393123b5..a80218890fb03 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java @@ -35,7 +35,7 @@ public static boolean isDeterministic(Expression expression) { private static class Visitor extends DefaultTraversalVisitor { @Override - protected Void visitFunctionCall(FunctionCall node, AtomicBoolean deterministic) { + public Void visitFunctionCall(FunctionCall node, AtomicBoolean deterministic) { // if (!node.getFunction().isDeterministic()) { // deterministic.set(false); // return null; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java index bcbe3f530360e..3827759d55843 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java @@ -107,10 +107,10 @@ public T defaultRewrite(T node, C context) { return (T) visitor.process(node, new Context<>(context, true)); } - private class RewritingVisitor extends AstVisitor> { + private class RewritingVisitor implements AstVisitor> { @Override - protected Expression visitExpression(Expression node, Context context) { + public Expression visitExpression(Expression node, Context context) { // RewritingVisitor must have explicit support for each expression type, with a dedicated // visit method, // so visitExpression() should never be called. @@ -119,7 +119,7 @@ protected Expression visitExpression(Expression node, Context context) { } @Override - protected Expression visitRow(Row node, Context context) { + public Expression visitRow(Row node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteRow(node, context.get(), ExpressionTreeRewriter.this); if (result != null) { @@ -137,7 +137,7 @@ protected Expression visitRow(Row node, Context context) { } @Override - protected Expression visitArithmeticUnary(ArithmeticUnaryExpression node, Context context) { + public Expression visitArithmeticUnary(ArithmeticUnaryExpression node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteArithmeticUnary(node, context.get(), ExpressionTreeRewriter.this); @@ -195,7 +195,7 @@ public Expression visitComparisonExpression(ComparisonExpression node, Context context) { + public Expression visitBetweenPredicate(BetweenPredicate node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteBetweenPredicate(node, context.get(), ExpressionTreeRewriter.this); @@ -253,7 +253,7 @@ public Expression visitNotExpression(NotExpression node, Context context) { } @Override - protected Expression visitIsNullPredicate(IsNullPredicate node, Context context) { + public Expression visitIsNullPredicate(IsNullPredicate node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteIsNullPredicate(node, context.get(), ExpressionTreeRewriter.this); @@ -272,7 +272,7 @@ protected Expression visitIsNullPredicate(IsNullPredicate node, Context conte } @Override - protected Expression visitIsNotNullPredicate(IsNotNullPredicate node, Context context) { + public Expression visitIsNotNullPredicate(IsNotNullPredicate node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteIsNotNullPredicate(node, context.get(), ExpressionTreeRewriter.this); @@ -291,7 +291,7 @@ protected Expression visitIsNotNullPredicate(IsNotNullPredicate node, Context } @Override - protected Expression visitNullIfExpression(NullIfExpression node, Context context) { + public Expression visitNullIfExpression(NullIfExpression node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteNullIfExpression(node, context.get(), ExpressionTreeRewriter.this); @@ -311,7 +311,7 @@ protected Expression visitNullIfExpression(NullIfExpression node, Context con } @Override - protected Expression visitIfExpression(IfExpression node, Context context) { + public Expression visitIfExpression(IfExpression node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteIfExpression(node, context.get(), ExpressionTreeRewriter.this); @@ -337,8 +337,7 @@ protected Expression visitIfExpression(IfExpression node, Context context) { } @Override - protected Expression visitSearchedCaseExpression( - SearchedCaseExpression node, Context context) { + public Expression visitSearchedCaseExpression(SearchedCaseExpression node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteSearchedCaseExpression( @@ -367,7 +366,7 @@ protected Expression visitSearchedCaseExpression( } @Override - protected Expression visitSimpleCaseExpression(SimpleCaseExpression node, Context context) { + public Expression visitSimpleCaseExpression(SimpleCaseExpression node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteSimpleCaseExpression(node, context.get(), ExpressionTreeRewriter.this); @@ -398,7 +397,7 @@ protected Expression visitSimpleCaseExpression(SimpleCaseExpression node, Contex } @Override - protected Expression visitWhenClause(WhenClause node, Context context) { + public Expression visitWhenClause(WhenClause node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteWhenClause(node, context.get(), ExpressionTreeRewriter.this); @@ -417,7 +416,7 @@ protected Expression visitWhenClause(WhenClause node, Context context) { } @Override - protected Expression visitCoalesceExpression(CoalesceExpression node, Context context) { + public Expression visitCoalesceExpression(CoalesceExpression node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteCoalesceExpression(node, context.get(), ExpressionTreeRewriter.this); @@ -515,7 +514,7 @@ public Expression visitInPredicate(InPredicate node, Context context) { // } @Override - protected Expression visitInListExpression(InListExpression node, Context context) { + public Expression visitInListExpression(InListExpression node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteInListExpression(node, context.get(), ExpressionTreeRewriter.this); @@ -534,7 +533,7 @@ protected Expression visitInListExpression(InListExpression node, Context con } @Override - protected Expression visitExists(ExistsPredicate node, Context context) { + public Expression visitExists(ExistsPredicate node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteExists(node, context.get(), ExpressionTreeRewriter.this); @@ -567,7 +566,7 @@ public Expression visitSubqueryExpression(SubqueryExpression node, Context co return node; } - protected Expression visitLiteral(final Literal node, final Context context) { + public Expression visitLiteral(final Literal node, final Context context) { if (!context.isDefaultRewrite()) { final Expression result = rewriter.rewriteLiteral(node, context.get(), ExpressionTreeRewriter.this); @@ -627,7 +626,7 @@ public Expression visitDereferenceExpression(DereferenceExpression node, Context } @Override - protected Expression visitExtract(Extract node, Context context) { + public Expression visitExtract(Extract node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteExtract(node, context.get(), ExpressionTreeRewriter.this); @@ -691,7 +690,7 @@ public Expression visitCurrentUser(final CurrentUser node, final Context cont } @Override - protected Expression visitGenericDataType(GenericDataType node, Context context) { + public Expression visitGenericDataType(GenericDataType node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteGenericDataType(node, context.get(), ExpressionTreeRewriter.this); @@ -730,7 +729,7 @@ protected Expression visitGenericDataType(GenericDataType node, Context conte } @Override - protected Expression visitFieldReference(FieldReference node, Context context) { + public Expression visitFieldReference(FieldReference node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteFieldReference(node, context.get(), ExpressionTreeRewriter.this); @@ -743,7 +742,7 @@ protected Expression visitFieldReference(FieldReference node, Context context } @Override - protected Expression visitSymbolReference(SymbolReference node, Context context) { + public Expression visitSymbolReference(SymbolReference node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteSymbolReference(node, context.get(), ExpressionTreeRewriter.this); @@ -756,7 +755,7 @@ protected Expression visitSymbolReference(SymbolReference node, Context conte } @Override - protected Expression visitQuantifiedComparisonExpression( + public Expression visitQuantifiedComparisonExpression( QuantifiedComparisonExpression node, Context context) { if (!context.isDefaultRewrite()) { Expression result = @@ -778,7 +777,7 @@ protected Expression visitQuantifiedComparisonExpression( } @Override - protected Expression visitTrim(Trim node, Context context) { + public Expression visitTrim(Trim node, Context context) { if (!context.isDefaultRewrite()) { Expression result = rewriter.rewriteTrim(node, context.get(), ExpressionTreeRewriter.this); if (result != null) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java index a4db05cd6a3cf..d4094607b3f8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java @@ -43,7 +43,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; public class GapFillStartAndEndTimeExtractVisitor - extends AstVisitor { + implements AstVisitor { private static final String UPDATE_START_TIME_ERROR_MSG = "Operator of updateStatTime should only be GREATER_THAN and GREATER_THAN_OR_EQUAL, now is %s"; @@ -63,7 +63,7 @@ public GapFillStartAndEndTimeExtractVisitor(Symbol timeColumn) { @Override public Boolean visitNode(Node node, GapFillStartAndEndTimeExtractVisitor.Context context) { for (Node child : node.getChildren()) { - if (Boolean.TRUE.equals(super.process(child, context))) { + if (Boolean.TRUE.equals(AstVisitor.super.process(child, context))) { throw new SemanticException(CAN_NOT_INFER_TIME_RANGE); } } @@ -71,13 +71,13 @@ public Boolean visitNode(Node node, GapFillStartAndEndTimeExtractVisitor.Context } @Override - protected Boolean visitSymbolReference( + public Boolean visitSymbolReference( SymbolReference node, GapFillStartAndEndTimeExtractVisitor.Context context) { return isTimeIdentifier(node); } @Override - protected Boolean visitLogicalExpression( + public Boolean visitLogicalExpression( LogicalExpression node, GapFillStartAndEndTimeExtractVisitor.Context context) { if (node.getOperator() == AND) { boolean hasMeetGapFillTimeFilter = false; @@ -98,7 +98,7 @@ protected Boolean visitLogicalExpression( } @Override - protected Boolean visitComparisonExpression( + public Boolean visitComparisonExpression( ComparisonExpression node, GapFillStartAndEndTimeExtractVisitor.Context context) { Expression leftExpression = node.getLeft(); Expression rightExpression = node.getRight(); @@ -117,7 +117,7 @@ protected Boolean visitComparisonExpression( } @Override - protected Boolean visitBetweenPredicate( + public Boolean visitBetweenPredicate( BetweenPredicate node, GapFillStartAndEndTimeExtractVisitor.Context context) { Expression firstExpression = node.getValue(); Expression secondExpression = node.getMin(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java index 0f7fdf35a3ae5..80e0001eb5c9e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java @@ -57,7 +57,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.zeroOrMore; import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.zeroOrOne; -public class RowPatternToIrRewriter extends AstVisitor { +public class RowPatternToIrRewriter implements AstVisitor { private final Analysis analysis; public RowPatternToIrRewriter(Analysis analysis) { @@ -69,7 +69,7 @@ public static IrRowPattern rewrite(RowPattern node, Analysis analysis) { } @Override - protected IrRowPattern visitPatternAlternation(PatternAlternation node, Void context) { + public IrRowPattern visitPatternAlternation(PatternAlternation node, Void context) { List patterns = node.getPatterns().stream().map(this::process).collect(toImmutableList()); @@ -77,7 +77,7 @@ protected IrRowPattern visitPatternAlternation(PatternAlternation node, Void con } @Override - protected IrRowPattern visitPatternConcatenation(PatternConcatenation node, Void context) { + public IrRowPattern visitPatternConcatenation(PatternConcatenation node, Void context) { List patterns = node.getPatterns().stream().map(this::process).collect(toImmutableList()); @@ -85,7 +85,7 @@ protected IrRowPattern visitPatternConcatenation(PatternConcatenation node, Void } @Override - protected IrRowPattern visitQuantifiedPattern(QuantifiedPattern node, Void context) { + public IrRowPattern visitQuantifiedPattern(QuantifiedPattern node, Void context) { IrRowPattern pattern = process(node.getPattern()); IrQuantifier quantifier = rewritePatternQuantifier(node.getPatternQuantifier()); @@ -115,7 +115,7 @@ private IrQuantifier rewritePatternQuantifier(PatternQuantifier quantifier) { } @Override - protected IrRowPattern visitAnchorPattern(AnchorPattern node, Void context) { + public IrRowPattern visitAnchorPattern(AnchorPattern node, Void context) { Type type; switch (node.getType()) { case PARTITION_START: @@ -132,19 +132,19 @@ protected IrRowPattern visitAnchorPattern(AnchorPattern node, Void context) { } @Override - protected IrRowPattern visitEmptyPattern(EmptyPattern node, Void context) { + public IrRowPattern visitEmptyPattern(EmptyPattern node, Void context) { return new IrEmpty(); } @Override - protected IrRowPattern visitExcludedPattern(ExcludedPattern node, Void context) { + public IrRowPattern visitExcludedPattern(ExcludedPattern node, Void context) { IrRowPattern pattern = process(node.getPattern()); return new IrExclusion(pattern); } @Override - protected IrRowPattern visitPatternPermutation(PatternPermutation node, Void context) { + public IrRowPattern visitPatternPermutation(PatternPermutation node, Void context) { List patterns = node.getPatterns().stream().map(this::process).collect(toImmutableList()); @@ -152,7 +152,7 @@ protected IrRowPattern visitPatternPermutation(PatternPermutation node, Void con } @Override - protected IrRowPattern visitPatternVariable(PatternVariable node, Void context) { + public IrRowPattern visitPatternVariable(PatternVariable node, Void context) { return new IrLabel(node.getName().getCanonicalValue()); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java index 77ab477375435..6c916077e5846 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java @@ -110,7 +110,7 @@ public List getParameters() { } @Override - protected Void visitParameter(Parameter node, Void context) { + public Void visitParameter(Parameter node, Void context) { parameters.add(node); return null; } 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 9f7dd6e192925..2294907eb41ab 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 @@ -21,562 +21,562 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -public abstract class AstVisitor extends CommonQueryAstVisitor { +public interface AstVisitor extends CommonQueryAstVisitor { - protected R visitExplain(Explain node, C context) { + default R visitExplain(Explain node, C context) { return visitStatement(node, context); } - protected R visitCopyTo(CopyTo node, C context) { + default R visitCopyTo(CopyTo node, C context) { return visitStatement(node, context); } - protected R visitExplainAnalyze(ExplainAnalyze node, C context) { + default R visitExplainAnalyze(ExplainAnalyze node, C context) { return visitStatement(node, context); } - protected R visitUse(Use node, C context) { + default R visitUse(Use node, C context) { return visitStatement(node, context); } - protected R visitPrepare(Prepare node, C context) { + default R visitPrepare(Prepare node, C context) { return visitStatement(node, context); } - protected R visitExecute(Execute node, C context) { + default R visitExecute(Execute node, C context) { return visitStatement(node, context); } - protected R visitExecuteImmediate(ExecuteImmediate node, C context) { + default R visitExecuteImmediate(ExecuteImmediate node, C context) { return visitStatement(node, context); } - protected R visitDeallocate(Deallocate node, C context) { + default R visitDeallocate(Deallocate node, C context) { return visitStatement(node, context); } - protected R visitSelect(Select node, C context) { + default R visitSelect(Select node, C context) { return visitNode(node, context); } - protected R visitQuerySpecification(QuerySpecification node, C context) { + default R visitQuerySpecification(QuerySpecification node, C context) { return visitQueryBody(node, context); } - protected R visitSetOperation(SetOperation node, C context) { + default R visitSetOperation(SetOperation node, C context) { return visitQueryBody(node, context); } - protected R visitUnion(Union node, C context) { + default R visitUnion(Union node, C context) { return visitSetOperation(node, context); } - protected R visitIntersect(Intersect node, C context) { + default R visitIntersect(Intersect node, C context) { return visitSetOperation(node, context); } - protected R visitExcept(Except node, C context) { + default R visitExcept(Except node, C context) { return visitSetOperation(node, context); } - protected R visitWindowDefinition(WindowDefinition node, C context) { + default R visitWindowDefinition(WindowDefinition node, C context) { return visitNode(node, context); } - protected R visitTable(Table node, C context) { + default R visitTable(Table node, C context) { return visitQueryBody(node, context); } - protected R visitColumnDefinition(ColumnDefinition node, C context) { + default R visitColumnDefinition(ColumnDefinition node, C context) { return visitNode(node, context); } - protected R visitViewFieldDefinition(ViewFieldDefinition node, C context) { + default R visitViewFieldDefinition(ViewFieldDefinition node, C context) { return visitNode(node, context); } - protected R visitCreateDB(final CreateDB node, final C context) { + default R visitCreateDB(final CreateDB node, final C context) { return visitStatement(node, context); } - protected R visitAlterDB(final AlterDB node, final C context) { + default R visitAlterDB(final AlterDB node, final C context) { return visitStatement(node, context); } - protected R visitDropDB(final DropDB node, final C context) { + default R visitDropDB(final DropDB node, final C context) { return visitStatement(node, context); } - protected R visitShowDB(final ShowDB node, final C context) { + default R visitShowDB(final ShowDB node, final C context) { return visitStatement(node, context); } - protected R visitCreateTable(final CreateTable node, final C context) { + default R visitCreateTable(final CreateTable node, final C context) { return visitStatement(node, context); } - protected R visitCreateView(final CreateView node, final C context) { + default R visitCreateView(final CreateView node, final C context) { return visitStatement(node, context); } - protected R visitProperty(final Property node, final C context) { + default R visitProperty(final Property node, final C context) { return visitNode(node, context); } - protected R visitDropTable(final DropTable node, final C context) { + default R visitDropTable(final DropTable node, final C context) { return visitStatement(node, context); } - protected R visitDeleteDevice(final DeleteDevice node, final C context) { + default R visitDeleteDevice(final DeleteDevice node, final C context) { return visitStatement(node, context); } - protected R visitShowTables(ShowTables node, C context) { + default R visitShowTables(ShowTables node, C context) { return visitStatement(node, context); } - protected R visitShowCluster(ShowCluster node, C context) { + default R visitShowCluster(ShowCluster node, C context) { return visitStatement(node, context); } - protected R visitShowRegions(ShowRegions node, C context) { + default R visitShowRegions(ShowRegions node, C context) { return visitStatement(node, context); } - protected R visitShowDataNodes(ShowDataNodes node, C context) { + default R visitShowDataNodes(ShowDataNodes node, C context) { return visitStatement(node, context); } - protected R visitShowAvailableUrls(ShowAvailableUrls node, C context) { + default R visitShowAvailableUrls(ShowAvailableUrls node, C context) { return visitStatement(node, context); } - protected R visitShowConfigNodes(ShowConfigNodes node, C context) { + default R visitShowConfigNodes(ShowConfigNodes node, C context) { return visitStatement(node, context); } - protected R visitShowAINodes(ShowAINodes node, C context) { + default R visitShowAINodes(ShowAINodes node, C context) { return visitStatement(node, context); } - protected R visitRemoveAINode(RemoveAINode node, C context) { + default R visitRemoveAINode(RemoveAINode node, C context) { return visitStatement(node, context); } - protected R visitClearCache(ClearCache node, C context) { + default R visitClearCache(ClearCache node, C context) { return visitStatement(node, context); } - protected R visitRenameTable(RenameTable node, C context) { + default R visitRenameTable(RenameTable node, C context) { return visitStatement(node, context); } - protected R visitRemoveDataNode(RemoveDataNode node, C context) { + default R visitRemoveDataNode(RemoveDataNode node, C context) { return visitStatement(node, context); } - protected R visitRemoveConfigNode(RemoveConfigNode node, C context) { + default R visitRemoveConfigNode(RemoveConfigNode node, C context) { return visitStatement(node, context); } - protected R visitDescribeTable(DescribeTable node, C context) { + default R visitDescribeTable(DescribeTable node, C context) { return visitStatement(node, context); } - protected R visitSetProperties(SetProperties node, C context) { + default R visitSetProperties(SetProperties node, C context) { return visitStatement(node, context); } - protected R visitRenameColumn(RenameColumn node, C context) { + default R visitRenameColumn(RenameColumn node, C context) { return visitStatement(node, context); } - protected R visitDropColumn(DropColumn node, C context) { + default R visitDropColumn(DropColumn node, C context) { return visitStatement(node, context); } - protected R visitAddColumn(AddColumn node, C context) { + default R visitAddColumn(AddColumn node, C context) { return visitStatement(node, context); } - protected R visitSetTableComment(SetTableComment node, C context) { + default R visitSetTableComment(SetTableComment node, C context) { return visitStatement(node, context); } - protected R visitSetColumnComment(SetColumnComment node, C context) { + default R visitSetColumnComment(SetColumnComment node, C context) { return visitStatement(node, context); } - protected R visitCreateIndex(CreateIndex node, C context) { + default R visitCreateIndex(CreateIndex node, C context) { return visitStatement(node, context); } - protected R visitDropIndex(DropIndex node, C context) { + default R visitDropIndex(DropIndex node, C context) { return visitStatement(node, context); } - protected R visitShowIndex(ShowIndex node, C context) { + default R visitShowIndex(ShowIndex node, C context) { return visitStatement(node, context); } - protected R visitInsert(Insert node, C context) { + default R visitInsert(Insert node, C context) { return visitStatement(node, context); } - protected R visitInsertTablet(InsertTablet node, C context) { + default R visitInsertTablet(InsertTablet node, C context) { return visitStatement(node, context); } - protected R visitFlush(Flush node, C context) { + default R visitFlush(Flush node, C context) { return visitStatement(node, context); } - protected R visitSetConfiguration(SetConfiguration node, C context) { + default R visitSetConfiguration(SetConfiguration node, C context) { return visitStatement(node, context); } - protected R visitShowConfiguration(ShowConfiguration node, C context) { + default R visitShowConfiguration(ShowConfiguration node, C context) { return visitStatement(node, context); } - protected R visitStartRepairData(StartRepairData node, C context) { + default R visitStartRepairData(StartRepairData node, C context) { return visitStatement(node, context); } - protected R visitStopRepairData(StopRepairData node, C context) { + default R visitStopRepairData(StopRepairData node, C context) { return visitStatement(node, context); } - protected R visitLoadConfiguration(LoadConfiguration node, C context) { + default R visitLoadConfiguration(LoadConfiguration node, C context) { return visitStatement(node, context); } - protected R visitSetSystemStatus(SetSystemStatus node, C context) { + default R visitSetSystemStatus(SetSystemStatus node, C context) { return visitStatement(node, context); } - protected R visitInsertRow(InsertRow node, C context) { + default R visitInsertRow(InsertRow node, C context) { return visitStatement(node, context); } - protected R visitInsertRows(InsertRows node, C context) { + default R visitInsertRows(InsertRows node, C context) { return visitStatement(node, context); } - protected R visitDelete(Delete node, C context) { + default R visitDelete(Delete node, C context) { return visitStatement(node, context); } - protected R visitUpdate(Update node, C context) { + default R visitUpdate(Update node, C context) { return visitStatement(node, context); } - protected R visitUpdateAssignment(UpdateAssignment node, C context) { + default R visitUpdateAssignment(UpdateAssignment node, C context) { return visitNode(node, context); } - protected R visitShowFunctions(ShowFunctions node, C context) { + default R visitShowFunctions(ShowFunctions node, C context) { return visitStatement(node, context); } - protected R visitCreateFunction(CreateFunction node, C context) { + default R visitCreateFunction(CreateFunction node, C context) { return visitStatement(node, context); } - protected R visitDropFunction(DropFunction node, C context) { + default R visitDropFunction(DropFunction node, C context) { return visitStatement(node, context); } - protected R visitCreateExternalService(CreateExternalService node, C context) { + default R visitCreateExternalService(CreateExternalService node, C context) { return visitStatement(node, context); } - protected R visitStartExternalService(StartExternalService node, C context) { + default R visitStartExternalService(StartExternalService node, C context) { return visitStatement(node, context); } - protected R visitStopExternalService(StopExternalService node, C context) { + default R visitStopExternalService(StopExternalService node, C context) { return visitStatement(node, context); } - protected R visitDropExternalService(DropExternalService node, C context) { + default R visitDropExternalService(DropExternalService node, C context) { return visitStatement(node, context); } - protected R visitShowExternalService(ShowExternalService node, C context) { + default R visitShowExternalService(ShowExternalService node, C context) { return visitStatement(node, context); } - protected R visitCreateOrUpdateDevice(CreateOrUpdateDevice node, C context) { + default R visitCreateOrUpdateDevice(CreateOrUpdateDevice node, C context) { return visitStatement(node, context); } - protected R visitFetchDevice(FetchDevice node, C context) { + default R visitFetchDevice(FetchDevice node, C context) { return visitStatement(node, context); } - protected R visitShowDevice(ShowDevice node, C context) { + default R visitShowDevice(ShowDevice node, C context) { return visitStatement(node, context); } - protected R visitCountDevice(CountDevice node, C context) { + default R visitCountDevice(CountDevice node, C context) { return visitStatement(node, context); } - protected R visitCreatePipe(CreatePipe node, C context) { + default R visitCreatePipe(CreatePipe node, C context) { return visitStatement(node, context); } - protected R visitAlterPipe(AlterPipe node, C context) { + default R visitAlterPipe(AlterPipe node, C context) { return visitStatement(node, context); } - protected R visitDropPipe(DropPipe node, C context) { + default R visitDropPipe(DropPipe node, C context) { return visitStatement(node, context); } - protected R visitStartPipe(StartPipe node, C context) { + default R visitStartPipe(StartPipe node, C context) { return visitStatement(node, context); } - protected R visitStopPipe(StopPipe node, C context) { + default R visitStopPipe(StopPipe node, C context) { return visitStatement(node, context); } - protected R visitShowPipes(ShowPipes node, C context) { + default R visitShowPipes(ShowPipes node, C context) { return visitStatement(node, context); } - protected R visitCreatePipePlugin(CreatePipePlugin node, C context) { + default R visitCreatePipePlugin(CreatePipePlugin node, C context) { return visitStatement(node, context); } - protected R visitDropPipePlugin(DropPipePlugin node, C context) { + default R visitDropPipePlugin(DropPipePlugin node, C context) { return visitStatement(node, context); } - protected R visitShowPipePlugins(ShowPipePlugins node, C context) { + default R visitShowPipePlugins(ShowPipePlugins node, C context) { return visitStatement(node, context); } - protected R visitLoadTsFile(LoadTsFile node, C context) { + default R visitLoadTsFile(LoadTsFile node, C context) { return visitStatement(node, context); } - protected R visitPipeEnriched(PipeEnriched node, C context) { + default R visitPipeEnriched(PipeEnriched node, C context) { return visitStatement(node, context); } - protected R visitCreateTopic(CreateTopic node, C context) { + default R visitCreateTopic(CreateTopic node, C context) { return visitStatement(node, context); } - protected R visitDropTopic(DropTopic node, C context) { + default R visitDropTopic(DropTopic node, C context) { return visitStatement(node, context); } - protected R visitShowTopics(ShowTopics node, C context) { + default R visitShowTopics(ShowTopics node, C context) { return visitStatement(node, context); } - protected R visitShowSubscriptions(ShowSubscriptions node, C context) { + default R visitShowSubscriptions(ShowSubscriptions node, C context) { return visitStatement(node, context); } - protected R visitDropSubscription(DropSubscription node, C context) { + default R visitDropSubscription(DropSubscription node, C context) { return visitStatement(node, context); } - protected R visitShowVersion(ShowVersion node, C context) { + default R visitShowVersion(ShowVersion node, C context) { return visitStatement(node, context); } - protected R visitShowCurrentUser(ShowCurrentUser node, C context) { + default R visitShowCurrentUser(ShowCurrentUser node, C context) { return visitStatement(node, context); } - protected R visitShowCurrentDatabase(ShowCurrentDatabase node, C context) { + default R visitShowCurrentDatabase(ShowCurrentDatabase node, C context) { return visitStatement(node, context); } - protected R visitShowCurrentSqlDialect(ShowCurrentSqlDialect node, C context) { + default R visitShowCurrentSqlDialect(ShowCurrentSqlDialect node, C context) { return visitStatement(node, context); } - protected R visitShowVariables(ShowVariables node, C context) { + default R visitShowVariables(ShowVariables node, C context) { return visitStatement(node, context); } - protected R visitShowClusterId(ShowClusterId node, C context) { + default R visitShowClusterId(ShowClusterId node, C context) { return visitStatement(node, context); } - protected R visitShowCurrentTimestamp(ShowCurrentTimestamp node, C context) { + default R visitShowCurrentTimestamp(ShowCurrentTimestamp node, C context) { return visitStatement(node, context); } - protected R visitShowStatement(ShowStatement node, C context) { + default R visitShowStatement(ShowStatement node, C context) { return visitStatement(node, context); } - protected R visitShowQueriesStatement(ShowQueriesStatement node, C context) { + default R visitShowQueriesStatement(ShowQueriesStatement node, C context) { return visitShowStatement(node, context); } - protected R visitCountStatement(CountStatement node, C context) { + default R visitCountStatement(CountStatement node, C context) { return visitStatement(node, context); } - protected R visitKillQuery(KillQuery node, C context) { + default R visitKillQuery(KillQuery node, C context) { return visitStatement(node, context); } - protected R visitAlterColumnDataType(AlterColumnDataType node, C context) { + default R visitAlterColumnDataType(AlterColumnDataType node, C context) { return visitStatement(node, context); } - protected R visitRelationalAuthorPlan(RelationalAuthorStatement node, C context) { + default R visitRelationalAuthorPlan(RelationalAuthorStatement node, C context) { return visitStatement(node, context); } - protected R visitMigrateRegion(MigrateRegion node, C context) { + default R visitMigrateRegion(MigrateRegion node, C context) { return visitStatement(node, context); } - protected R visitReconstructRegion(ReconstructRegion node, C context) { + default R visitReconstructRegion(ReconstructRegion node, C context) { return visitStatement(node, context); } - protected R visitExtendRegion(ExtendRegion node, C context) { + default R visitExtendRegion(ExtendRegion node, C context) { return visitStatement(node, context); } - protected R visitRemoveRegion(RemoveRegion node, C context) { + default R visitRemoveRegion(RemoveRegion node, C context) { return visitStatement(node, context); } - protected R visitSetSqlDialect(SetSqlDialect node, C context) { + default R visitSetSqlDialect(SetSqlDialect node, C context) { return visitStatement(node, context); } - protected R visitCreateTraining(CreateTraining node, C context) { + default R visitCreateTraining(CreateTraining node, C context) { return visitStatement(node, context); } - protected R visitCreateModel(CreateModel node, C context) { + default R visitCreateModel(CreateModel node, C context) { return visitStatement(node, context); } - protected R visitShowModels(ShowModels node, C context) { + default R visitShowModels(ShowModels node, C context) { return visitStatement(node, context); } - protected R visitShowLoadedModels(ShowLoadedModels node, C context) { + default R visitShowLoadedModels(ShowLoadedModels node, C context) { return visitStatement(node, context); } - protected R visitShowAIDevices(ShowAIDevices node, C context) { + default R visitShowAIDevices(ShowAIDevices node, C context) { return visitStatement(node, context); } - protected R visitLoadModel(LoadModel node, C context) { + default R visitLoadModel(LoadModel node, C context) { return visitStatement(node, context); } - protected R visitUnloadModel(UnloadModel node, C context) { + default R visitUnloadModel(UnloadModel node, C context) { return visitStatement(node, context); } - protected R visitDropModel(DropModel node, C context) { + default R visitDropModel(DropModel node, C context) { return visitStatement(node, context); } - public R visitTableArgument(TableFunctionTableArgument tableFunctionTableArgument, C context) { + default R visitTableArgument(TableFunctionTableArgument tableFunctionTableArgument, C context) { return visitNode(tableFunctionTableArgument, context); } - public R visitTableFunctionArgument(TableFunctionArgument tableFunctionArgument, C context) { + default R visitTableFunctionArgument(TableFunctionArgument tableFunctionArgument, C context) { return visitNode(tableFunctionArgument, context); } - public R visitTableFunctionInvocation( + default R visitTableFunctionInvocation( TableFunctionInvocation tableFunctionInvocation, C context) { return visitNode(tableFunctionInvocation, context); } - protected R visitMeasureDefinition(MeasureDefinition node, C context) { + default R visitMeasureDefinition(MeasureDefinition node, C context) { return visitNode(node, context); } - protected R visitSkipTo(SkipTo node, C context) { + default R visitSkipTo(SkipTo node, C context) { return visitNode(node, context); } - protected R visitSubsetDefinition(SubsetDefinition node, C context) { + default R visitSubsetDefinition(SubsetDefinition node, C context) { return visitNode(node, context); } - protected R visitVariableDefinition(VariableDefinition node, C context) { + default R visitVariableDefinition(VariableDefinition node, C context) { return visitNode(node, context); } - protected R visitPatternRecognitionRelation(PatternRecognitionRelation node, C context) { + default R visitPatternRecognitionRelation(PatternRecognitionRelation node, C context) { return visitRelation(node, context); } - protected R visitRowPattern(RowPattern node, C context) { + default R visitRowPattern(RowPattern node, C context) { return visitNode(node, context); } - protected R visitPatternAlternation(PatternAlternation node, C context) { + default R visitPatternAlternation(PatternAlternation node, C context) { return visitRowPattern(node, context); } - protected R visitPatternConcatenation(PatternConcatenation node, C context) { + default R visitPatternConcatenation(PatternConcatenation node, C context) { return visitRowPattern(node, context); } - protected R visitQuantifiedPattern(QuantifiedPattern node, C context) { + default R visitQuantifiedPattern(QuantifiedPattern node, C context) { return visitRowPattern(node, context); } - protected R visitAnchorPattern(AnchorPattern node, C context) { + default R visitAnchorPattern(AnchorPattern node, C context) { return visitRowPattern(node, context); } - protected R visitEmptyPattern(EmptyPattern node, C context) { + default R visitEmptyPattern(EmptyPattern node, C context) { return visitRowPattern(node, context); } - protected R visitExcludedPattern(ExcludedPattern node, C context) { + default R visitExcludedPattern(ExcludedPattern node, C context) { return visitRowPattern(node, context); } - protected R visitPatternPermutation(PatternPermutation node, C context) { + default R visitPatternPermutation(PatternPermutation node, C context) { return visitRowPattern(node, context); } - protected R visitPatternVariable(PatternVariable node, C context) { + default R visitPatternVariable(PatternVariable node, C context) { return visitRowPattern(node, context); } - protected R visitPatternQuantifier(PatternQuantifier node, C context) { + default R visitPatternQuantifier(PatternQuantifier node, C context) { return visitNode(node, context); } - protected R visitZeroOrMoreQuantifier(ZeroOrMoreQuantifier node, C context) { + default R visitZeroOrMoreQuantifier(ZeroOrMoreQuantifier node, C context) { return visitPatternQuantifier(node, context); } - protected R visitOneOrMoreQuantifier(OneOrMoreQuantifier node, C context) { + default R visitOneOrMoreQuantifier(OneOrMoreQuantifier node, C context) { return visitPatternQuantifier(node, context); } - protected R visitZeroOrOneQuantifier(ZeroOrOneQuantifier node, C context) { + default R visitZeroOrOneQuantifier(ZeroOrOneQuantifier node, C context) { return visitPatternQuantifier(node, context); } - protected R visitRangeQuantifier(RangeQuantifier node, C context) { + default R visitRangeQuantifier(RangeQuantifier node, C context) { return visitPatternQuantifier(node, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java index 6cdaddb9bf93b..8d69a1f6bf5e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java @@ -24,7 +24,7 @@ /** When walking Expressions, don't traverse into SubqueryExpressions */ public abstract class DefaultExpressionTraversalVisitor extends DefaultTraversalVisitor { @Override - protected Void visitSubqueryExpression(SubqueryExpression node, C context) { + public Void visitSubqueryExpression(SubqueryExpression node, C context) { // Don't traverse into Subqueries within an Expression return null; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java index 18e44a31e3631..118ab56940d2b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java @@ -68,15 +68,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; -public abstract class DefaultTraversalVisitor extends AstVisitor { +public abstract class DefaultTraversalVisitor implements AstVisitor { @Override - protected Void visitExtract(Extract node, C context) { + public Void visitExtract(Extract node, C context) { process(node.getExpression(), context); return null; } @Override - protected Void visitArithmeticBinary(ArithmeticBinaryExpression node, C context) { + public Void visitArithmeticBinary(ArithmeticBinaryExpression node, C context) { process(node.getLeft(), context); process(node.getRight(), context); @@ -84,7 +84,7 @@ protected Void visitArithmeticBinary(ArithmeticBinaryExpression node, C context) } @Override - protected Void visitBetweenPredicate(BetweenPredicate node, C context) { + public Void visitBetweenPredicate(BetweenPredicate node, C context) { process(node.getValue(), context); process(node.getMin(), context); process(node.getMax(), context); @@ -93,7 +93,7 @@ protected Void visitBetweenPredicate(BetweenPredicate node, C context) { } @Override - protected Void visitCoalesceExpression(CoalesceExpression node, C context) { + public Void visitCoalesceExpression(CoalesceExpression node, C context) { for (Expression operand : node.getOperands()) { process(operand, context); } @@ -102,7 +102,7 @@ protected Void visitCoalesceExpression(CoalesceExpression node, C context) { } @Override - protected Void visitComparisonExpression(ComparisonExpression node, C context) { + public Void visitComparisonExpression(ComparisonExpression node, C context) { process(node.getLeft(), context); process(node.getRight(), context); @@ -110,7 +110,7 @@ protected Void visitComparisonExpression(ComparisonExpression node, C context) { } @Override - protected Void visitQuery(Query node, C context) { + public Void visitQuery(Query node, C context) { if (node.getWith().isPresent()) { process(node.getWith().get(), context); } @@ -129,26 +129,26 @@ protected Void visitQuery(Query node, C context) { } @Override - protected Void visitExplain(Explain node, C context) { + public Void visitExplain(Explain node, C context) { process(node.getStatement(), context); return null; } @Override - protected Void visitCopyTo(CopyTo node, C context) { + public Void visitCopyTo(CopyTo node, C context) { process(node.getQueryStatement(), context); return null; } @Override - protected Void visitExplainAnalyze(ExplainAnalyze node, C context) { + public Void visitExplainAnalyze(ExplainAnalyze node, C context) { process(node.getStatement(), context); return null; } @Override - protected Void visitWith(With node, C context) { + public Void visitWith(With node, C context) { for (WithQuery query : node.getQueries()) { process(query, context); } @@ -157,13 +157,13 @@ protected Void visitWith(With node, C context) { } @Override - protected Void visitWithQuery(WithQuery node, C context) { + public Void visitWithQuery(WithQuery node, C context) { process(node.getQuery(), context); return null; } @Override - protected Void visitSelect(Select node, C context) { + public Void visitSelect(Select node, C context) { for (SelectItem item : node.getSelectItems()) { process(item, context); } @@ -172,13 +172,13 @@ protected Void visitSelect(Select node, C context) { } @Override - protected Void visitFill(Fill node, C context) { + public Void visitFill(Fill node, C context) { node.getFillValue().ifPresent(this::process); return null; } @Override - protected Void visitOrderBy(OrderBy node, C context) { + public Void visitOrderBy(OrderBy node, C context) { for (SortItem sortItem : node.getSortItems()) { process(sortItem, context); } @@ -186,21 +186,21 @@ protected Void visitOrderBy(OrderBy node, C context) { } @Override - protected Void visitOffset(Offset node, C context) { + public Void visitOffset(Offset node, C context) { process(node.getRowCount()); return null; } @Override - protected Void visitLimit(Limit node, C context) { + public Void visitLimit(Limit node, C context) { process(node.getRowCount()); return null; } @Override - protected Void visitQuerySpecification(QuerySpecification node, C context) { + public Void visitQuerySpecification(QuerySpecification node, C context) { process(node.getSelect(), context); if (node.getFrom().isPresent()) { process(node.getFrom().get(), context); @@ -227,7 +227,7 @@ protected Void visitQuerySpecification(QuerySpecification node, C context) { } @Override - protected Void visitSetOperation(SetOperation node, C context) { + public Void visitSetOperation(SetOperation node, C context) { for (Relation relation : node.getRelations()) { process(relation, context); } @@ -235,7 +235,7 @@ protected Void visitSetOperation(SetOperation node, C context) { } @Override - protected Void visitWhenClause(WhenClause node, C context) { + public Void visitWhenClause(WhenClause node, C context) { process(node.getOperand(), context); process(node.getResult(), context); @@ -243,7 +243,7 @@ protected Void visitWhenClause(WhenClause node, C context) { } @Override - protected Void visitInPredicate(InPredicate node, C context) { + public Void visitInPredicate(InPredicate node, C context) { process(node.getValue(), context); process(node.getValueList(), context); @@ -251,7 +251,7 @@ protected Void visitInPredicate(InPredicate node, C context) { } @Override - protected Void visitFunctionCall(FunctionCall node, C context) { + public Void visitFunctionCall(FunctionCall node, C context) { for (Expression argument : node.getArguments()) { process(argument, context); } @@ -260,7 +260,7 @@ protected Void visitFunctionCall(FunctionCall node, C context) { } @Override - protected Void visitSimpleCaseExpression(SimpleCaseExpression node, C context) { + public Void visitSimpleCaseExpression(SimpleCaseExpression node, C context) { process(node.getOperand(), context); for (WhenClause clause : node.getWhenClauses()) { process(clause, context); @@ -272,7 +272,7 @@ protected Void visitSimpleCaseExpression(SimpleCaseExpression node, C context) { } @Override - protected Void visitSearchedCaseExpression(SearchedCaseExpression node, C context) { + public Void visitSearchedCaseExpression(SearchedCaseExpression node, C context) { for (WhenClause clause : node.getWhenClauses()) { process(clause, context); } @@ -282,7 +282,7 @@ protected Void visitSearchedCaseExpression(SearchedCaseExpression node, C contex } @Override - protected Void visitInListExpression(InListExpression node, C context) { + public Void visitInListExpression(InListExpression node, C context) { for (Expression value : node.getValues()) { process(value, context); } @@ -291,13 +291,13 @@ protected Void visitInListExpression(InListExpression node, C context) { } @Override - protected Void visitDereferenceExpression(DereferenceExpression node, C context) { + public Void visitDereferenceExpression(DereferenceExpression node, C context) { process(node.getBase(), context); return null; } @Override - protected Void visitTrim(Trim node, C context) { + public Void visitTrim(Trim node, C context) { process(node.getTrimSource(), context); node.getTrimCharacter().ifPresent(trimChar -> process(trimChar, context)); @@ -305,7 +305,7 @@ protected Void visitTrim(Trim node, C context) { } @Override - protected Void visitIfExpression(IfExpression node, C context) { + public Void visitIfExpression(IfExpression node, C context) { process(node.getCondition(), context); process(node.getTrueValue(), context); if (node.getFalseValue().isPresent()) { @@ -316,7 +316,7 @@ protected Void visitIfExpression(IfExpression node, C context) { } @Override - protected Void visitNullIfExpression(NullIfExpression node, C context) { + public Void visitNullIfExpression(NullIfExpression node, C context) { process(node.getFirst(), context); process(node.getSecond(), context); @@ -324,33 +324,33 @@ protected Void visitNullIfExpression(NullIfExpression node, C context) { } @Override - protected Void visitArithmeticUnary(ArithmeticUnaryExpression node, C context) { + public Void visitArithmeticUnary(ArithmeticUnaryExpression node, C context) { process(node.getValue(), context); return null; } @Override - protected Void visitNotExpression(NotExpression node, C context) { + public Void visitNotExpression(NotExpression node, C context) { process(node.getValue(), context); return null; } @Override - protected Void visitSingleColumn(SingleColumn node, C context) { + public Void visitSingleColumn(SingleColumn node, C context) { process(node.getExpression(), context); return null; } @Override - protected Void visitAllColumns(AllColumns node, C context) { + public Void visitAllColumns(AllColumns node, C context) { node.getTarget().ifPresent(value -> process(value, context)); return null; } @Override - protected Void visitLikePredicate(LikePredicate node, C context) { + public Void visitLikePredicate(LikePredicate node, C context) { process(node.getValue(), context); process(node.getPattern(), context); node.getEscape().ifPresent(value -> process(value, context)); @@ -359,19 +359,19 @@ protected Void visitLikePredicate(LikePredicate node, C context) { } @Override - protected Void visitIsNotNullPredicate(IsNotNullPredicate node, C context) { + public Void visitIsNotNullPredicate(IsNotNullPredicate node, C context) { process(node.getValue(), context); return null; } @Override - protected Void visitIsNullPredicate(IsNullPredicate node, C context) { + public Void visitIsNullPredicate(IsNullPredicate node, C context) { process(node.getValue(), context); return null; } @Override - protected Void visitLogicalExpression(LogicalExpression node, C context) { + public Void visitLogicalExpression(LogicalExpression node, C context) { for (Node child : node.getTerms()) { process(child, context); } @@ -380,19 +380,19 @@ protected Void visitLogicalExpression(LogicalExpression node, C context) { } @Override - protected Void visitSubqueryExpression(SubqueryExpression node, C context) { + public Void visitSubqueryExpression(SubqueryExpression node, C context) { process(node.getQuery(), context); return null; } @Override - protected Void visitSortItem(SortItem node, C context) { + public Void visitSortItem(SortItem node, C context) { process(node.getSortKey(), context); return null; } @Override - protected Void visitValues(Values node, C context) { + public Void visitValues(Values node, C context) { for (Expression row : node.getRows()) { process(row, context); } @@ -400,7 +400,7 @@ protected Void visitValues(Values node, C context) { } @Override - protected Void visitRow(Row node, C context) { + public Void visitRow(Row node, C context) { for (Expression expression : node.getItems()) { process(expression, context); } @@ -408,19 +408,19 @@ protected Void visitRow(Row node, C context) { } @Override - protected Void visitTableSubquery(TableSubquery node, C context) { + public Void visitTableSubquery(TableSubquery node, C context) { process(node.getQuery(), context); return null; } @Override - protected Void visitAliasedRelation(AliasedRelation node, C context) { + public Void visitAliasedRelation(AliasedRelation node, C context) { process(node.getRelation(), context); return null; } @Override - protected Void visitJoin(Join node, C context) { + public Void visitJoin(Join node, C context) { process(node.getLeft(), context); process(node.getRight(), context); @@ -438,20 +438,20 @@ protected Void visitJoin(Join node, C context) { } @Override - protected Void visitExists(ExistsPredicate node, C context) { + public Void visitExists(ExistsPredicate node, C context) { process(node.getSubquery(), context); return null; } @Override - protected Void visitCast(Cast node, C context) { + public Void visitCast(Cast node, C context) { process(node.getExpression(), context); return null; } @Override - protected Void visitCreateDB(CreateDB node, C context) { + public Void visitCreateDB(CreateDB node, C context) { for (Property property : node.getProperties()) { process(property, context); } @@ -460,7 +460,7 @@ protected Void visitCreateDB(CreateDB node, C context) { } @Override - protected Void visitAlterDB(AlterDB node, C context) { + public Void visitAlterDB(AlterDB node, C context) { for (Property property : node.getProperties()) { process(property, context); } @@ -469,7 +469,7 @@ protected Void visitAlterDB(AlterDB node, C context) { } @Override - protected Void visitCreateTable(final CreateTable node, final C context) { + public Void visitCreateTable(final CreateTable node, final C context) { for (final Property property : node.getProperties()) { process(property, context); } @@ -478,7 +478,7 @@ protected Void visitCreateTable(final CreateTable node, final C context) { } @Override - protected Void visitCreateView(final CreateView node, final C context) { + public Void visitCreateView(final CreateView node, final C context) { for (final Property property : node.getProperties()) { process(property, context); } @@ -487,7 +487,7 @@ protected Void visitCreateView(final CreateView node, final C context) { } @Override - protected Void visitProperty(Property node, C context) { + public Void visitProperty(Property node, C context) { process(node.getName(), context); if (!node.isSetToDefault()) { process(node.getNonDefaultValue(), context); @@ -496,7 +496,7 @@ protected Void visitProperty(Property node, C context) { } @Override - protected Void visitSetProperties(final SetProperties node, final C context) { + public Void visitSetProperties(final SetProperties node, final C context) { for (final Property property : node.getProperties()) { process(property, context); } @@ -505,21 +505,21 @@ protected Void visitSetProperties(final SetProperties node, final C context) { } @Override - protected Void visitAddColumn(final AddColumn node, final C context) { + public Void visitAddColumn(final AddColumn node, final C context) { process(node.getColumn(), context); return null; } @Override - protected Void visitInsert(Insert node, C context) { + public Void visitInsert(Insert node, C context) { process(node.getQuery(), context); return null; } @Override - protected Void visitDelete(Delete node, C context) { + public Void visitDelete(Delete node, C context) { process(node.getTable(), context); node.getWhere().ifPresent(where -> process(where, context)); @@ -527,7 +527,7 @@ protected Void visitDelete(Delete node, C context) { } @Override - protected Void visitUpdate(Update node, C context) { + public Void visitUpdate(Update node, C context) { process(node.getTable(), context); node.getAssignments().forEach(value -> process(value, context)); node.getWhere().ifPresent(where -> process(where, context)); @@ -536,14 +536,14 @@ protected Void visitUpdate(Update node, C context) { } @Override - protected Void visitUpdateAssignment(UpdateAssignment node, C context) { + public Void visitUpdateAssignment(UpdateAssignment node, C context) { process(node.getName(), context); process(node.getValue(), context); return null; } @Override - protected Void visitGroupBy(GroupBy node, C context) { + public Void visitGroupBy(GroupBy node, C context) { for (GroupingElement groupingElement : node.getGroupingElements()) { process(groupingElement, context); } @@ -552,7 +552,7 @@ protected Void visitGroupBy(GroupBy node, C context) { } @Override - protected Void visitGroupingSets(GroupingSets node, C context) { + public Void visitGroupingSets(GroupingSets node, C context) { for (Expression expression : node.getExpressions()) { process(expression, context); } @@ -561,7 +561,7 @@ protected Void visitGroupingSets(GroupingSets node, C context) { } @Override - protected Void visitSimpleGroupBy(SimpleGroupBy node, C context) { + public Void visitSimpleGroupBy(SimpleGroupBy node, C context) { for (Expression expression : node.getExpressions()) { process(expression, context); } @@ -570,8 +570,7 @@ protected Void visitSimpleGroupBy(SimpleGroupBy node, C context) { } @Override - protected Void visitQuantifiedComparisonExpression( - QuantifiedComparisonExpression node, C context) { + public Void visitQuantifiedComparisonExpression(QuantifiedComparisonExpression node, C context) { process(node.getValue(), context); process(node.getSubquery(), context); @@ -579,14 +578,14 @@ protected Void visitQuantifiedComparisonExpression( } @Override - protected Void visitExcludedPattern(ExcludedPattern node, C context) { + public Void visitExcludedPattern(ExcludedPattern node, C context) { process(node.getPattern(), context); return null; } @Override - protected Void visitPatternAlternation(PatternAlternation node, C context) { + public Void visitPatternAlternation(PatternAlternation node, C context) { for (RowPattern rowPattern : node.getPatterns()) { process(rowPattern, context); } @@ -595,7 +594,7 @@ protected Void visitPatternAlternation(PatternAlternation node, C context) { } @Override - protected Void visitPatternConcatenation(PatternConcatenation node, C context) { + public Void visitPatternConcatenation(PatternConcatenation node, C context) { for (RowPattern rowPattern : node.getPatterns()) { process(rowPattern, context); } @@ -604,7 +603,7 @@ protected Void visitPatternConcatenation(PatternConcatenation node, C context) { } @Override - protected Void visitPatternPermutation(PatternPermutation node, C context) { + public Void visitPatternPermutation(PatternPermutation node, C context) { for (RowPattern rowPattern : node.getPatterns()) { process(rowPattern, context); } @@ -613,14 +612,14 @@ protected Void visitPatternPermutation(PatternPermutation node, C context) { } @Override - protected Void visitPatternVariable(PatternVariable node, C context) { + public Void visitPatternVariable(PatternVariable node, C context) { process(node.getName(), context); return null; } @Override - protected Void visitQuantifiedPattern(QuantifiedPattern node, C context) { + public Void visitQuantifiedPattern(QuantifiedPattern node, C context) { process(node.getPattern(), context); return null; 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 index 99dc7ba2e32ea..9d4a66a1cf912 100644 --- 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 @@ -64,15 +64,15 @@ public Statement rewrite( return (Statement) visitor.process(node, null); } - private static class Visitor extends AstVisitor { + private static class Visitor implements AstVisitor { @Override - protected Node visitShowQueriesStatement(ShowQueriesStatement node, Void context) { + public Node visitShowQueriesStatement(ShowQueriesStatement node, Void context) { return visitShowStatement(node, context); } @Override - protected Node visitShowStatement(final ShowStatement showStatement, final Void context) { + public Node visitShowStatement(final ShowStatement showStatement, final Void context) { return simpleQuery( selectList(new AllColumns()), from(INFORMATION_DATABASE, showStatement.getTableName()), @@ -86,7 +86,7 @@ protected Node visitShowStatement(final ShowStatement showStatement, final Void } @Override - protected Node visitShowExternalService(ShowExternalService node, Void context) { + public Node visitShowExternalService(ShowExternalService node, Void context) { return simpleQuery( selectList(new AllColumns()), from(INFORMATION_DATABASE, node.getTableName()), @@ -100,7 +100,7 @@ protected Node visitShowExternalService(ShowExternalService node, Void context) } @Override - protected Node visitCountStatement(final CountStatement countStatement, final Void context) { + public Node visitCountStatement(final CountStatement countStatement, final Void context) { return simpleQuery( new Select( false, @@ -125,7 +125,7 @@ private static Relation from(final String db, final String table) { } @Override - protected Node visitNode(final Node node, final Void context) { + public Node visitNode(final Node node, final Void context) { return node; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java index 3d2dd14ca9d85..525808014381a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java @@ -45,14 +45,14 @@ public static String formatPattern(RowPattern pattern) { return new Formatter().process(pattern, null); } - public static class Formatter extends AstVisitor { + public static class Formatter implements AstVisitor { @Override - protected String visitNode(Node node, Void context) { + public String visitNode(Node node, Void context) { throw new UnsupportedOperationException(); } @Override - protected String visitRowPattern(RowPattern node, Void context) { + public String visitRowPattern(RowPattern node, Void context) { throw new UnsupportedOperationException( String.format( "not yet implemented: %s.visit%s", @@ -60,21 +60,21 @@ protected String visitRowPattern(RowPattern node, Void context) { } @Override - protected String visitPatternAlternation(PatternAlternation node, Void context) { + public String visitPatternAlternation(PatternAlternation node, Void context) { return node.getPatterns().stream() .map(child -> process(child, context)) .collect(joining(" | ", "(", ")")); } @Override - protected String visitPatternConcatenation(PatternConcatenation node, Void context) { + public String visitPatternConcatenation(PatternConcatenation node, Void context) { return node.getPatterns().stream() .map(child -> process(child, context)) .collect(joining(" ", "(", ")")); } @Override - protected String visitQuantifiedPattern(QuantifiedPattern node, Void context) { + public String visitQuantifiedPattern(QuantifiedPattern node, Void context) { return "(" + process(node.getPattern(), context) + process(node.getPatternQuantifier(), context) @@ -82,24 +82,24 @@ protected String visitQuantifiedPattern(QuantifiedPattern node, Void context) { } @Override - protected String visitPatternVariable(PatternVariable node, Void context) { + public String visitPatternVariable(PatternVariable node, Void context) { return ExpressionFormatter.formatExpression(node.getName()); } @Override - protected String visitEmptyPattern(EmptyPattern node, Void context) { + public String visitEmptyPattern(EmptyPattern node, Void context) { return "()"; } @Override - protected String visitPatternPermutation(PatternPermutation node, Void context) { + public String visitPatternPermutation(PatternPermutation node, Void context) { return node.getPatterns().stream() .map(child -> process(child, context)) .collect(joining(", ", "PERMUTE(", ")")); } @Override - protected String visitAnchorPattern(AnchorPattern node, Void context) { + public String visitAnchorPattern(AnchorPattern node, Void context) { switch (node.getType()) { case PARTITION_START: return "^"; @@ -111,30 +111,30 @@ protected String visitAnchorPattern(AnchorPattern node, Void context) { } @Override - protected String visitExcludedPattern(ExcludedPattern node, Void context) { + public String visitExcludedPattern(ExcludedPattern node, Void context) { return "{-" + process(node.getPattern(), context) + "-}"; } @Override - protected String visitZeroOrMoreQuantifier(ZeroOrMoreQuantifier node, Void context) { + public String visitZeroOrMoreQuantifier(ZeroOrMoreQuantifier node, Void context) { String greedy = node.isGreedy() ? "" : "?"; return "*" + greedy; } @Override - protected String visitOneOrMoreQuantifier(OneOrMoreQuantifier node, Void context) { + public String visitOneOrMoreQuantifier(OneOrMoreQuantifier node, Void context) { String greedy = node.isGreedy() ? "" : "?"; return "+" + greedy; } @Override - protected String visitZeroOrOneQuantifier(ZeroOrOneQuantifier node, Void context) { + public String visitZeroOrOneQuantifier(ZeroOrOneQuantifier node, Void context) { String greedy = node.isGreedy() ? "" : "?"; return "?" + greedy; } @Override - protected String visitRangeQuantifier(RangeQuantifier node, Void context) { + public String visitRangeQuantifier(RangeQuantifier node, Void context) { String greedy = node.isGreedy() ? "" : "?"; String atLeast = node.getAtLeast().map(ExpressionFormatter::formatExpression).orElse(""); String atMost = node.getAtMost().map(ExpressionFormatter::formatExpression).orElse(""); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java index c0bb282d3489b..dc59e32c76f6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java @@ -150,7 +150,7 @@ private static String formatExpression(Expression expression) { return ExpressionFormatter.formatExpression(expression); } - private static class Formatter extends AstVisitor { + private static class Formatter implements AstVisitor { private static class SqlBuilder { private final StringBuilder builder; @@ -178,26 +178,26 @@ public Formatter(StringBuilder builder) { } @Override - protected Void visitNode(Node node, Integer indent) { + public Void visitNode(Node node, Integer indent) { throw new UnsupportedOperationException("not yet implemented: " + node); } @Override - protected Void visitExpression(Expression node, Integer indent) { + public Void visitExpression(Expression node, Integer indent) { checkArgument(indent == 0, "visitExpression should only be called at root"); builder.append(formatExpression(node)); return null; } @Override - protected Void visitRowPattern(RowPattern node, Integer indent) { + public Void visitRowPattern(RowPattern node, Integer indent) { checkArgument(indent == 0, "visitRowPattern should only be called at root"); builder.append(formatPattern(node)); return null; } @Override - protected Void visitQuery(Query node, Integer indent) { + public Void visitQuery(Query node, Integer indent) { node.getWith() .ifPresent( @@ -231,7 +231,7 @@ protected Void visitQuery(Query node, Integer indent) { } @Override - protected Void visitQuerySpecification(QuerySpecification node, Integer indent) { + public Void visitQuerySpecification(QuerySpecification node, Integer indent) { process(node.getSelect(), indent); node.getFrom() @@ -268,7 +268,7 @@ protected Void visitQuerySpecification(QuerySpecification node, Integer indent) } @Override - protected Void visitFill(Fill node, Integer indent) { + public Void visitFill(Fill node, Integer indent) { append(indent, "FILL METHOD ").append(node.getFillMethod().name()); if (node.getFillMethod() == FillPolicy.CONSTANT) { @@ -306,25 +306,25 @@ protected Void visitFill(Fill node, Integer indent) { } @Override - protected Void visitOrderBy(OrderBy node, Integer indent) { + public Void visitOrderBy(OrderBy node, Integer indent) { append(indent, formatOrderBy(node)).append('\n'); return null; } @Override - protected Void visitOffset(Offset node, Integer indent) { + public Void visitOffset(Offset node, Integer indent) { append(indent, "OFFSET ").append(formatExpression(node.getRowCount())).append(" ROWS\n"); return null; } @Override - protected Void visitLimit(Limit node, Integer indent) { + public Void visitLimit(Limit node, Integer indent) { append(indent, "LIMIT ").append(formatExpression(node.getRowCount())).append('\n'); return null; } @Override - protected Void visitSelect(Select node, Integer indent) { + public Void visitSelect(Select node, Integer indent) { append(indent, "SELECT"); if (node.isDistinct()) { builder.append(" DISTINCT"); @@ -349,7 +349,7 @@ protected Void visitSelect(Select node, Integer indent) { } @Override - protected Void visitSingleColumn(SingleColumn node, Integer indent) { + public Void visitSingleColumn(SingleColumn node, Integer indent) { builder.append(formatExpression(node.getExpression())); node.getAlias().ifPresent(alias -> builder.append(' ').append(formatName(alias))); @@ -357,7 +357,7 @@ protected Void visitSingleColumn(SingleColumn node, Integer indent) { } @Override - protected Void visitAllColumns(AllColumns node, Integer indent) { + public Void visitAllColumns(AllColumns node, Integer indent) { node.getTarget().ifPresent(value -> builder.append(formatExpression(value)).append(".")); builder.append("*"); @@ -377,13 +377,13 @@ protected Void visitAllColumns(AllColumns node, Integer indent) { } @Override - protected Void visitTable(Table node, Integer indent) { + public Void visitTable(Table node, Integer indent) { builder.append(formatName(node.getName())); return null; } @Override - protected Void visitJoin(Join node, Integer indent) { + public Void visitJoin(Join node, Integer indent) { JoinCriteria criteria = node.getCriteria().orElse(null); String type = node.getType().toString(); if (criteria instanceof NaturalJoin) { @@ -424,7 +424,7 @@ protected Void visitJoin(Join node, Integer indent) { } @Override - protected Void visitAliasedRelation(AliasedRelation node, Integer indent) { + public Void visitAliasedRelation(AliasedRelation node, Integer indent) { processRelationSuffix(node.getRelation(), indent); builder.append(' ').append(formatName(node.getAlias())); @@ -434,8 +434,7 @@ protected Void visitAliasedRelation(AliasedRelation node, Integer indent) { } @Override - protected Void visitPatternRecognitionRelation( - PatternRecognitionRelation node, Integer indent) { + public Void visitPatternRecognitionRelation(PatternRecognitionRelation node, Integer indent) { processRelationSuffix(node.getInput(), indent); builder.append(" MATCH_RECOGNIZE (\n"); @@ -558,7 +557,7 @@ private void processRelationSuffix(Relation relation, Integer indent) { } @Override - protected Void visitValues(Values node, Integer indent) { + public Void visitValues(Values node, Integer indent) { builder.append(" VALUES "); boolean first = true; @@ -574,7 +573,7 @@ protected Void visitValues(Values node, Integer indent) { } @Override - protected Void visitTableSubquery(TableSubquery node, Integer indent) { + public Void visitTableSubquery(TableSubquery node, Integer indent) { builder.append('(').append('\n'); process(node.getQuery(), indent + 1); @@ -585,7 +584,7 @@ protected Void visitTableSubquery(TableSubquery node, Integer indent) { } @Override - protected Void visitUnion(Union node, Integer indent) { + public Void visitUnion(Union node, Integer indent) { Iterator relations = node.getRelations().iterator(); while (relations.hasNext()) { @@ -603,7 +602,7 @@ protected Void visitUnion(Union node, Integer indent) { } @Override - protected Void visitExcept(Except node, Integer indent) { + public Void visitExcept(Except node, Integer indent) { processRelation(node.getLeft(), indent); builder.append("EXCEPT "); @@ -617,7 +616,7 @@ protected Void visitExcept(Except node, Integer indent) { } @Override - protected Void visitIntersect(Intersect node, Integer indent) { + public Void visitIntersect(Intersect node, Integer indent) { Iterator relations = node.getRelations().iterator(); while (relations.hasNext()) { @@ -635,7 +634,7 @@ protected Void visitIntersect(Intersect node, Integer indent) { } @Override - protected Void visitExplain(Explain node, Integer indent) { + public Void visitExplain(Explain node, Integer indent) { builder.append("EXPLAIN "); builder.append("\n"); @@ -646,7 +645,7 @@ protected Void visitExplain(Explain node, Integer indent) { } @Override - protected Void visitCopyTo(CopyTo node, Integer context) { + public Void visitCopyTo(CopyTo node, Integer context) { builder.append("COPY\n"); builder.append("(\n"); process(node.getQueryStatement(), context); @@ -661,7 +660,7 @@ protected Void visitCopyTo(CopyTo node, Integer context) { } @Override - protected Void visitExplainAnalyze(ExplainAnalyze node, Integer indent) { + public Void visitExplainAnalyze(ExplainAnalyze node, Integer indent) { builder.append("EXPLAIN ANALYZE"); if (node.isVerbose()) { builder.append(" VERBOSE"); @@ -674,14 +673,14 @@ protected Void visitExplainAnalyze(ExplainAnalyze node, Integer indent) { } @Override - protected Void visitShowDB(ShowDB node, Integer indent) { + public Void visitShowDB(ShowDB node, Integer indent) { builder.append("SHOW DATABASE"); return null; } @Override - protected Void visitShowTables(final ShowTables node, final Integer indent) { + public Void visitShowTables(final ShowTables node, final Integer indent) { builder.append("SHOW TABLES"); if (node.isDetails()) { @@ -694,56 +693,56 @@ protected Void visitShowTables(final ShowTables node, final Integer indent) { } @Override - protected Void visitShowFunctions(ShowFunctions node, Integer indent) { + public Void visitShowFunctions(ShowFunctions node, Integer indent) { builder.append("SHOW FUNCTIONS"); return null; } @Override - protected Void visitShowCurrentSqlDialect(ShowCurrentSqlDialect node, Integer context) { + public Void visitShowCurrentSqlDialect(ShowCurrentSqlDialect node, Integer context) { builder.append(node.toString()); return null; } @Override - protected Void visitShowCurrentDatabase(ShowCurrentDatabase node, Integer context) { + public Void visitShowCurrentDatabase(ShowCurrentDatabase node, Integer context) { builder.append(node.toString()); return null; } @Override - protected Void visitShowCurrentUser(ShowCurrentUser node, Integer context) { + public Void visitShowCurrentUser(ShowCurrentUser node, Integer context) { builder.append(node.toString()); return null; } @Override - protected Void visitShowVersion(ShowVersion node, Integer context) { + public Void visitShowVersion(ShowVersion node, Integer context) { builder.append(node.toString()); return null; } @Override - protected Void visitShowVariables(ShowVariables node, Integer context) { + public Void visitShowVariables(ShowVariables node, Integer context) { builder.append(node.toString()); return null; } @Override - protected Void visitShowClusterId(ShowClusterId node, Integer context) { + public Void visitShowClusterId(ShowClusterId node, Integer context) { builder.append(node.toString()); return null; } @Override - protected Void visitShowCurrentTimestamp(ShowCurrentTimestamp node, Integer context) { + public Void visitShowCurrentTimestamp(ShowCurrentTimestamp node, Integer context) { builder.append(node.toString()); return null; } @Override - protected Void visitDelete(final Delete node, final Integer indent) { + public Void visitDelete(final Delete node, final Integer indent) { builder.append("DELETE FROM ").append(formatName(node.getTable().getName())); node.getWhere().ifPresent(where -> builder.append(" WHERE ").append(formatExpression(where))); @@ -752,7 +751,7 @@ protected Void visitDelete(final Delete node, final Integer indent) { } @Override - protected Void visitCreateDB(final CreateDB node, final Integer indent) { + public Void visitCreateDB(final CreateDB node, final Integer indent) { builder.append("CREATE DATABASE "); if (node.exists()) { builder.append("IF NOT EXISTS "); @@ -765,7 +764,7 @@ protected Void visitCreateDB(final CreateDB node, final Integer indent) { } @Override - protected Void visitAlterDB(final AlterDB node, final Integer indent) { + public Void visitAlterDB(final AlterDB node, final Integer indent) { builder.append("ALTER DATABASE "); if (node.exists()) { builder.append("IF EXISTS "); @@ -778,7 +777,7 @@ protected Void visitAlterDB(final AlterDB node, final Integer indent) { } @Override - protected Void visitDropDB(final DropDB node, final Integer indent) { + public Void visitDropDB(final DropDB node, final Integer indent) { builder.append("DROP DATABASE "); if (node.isExists()) { builder.append("IF EXISTS "); @@ -788,7 +787,7 @@ protected Void visitDropDB(final DropDB node, final Integer indent) { } @Override - protected Void visitCreateTable(final CreateTable node, final Integer indent) { + public Void visitCreateTable(final CreateTable node, final Integer indent) { builder.append("CREATE TABLE "); if (node.isIfNotExists()) { builder.append("IF NOT EXISTS "); @@ -823,7 +822,7 @@ protected Void visitCreateTable(final CreateTable node, final Integer indent) { } @Override - protected Void visitCreateView(final CreateView node, final Integer indent) { + public Void visitCreateView(final CreateView node, final Integer indent) { builder.append("CREATE "); if (node.isReplace()) { builder.append("OR REPLACE "); @@ -910,7 +909,7 @@ private String formatColumnDefinition(ColumnDefinition column) { } @Override - protected Void visitDropTable(final DropTable node, final Integer indent) { + public Void visitDropTable(final DropTable node, final Integer indent) { builder.append("DROP"); builder.append(node.isView() ? " VIEW " : " TABLE "); if (node.isExists()) { @@ -922,7 +921,7 @@ protected Void visitDropTable(final DropTable node, final Integer indent) { } @Override - protected Void visitRenameTable(final RenameTable node, final Integer indent) { + public Void visitRenameTable(final RenameTable node, final Integer indent) { builder.append("ALTER"); builder.append(node.isView() ? " VIEW " : " TABLE "); if (node.tableIfExists()) { @@ -938,7 +937,7 @@ protected Void visitRenameTable(final RenameTable node, final Integer indent) { } @Override - protected Void visitSetProperties(final SetProperties node, final Integer context) { + public Void visitSetProperties(final SetProperties node, final Integer context) { final SetProperties.Type type = node.getType(); builder.append("ALTER "); switch (type) { @@ -974,7 +973,7 @@ private String joinProperties(List properties) { } @Override - protected Void visitRenameColumn(RenameColumn node, Integer indent) { + public Void visitRenameColumn(RenameColumn node, Integer indent) { builder.append("ALTER"); builder.append(node.isView() ? " VIEW " : " TABLE "); if (node.tableIfExists()) { @@ -995,7 +994,7 @@ protected Void visitRenameColumn(RenameColumn node, Integer indent) { } @Override - protected Void visitDropColumn(final DropColumn node, final Integer indent) { + public Void visitDropColumn(final DropColumn node, final Integer indent) { builder.append("ALTER"); builder.append(node.isView() ? " VIEW " : " TABLE "); if (node.tableIfExists()) { @@ -1013,7 +1012,7 @@ protected Void visitDropColumn(final DropColumn node, final Integer indent) { } @Override - protected Void visitAddColumn(final AddColumn node, final Integer indent) { + public Void visitAddColumn(final AddColumn node, final Integer indent) { builder.append("ALTER"); builder.append(node.isView() ? " VIEW " : " TABLE "); if (node.tableIfExists()) { @@ -1031,7 +1030,7 @@ protected Void visitAddColumn(final AddColumn node, final Integer indent) { } @Override - protected Void visitSetTableComment(final SetTableComment node, final Integer indent) { + public Void visitSetTableComment(final SetTableComment node, final Integer indent) { builder .append("COMMENT ON") .append(node.isView() ? " VIEW " : " TABLE ") @@ -1042,7 +1041,7 @@ protected Void visitSetTableComment(final SetTableComment node, final Integer in } @Override - protected Void visitSetColumnComment(final SetColumnComment node, final Integer indent) { + public Void visitSetColumnComment(final SetColumnComment node, final Integer indent) { builder .append("COMMENT ON COLUMN ") .append(formatName(node.getTable())) @@ -1054,7 +1053,7 @@ protected Void visitSetColumnComment(final SetColumnComment node, final Integer } @Override - protected Void visitInsert(Insert node, Integer indent) { + public Void visitInsert(Insert node, Integer indent) { builder.append("INSERT INTO ").append(formatName(node.getTarget())); node.getColumns() @@ -1069,7 +1068,7 @@ protected Void visitInsert(Insert node, Integer indent) { } @Override - protected Void visitUpdate(Update node, Integer indent) { + public Void visitUpdate(Update node, Integer indent) { builder.append("UPDATE ").append(formatName(node.getTable().getName())).append(" SET"); int setCounter = node.getAssignments().size() - 1; for (UpdateAssignment assignment : node.getAssignments()) { @@ -1096,7 +1095,7 @@ protected Void visitUpdate(Update node, Integer indent) { } @Override - protected Void visitRow(Row node, Integer indent) { + public Void visitRow(Row node, Integer indent) { builder.append("ROW("); boolean firstItem = true; for (Expression item : node.getItems()) { @@ -1111,7 +1110,7 @@ protected Void visitRow(Row node, Integer indent) { } @Override - protected Void visitCreateFunction(CreateFunction node, Integer indent) { + public Void visitCreateFunction(CreateFunction node, Integer indent) { builder .append("CREATE FUNCTION ") .append(node.getUdfName()) @@ -1122,14 +1121,14 @@ protected Void visitCreateFunction(CreateFunction node, Integer indent) { } @Override - protected Void visitDropFunction(DropFunction node, Integer indent) { + public Void visitDropFunction(DropFunction node, Integer indent) { builder.append("DROP FUNCTION "); builder.append(node.getUdfName()); return null; } @Override - protected Void visitLoadTsFile(final LoadTsFile node, final Integer indent) { + public Void visitLoadTsFile(final LoadTsFile node, final Integer indent) { builder.append("LOAD "); builder.append("\"" + node.getFilePath() + "\""); builder.append(" \n"); @@ -1155,7 +1154,7 @@ protected Void visitLoadTsFile(final LoadTsFile node, final Integer indent) { } @Override - protected Void visitCreatePipe(CreatePipe node, Integer context) { + public Void visitCreatePipe(CreatePipe node, Integer context) { builder.append("CREATE PIPE "); if (node.hasIfNotExistsCondition()) { builder.append("IF NOT EXISTS "); @@ -1221,7 +1220,7 @@ protected Void visitCreatePipe(CreatePipe node, Integer context) { } @Override - protected Void visitAlterPipe(AlterPipe node, Integer context) { + public Void visitAlterPipe(AlterPipe node, Integer context) { builder.append("ALTER PIPE "); if (node.hasIfExistsCondition()) { builder.append("IF EXISTS "); @@ -1284,7 +1283,7 @@ protected Void visitAlterPipe(AlterPipe node, Integer context) { } @Override - protected Void visitDropPipe(DropPipe node, Integer context) { + public Void visitDropPipe(DropPipe node, Integer context) { builder.append("DROP PIPE "); if (node.hasIfExistsCondition()) { builder.append("IF EXISTS "); @@ -1295,21 +1294,21 @@ protected Void visitDropPipe(DropPipe node, Integer context) { } @Override - protected Void visitStartPipe(StartPipe node, Integer context) { + public Void visitStartPipe(StartPipe node, Integer context) { builder.append("START PIPE ").append(node.getPipeName()); return null; } @Override - protected Void visitStopPipe(StopPipe node, Integer context) { + public Void visitStopPipe(StopPipe node, Integer context) { builder.append("STOP PIPE ").append(node.getPipeName()); return null; } @Override - protected Void visitShowPipes(ShowPipes node, Integer context) { + public Void visitShowPipes(ShowPipes node, Integer context) { builder.append("SHOW PIPES"); // TODO: consider pipeName and hasWhereClause in node @@ -1318,7 +1317,7 @@ protected Void visitShowPipes(ShowPipes node, Integer context) { } @Override - protected Void visitCreatePipePlugin(CreatePipePlugin node, Integer context) { + public Void visitCreatePipePlugin(CreatePipePlugin node, Integer context) { builder.append("CREATE PIPEPLUGIN "); if (node.hasIfNotExistsCondition()) { builder.append("IF NOT EXISTS "); @@ -1338,7 +1337,7 @@ protected Void visitCreatePipePlugin(CreatePipePlugin node, Integer context) { } @Override - protected Void visitDropPipePlugin(DropPipePlugin node, Integer context) { + public Void visitDropPipePlugin(DropPipePlugin node, Integer context) { builder.append("DROP PIPEPLUGIN "); if (node.hasIfExistsCondition()) { builder.append("IF EXISTS "); @@ -1349,14 +1348,14 @@ protected Void visitDropPipePlugin(DropPipePlugin node, Integer context) { } @Override - protected Void visitShowPipePlugins(ShowPipePlugins node, Integer context) { + public Void visitShowPipePlugins(ShowPipePlugins node, Integer context) { builder.append("SHOW PIPEPLUGINS"); return null; } @Override - protected Void visitCreateTopic(CreateTopic node, Integer context) { + public Void visitCreateTopic(CreateTopic node, Integer context) { builder.append("CREATE TOPIC "); if (node.hasIfNotExistsCondition()) { builder.append("IF NOT EXISTS "); @@ -1386,7 +1385,7 @@ protected Void visitCreateTopic(CreateTopic node, Integer context) { } @Override - protected Void visitDropTopic(DropTopic node, Integer context) { + public Void visitDropTopic(DropTopic node, Integer context) { builder.append("DROP TOPIC "); if (node.hasIfExistsCondition()) { builder.append("IF EXISTS "); @@ -1397,7 +1396,7 @@ protected Void visitDropTopic(DropTopic node, Integer context) { } @Override - protected Void visitShowTopics(ShowTopics node, Integer context) { + public Void visitShowTopics(ShowTopics node, Integer context) { if (Objects.isNull(node.getTopicName())) { builder.append("SHOW TOPICS"); } else { @@ -1408,7 +1407,7 @@ protected Void visitShowTopics(ShowTopics node, Integer context) { } @Override - protected Void visitShowSubscriptions(ShowSubscriptions node, Integer context) { + public Void visitShowSubscriptions(ShowSubscriptions node, Integer context) { if (Objects.isNull(node.getTopicName())) { builder.append("SHOW SUBSCRIPTIONS"); } else { @@ -1419,7 +1418,7 @@ protected Void visitShowSubscriptions(ShowSubscriptions node, Integer context) { } @Override - protected Void visitDropSubscription(DropSubscription node, Integer context) { + public Void visitDropSubscription(DropSubscription node, Integer context) { builder.append("DROP SUBSCRIPTION "); if (node.hasIfExistsCondition()) { builder.append("IF EXISTS "); @@ -1430,7 +1429,7 @@ protected Void visitDropSubscription(DropSubscription node, Integer context) { } @Override - protected Void visitRelationalAuthorPlan(RelationalAuthorStatement node, Integer context) { + public Void visitRelationalAuthorPlan(RelationalAuthorStatement node, Integer context) { switch (node.getAuthorType()) { case GRANT_USER_ANY: builder.append( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java index ebec8cecdbf0b..e356cd16cb222 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java @@ -29,7 +29,7 @@ import org.apache.iotdb.rpc.TSStatusCode; public class LoadTableConvertedInsertTabletStatementExceptionVisitor - extends AstVisitor { + implements AstVisitor { @Override public TSStatus visitNode(final Node node, final Exception context) { if (context instanceof AccessDeniedException) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableStatementDataTypeConvertExecutionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableStatementDataTypeConvertExecutionVisitor.java index 26a7ff6a4fb06..5a09a7eba9429 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableStatementDataTypeConvertExecutionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableStatementDataTypeConvertExecutionVisitor.java @@ -42,7 +42,7 @@ import static org.apache.iotdb.db.storageengine.load.converter.LoadTreeStatementDataTypeConvertExecutionVisitor.handleTSStatus; public class LoadTableStatementDataTypeConvertExecutionVisitor - extends AstVisitor, String> { + implements AstVisitor, String> { private static final Logger LOGGER = LoggerFactory.getLogger(LoadTableStatementDataTypeConvertExecutionVisitor.class); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java index 77e16c3430527..3fce94b518839 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java @@ -89,7 +89,7 @@ * NOT (X = 3 AND X = 3 AND X < 10) * */ -public final class ExpressionVerifier extends AstVisitor { +public final class ExpressionVerifier implements AstVisitor { private final SymbolAliases symbolAliases; public ExpressionVerifier(SymbolAliases symbolAliases) { @@ -97,13 +97,13 @@ public ExpressionVerifier(SymbolAliases symbolAliases) { } @Override - protected Boolean visitNode(Node node, Expression expectedExpression) { + public Boolean visitNode(Node node, Expression expectedExpression) { throw new IllegalStateException( format("Node %s is not supported", node.getClass().getSimpleName())); } @Override - protected Boolean visitGenericLiteral(GenericLiteral actual, Expression expectedExpression) { + public Boolean visitGenericLiteral(GenericLiteral actual, Expression expectedExpression) { if (!(expectedExpression instanceof GenericLiteral)) { return false; } @@ -113,7 +113,7 @@ protected Boolean visitGenericLiteral(GenericLiteral actual, Expression expected } @Override - protected Boolean visitStringLiteral(StringLiteral actual, Expression expectedExpression) { + public Boolean visitStringLiteral(StringLiteral actual, Expression expectedExpression) { if (!(expectedExpression instanceof StringLiteral)) { return false; } @@ -122,7 +122,7 @@ protected Boolean visitStringLiteral(StringLiteral actual, Expression expectedEx } @Override - protected Boolean visitLongLiteral(LongLiteral actual, Expression expectedExpression) { + public Boolean visitLongLiteral(LongLiteral actual, Expression expectedExpression) { if (!(expectedExpression instanceof LongLiteral)) { return false; } @@ -131,7 +131,7 @@ protected Boolean visitLongLiteral(LongLiteral actual, Expression expectedExpres } @Override - protected Boolean visitDoubleLiteral(DoubleLiteral actual, Expression expectedExpression) { + public Boolean visitDoubleLiteral(DoubleLiteral actual, Expression expectedExpression) { if (!(expectedExpression instanceof DoubleLiteral)) { return false; } @@ -140,7 +140,7 @@ protected Boolean visitDoubleLiteral(DoubleLiteral actual, Expression expectedEx } @Override - protected Boolean visitFloatLiteral(FloatLiteral actual, Expression expectedExpression) { + public Boolean visitFloatLiteral(FloatLiteral actual, Expression expectedExpression) { if (!(expectedExpression instanceof FloatLiteral)) { return false; } @@ -149,7 +149,7 @@ protected Boolean visitFloatLiteral(FloatLiteral actual, Expression expectedExpr } @Override - protected Boolean visitDecimalLiteral(DecimalLiteral actual, Expression expectedExpression) { + public Boolean visitDecimalLiteral(DecimalLiteral actual, Expression expectedExpression) { if (!(expectedExpression instanceof DecimalLiteral)) { return false; } @@ -158,7 +158,7 @@ protected Boolean visitDecimalLiteral(DecimalLiteral actual, Expression expected } @Override - protected Boolean visitBooleanLiteral(BooleanLiteral actual, Expression expectedExpression) { + public Boolean visitBooleanLiteral(BooleanLiteral actual, Expression expectedExpression) { if (!(expectedExpression instanceof BooleanLiteral)) { return false; } @@ -167,7 +167,7 @@ protected Boolean visitBooleanLiteral(BooleanLiteral actual, Expression expected } @Override - protected Boolean visitNullLiteral(NullLiteral node, Expression expectedExpression) { + public Boolean visitNullLiteral(NullLiteral node, Expression expectedExpression) { return expectedExpression instanceof NullLiteral; } @@ -205,7 +205,7 @@ private static String getValueFromLiteral(Node expression) { } @Override - protected Boolean visitSymbolReference(SymbolReference actual, Expression expectedExpression) { + public Boolean visitSymbolReference(SymbolReference actual, Expression expectedExpression) { if (!(expectedExpression instanceof SymbolReference)) { return false; } @@ -215,7 +215,7 @@ protected Boolean visitSymbolReference(SymbolReference actual, Expression expect } @Override - protected Boolean visitDereferenceExpression( + public Boolean visitDereferenceExpression( DereferenceExpression actual, Expression expectedExpression) { if (!(expectedExpression instanceof DereferenceExpression)) { return false; @@ -227,7 +227,7 @@ protected Boolean visitDereferenceExpression( } @Override - protected Boolean visitIfExpression(IfExpression actual, Expression expectedExpression) { + public Boolean visitIfExpression(IfExpression actual, Expression expectedExpression) { if (!(expectedExpression instanceof IfExpression)) { return false; } @@ -239,7 +239,7 @@ && process(actual.getTrueValue(), expected.getTrueValue()) } @Override - protected Boolean visitCast(Cast actual, Expression expectedExpression) { + public Boolean visitCast(Cast actual, Expression expectedExpression) { if (!(expectedExpression instanceof Cast)) { return false; } @@ -259,7 +259,7 @@ protected Boolean visitCast(Cast actual, Expression expectedExpression) { } @Override - protected Boolean visitIsNullPredicate(IsNullPredicate actual, Expression expectedExpression) { + public Boolean visitIsNullPredicate(IsNullPredicate actual, Expression expectedExpression) { if (!(expectedExpression instanceof IsNullPredicate)) { return false; } @@ -269,8 +269,7 @@ protected Boolean visitIsNullPredicate(IsNullPredicate actual, Expression expect } @Override - protected Boolean visitIsNotNullPredicate( - IsNotNullPredicate actual, Expression expectedExpression) { + public Boolean visitIsNotNullPredicate(IsNotNullPredicate actual, Expression expectedExpression) { if (!(expectedExpression instanceof IsNotNullPredicate)) { return false; } @@ -280,7 +279,7 @@ protected Boolean visitIsNotNullPredicate( } @Override - protected Boolean visitInPredicate(InPredicate actual, Expression expectedExpression) { + public Boolean visitInPredicate(InPredicate actual, Expression expectedExpression) { if (!(expectedExpression instanceof InPredicate)) { return false; } @@ -320,7 +319,7 @@ protected Boolean visitInPredicate(InPredicate actual, Expression expectedExpres } @Override - protected Boolean visitInListExpression(InListExpression actual, Expression expectedExpression) { + public Boolean visitInListExpression(InListExpression actual, Expression expectedExpression) { if (!(expectedExpression instanceof InListExpression)) { return false; } @@ -330,7 +329,7 @@ protected Boolean visitInListExpression(InListExpression actual, Expression expe } @Override - protected Boolean visitComparisonExpression( + public Boolean visitComparisonExpression( ComparisonExpression actual, Expression expectedExpression) { if (!(expectedExpression instanceof ComparisonExpression)) { return false; @@ -349,7 +348,7 @@ && process(actual.getLeft(), expected.getRight()) } @Override - protected Boolean visitBetweenPredicate(BetweenPredicate actual, Expression expectedExpression) { + public Boolean visitBetweenPredicate(BetweenPredicate actual, Expression expectedExpression) { if (!(expectedExpression instanceof BetweenPredicate)) { return false; } @@ -361,7 +360,7 @@ && process(actual.getMin(), expected.getMin()) } @Override - protected Boolean visitArithmeticUnary( + public Boolean visitArithmeticUnary( ArithmeticUnaryExpression actual, Expression expectedExpression) { if (!(expectedExpression instanceof ArithmeticUnaryExpression)) { return false; @@ -373,7 +372,7 @@ protected Boolean visitArithmeticUnary( } @Override - protected Boolean visitArithmeticBinary( + public Boolean visitArithmeticBinary( ArithmeticBinaryExpression actual, Expression expectedExpression) { if (!(expectedExpression instanceof ArithmeticBinaryExpression)) { return false; @@ -386,7 +385,7 @@ && process(actual.getLeft(), expected.getLeft()) } @Override - protected Boolean visitNotExpression(NotExpression actual, Expression expectedExpression) { + public Boolean visitNotExpression(NotExpression actual, Expression expectedExpression) { if (!(expectedExpression instanceof NotExpression)) { return false; } @@ -396,8 +395,7 @@ protected Boolean visitNotExpression(NotExpression actual, Expression expectedEx } @Override - protected Boolean visitLogicalExpression( - LogicalExpression actual, Expression expectedExpression) { + public Boolean visitLogicalExpression(LogicalExpression actual, Expression expectedExpression) { if (!(expectedExpression instanceof LogicalExpression)) { return false; } @@ -418,8 +416,7 @@ protected Boolean visitLogicalExpression( } @Override - protected Boolean visitCoalesceExpression( - CoalesceExpression actual, Expression expectedExpression) { + public Boolean visitCoalesceExpression(CoalesceExpression actual, Expression expectedExpression) { if (!(expectedExpression instanceof CoalesceExpression)) { return false; } @@ -438,7 +435,7 @@ protected Boolean visitCoalesceExpression( } @Override - protected Boolean visitSimpleCaseExpression( + public Boolean visitSimpleCaseExpression( SimpleCaseExpression actual, Expression expectedExpression) { if (!(expectedExpression instanceof SimpleCaseExpression)) { return false; @@ -451,8 +448,7 @@ && process(actual.getWhenClauses(), expected.getWhenClauses()) } @Override - protected Boolean visitSearchedCaseExpression( - SearchedCaseExpression actual, Expression expected) { + public Boolean visitSearchedCaseExpression(SearchedCaseExpression actual, Expression expected) { if (!(expected instanceof SearchedCaseExpression)) { return false; } @@ -470,7 +466,7 @@ protected Boolean visitSearchedCaseExpression( } @Override - protected Boolean visitWhenClause(WhenClause actual, Expression expectedExpression) { + public Boolean visitWhenClause(WhenClause actual, Expression expectedExpression) { if (!(expectedExpression instanceof WhenClause)) { return false; } @@ -481,7 +477,7 @@ protected Boolean visitWhenClause(WhenClause actual, Expression expectedExpressi } @Override - protected Boolean visitFunctionCall(FunctionCall actual, Expression expectedExpression) { + public Boolean visitFunctionCall(FunctionCall actual, Expression expectedExpression) { if (!(expectedExpression instanceof FunctionCall)) { return false; } @@ -492,7 +488,7 @@ protected Boolean visitFunctionCall(FunctionCall actual, Expression expectedExpr } @Override - protected Boolean visitRow(Row actual, Expression expectedExpression) { + public Boolean visitRow(Row actual, Expression expectedExpression) { if (!(expectedExpression instanceof Row)) { return false; } From 9cc8309468c9291b64ef308d7ec47160c6a3a4cf Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Thu, 16 Apr 2026 16:05:21 +0800 Subject: [PATCH 24/45] move partial sql formatter --- .../table/v1/handler/ExceptionHandler.java | 2 +- .../sql/util/CommonQuerySqlFormatter.java | 346 ++++ .../sql/util/DataNodeSqlFormatter.java | 1414 ++++++++++++++ .../relational/sql/util/SqlFormatter.java | 1723 +---------------- 4 files changed, 1777 insertions(+), 1708 deletions(-) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java index 61e64465a0678..a072e4d2c16f6 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java @@ -27,7 +27,7 @@ import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; -import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.rest.protocol.model.ExecutionStatus; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java new file mode 100644 index 0000000000000..762200bf1a31b --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java @@ -0,0 +1,346 @@ +/* + * 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.util; + +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; +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.NaturalJoin; + +import com.google.common.base.Joiner; +import com.google.common.base.Strings; + +import java.util.Iterator; +import java.util.List; + +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.collect.ImmutableList.toImmutableList; +import static com.google.common.collect.Iterables.getOnlyElement; +import static java.util.stream.Collectors.joining; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter.formatOrderBy; + +public class CommonQuerySqlFormatter implements CommonQueryAstVisitor { + + protected final SqlFormatter.SqlBuilder builder; + + public CommonQuerySqlFormatter(StringBuilder builder) { + this.builder = new SqlFormatter.SqlBuilder(builder); + } + + @Override + public Void visitNode(Node node, Integer indent) { + throw new UnsupportedOperationException("not yet implemented: " + node); + } + + @Override + public Void visitExpression(Expression node, Integer indent) { + checkArgument(indent == 0, "visitExpression should only be called at root"); + builder.append(SqlFormatter.formatExpression(node)); + return null; + } + + @Override + public Void visitQuery(Query node, Integer indent) { + node.getWith() + .ifPresent( + with -> { + append(indent, "WITH"); + if (with.isRecursive()) { + builder.append(" RECURSIVE"); + } + builder.append("\n "); + Iterator queries = with.getQueries().iterator(); + while (queries.hasNext()) { + WithQuery query = queries.next(); + append(indent, SqlFormatter.formatName(query.getName())); + query + .getColumnNames() + .ifPresent(columnNames -> appendAliasColumns(builder, columnNames)); + builder.append(" AS "); + process(new TableSubquery(query.getQuery()), indent); + builder.append('\n'); + if (queries.hasNext()) { + builder.append(", "); + } + } + }); + + processRelation(node.getQueryBody(), indent); + node.getOrderBy().ifPresent(orderBy -> process(orderBy, indent)); + node.getOffset().ifPresent(offset -> process(offset, indent)); + node.getLimit().ifPresent(limit -> process(limit, indent)); + return null; + } + + @Override + public Void visitFill(Fill node, Integer indent) { + append(indent, "FILL METHOD ").append(node.getFillMethod().name()); + + if (node.getFillMethod() == FillPolicy.CONSTANT) { + builder.append(SqlFormatter.formatExpression(node.getFillValue().get())); + } else if (node.getFillMethod() == FillPolicy.LINEAR) { + node.getTimeColumnIndex() + .ifPresent(index -> builder.append(" TIME_COLUMN ").append(String.valueOf(index))); + node.getFillGroupingElements() + .ifPresent( + elements -> + builder + .append(" FILL_GROUP ") + .append( + elements.stream() + .map(SqlFormatter::formatExpression) + .collect(joining(", ")))); + } else if (node.getFillMethod() == FillPolicy.PREVIOUS) { + node.getTimeBound() + .ifPresent(timeBound -> builder.append(" TIME_BOUND ").append(timeBound.toString())); + node.getTimeColumnIndex() + .ifPresent(index -> builder.append(" TIME_COLUMN ").append(String.valueOf(index))); + node.getFillGroupingElements() + .ifPresent( + elements -> + builder + .append(" FILL_GROUP ") + .append( + elements.stream() + .map(SqlFormatter::formatExpression) + .collect(joining(", ")))); + } else { + throw new IllegalArgumentException("Unknown fill method: " + node.getFillMethod()); + } + return null; + } + + @Override + public Void visitOrderBy(OrderBy node, Integer indent) { + append(indent, formatOrderBy(node)).append('\n'); + return null; + } + + @Override + public Void visitOffset(Offset node, Integer indent) { + append(indent, "OFFSET ") + .append(SqlFormatter.formatExpression(node.getRowCount())) + .append(" ROWS\n"); + return null; + } + + @Override + public Void visitLimit(Limit node, Integer indent) { + append(indent, "LIMIT ").append(SqlFormatter.formatExpression(node.getRowCount())).append('\n'); + return null; + } + + @Override + public Void visitSingleColumn(SingleColumn node, Integer indent) { + builder.append(SqlFormatter.formatExpression(node.getExpression())); + node.getAlias().ifPresent(alias -> builder.append(' ').append(SqlFormatter.formatName(alias))); + return null; + } + + @Override + public Void visitAllColumns(AllColumns node, Integer indent) { + node.getTarget() + .ifPresent(value -> builder.append(SqlFormatter.formatExpression(value)).append(".")); + builder.append("*"); + + if (!node.getAliases().isEmpty()) { + builder + .append(" AS (") + .append( + Joiner.on(", ") + .join( + node.getAliases().stream() + .map(SqlFormatter::formatName) + .collect(toImmutableList()))) + .append(")"); + } + + return null; + } + + @Override + public Void visitJoin(Join node, Integer indent) { + JoinCriteria criteria = node.getCriteria().orElse(null); + String type = node.getType().toString(); + if (criteria instanceof NaturalJoin) { + type = "NATURAL " + type; + } + + if (node.getType() != Join.Type.IMPLICIT) { + builder.append('('); + } + process(node.getLeft(), indent); + + builder.append('\n'); + if (node.getType() == Join.Type.IMPLICIT) { + append(indent, ", "); + } else { + append(indent, type).append(" JOIN "); + } + + process(node.getRight(), indent); + + if (node.getType() != Join.Type.CROSS && node.getType() != Join.Type.IMPLICIT) { + if (criteria instanceof JoinUsing) { + JoinUsing using = (JoinUsing) criteria; + builder.append(" USING (").append(Joiner.on(", ").join(using.getColumns())).append(")"); + } else if (criteria instanceof JoinOn) { + JoinOn on = (JoinOn) criteria; + builder.append(" ON ").append(SqlFormatter.formatExpression(on.getExpression())); + } else if (!(criteria instanceof NaturalJoin)) { + throw new UnsupportedOperationException("unknown join criteria: " + criteria); + } + } + + if (node.getType() != Join.Type.IMPLICIT) { + builder.append(")"); + } + + return null; + } + + @Override + public Void visitAliasedRelation(AliasedRelation node, Integer indent) { + processRelationSuffix(node.getRelation(), indent); + + builder.append(' ').append(SqlFormatter.formatName(node.getAlias())); + appendAliasColumns(builder, node.getColumnNames()); + + return null; + } + + @Override + public Void visitValues(Values node, Integer indent) { + builder.append(" VALUES "); + + boolean first = true; + for (Expression row : node.getRows()) { + builder.append("\n").append(indentString(indent)).append(first ? " " : ", "); + builder.append(SqlFormatter.formatExpression(row)); + first = false; + } + builder.append('\n'); + + return null; + } + + @Override + public Void visitTableSubquery(TableSubquery node, Integer indent) { + builder.append('(').append('\n'); + + process(node.getQuery(), indent + 1); + + append(indent, ") "); + + return null; + } + + @Override + public Void visitRow(Row node, Integer indent) { + builder.append("ROW("); + boolean firstItem = true; + for (Expression item : node.getItems()) { + if (!firstItem) { + builder.append(", "); + } + process(item, indent); + firstItem = false; + } + builder.append(")"); + return null; + } + + protected void processRelationSuffix(Relation relation, Integer indent) { + if (needsParenthesesForRelationSuffix(relation)) { + builder.append("( "); + process(relation, indent + 1); + append(indent, ")"); + } else { + process(relation, indent); + } + } + + protected boolean needsParenthesesForRelationSuffix(Relation relation) { + return relation instanceof AliasedRelation; + } + + protected void processRelation(Relation relation, Integer indent) { + if (isSimpleTableRelation(relation)) { + builder.append("TABLE ").append(formatSimpleTableRelationName(relation)).append('\n'); + } else { + process(relation, indent); + } + } + + protected boolean isSimpleTableRelation(Relation relation) { + return false; + } + + protected String formatSimpleTableRelationName(Relation relation) { + throw new UnsupportedOperationException("unsupported relation: " + relation); + } + + protected SqlFormatter.SqlBuilder append(int indent, String value) { + return builder.append(indentString(indent)).append(value); + } + + protected static String indentString(int indent) { + return Strings.repeat(SqlFormatter.INDENT, indent); + } + + protected void formatDefinitionList(List elements, int indent) { + if (elements.size() == 1) { + builder.append(" ").append(getOnlyElement(elements)).append("\n"); + } else { + builder.append("\n"); + for (int i = 0; i < elements.size() - 1; i++) { + append(indent, elements.get(i)).append(",\n"); + } + append(indent, elements.get(elements.size() - 1)).append("\n"); + } + } + + protected void appendAliasColumns(SqlFormatter.SqlBuilder builder, List columns) { + if ((columns != null) && !columns.isEmpty()) { + String formattedColumns = + columns.stream().map(SqlFormatter::formatName).collect(joining(", ")); + builder.append(" (").append(formattedColumns).append(')'); + } + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java new file mode 100644 index 0000000000000..a57b5893510d5 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java @@ -0,0 +1,1414 @@ +/* + * 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.util; + +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ColumnDefinition; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CopyTo; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateDB; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateFunction; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreatePipe; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreatePipePlugin; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTable; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTopic; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateView; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; +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.DropFunction; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropPipe; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropPipePlugin; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropSubscription; +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.Except; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RelationalAuthorStatement; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameColumn; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetColumnComment; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetProperties; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetTableComment; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowClusterId; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowCurrentDatabase; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowCurrentSqlDialect; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowCurrentTimestamp; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowCurrentUser; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDB; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowFunctions; +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.ShowSubscriptions; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTables; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTopics; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVariables; +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.Table; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionArgument; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; + +import com.google.common.base.Joiner; + +import java.util.Iterator; +import java.util.List; +import java.util.Objects; + +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkState; +import static java.util.stream.Collectors.joining; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter.formatOrderBy; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.RowPatternFormatter.formatPattern; + +public class DataNodeSqlFormatter extends CommonQuerySqlFormatter + implements AstVisitor { + + public DataNodeSqlFormatter(StringBuilder builder) { + super(builder); + } + + @Override + public Void visitRowPattern(RowPattern node, Integer indent) { + checkArgument(indent == 0, "visitRowPattern should only be called at root"); + builder.append(formatPattern(node)); + return null; + } + + @Override + public Void visitQuerySpecification(QuerySpecification node, Integer indent) { + process(node.getSelect(), indent); + + node.getFrom() + .ifPresent( + from -> { + append(indent, "FROM"); + builder.append('\n'); + append(indent, " "); + process(from, indent); + }); + + builder.append('\n'); + + node.getWhere() + .ifPresent( + where -> append(indent, "WHERE " + SqlFormatter.formatExpression(where)).append('\n')); + + node.getGroupBy() + .ifPresent( + groupBy -> + append( + indent, + "GROUP BY " + + (groupBy.isDistinct() ? " DISTINCT " : "") + + org.apache.iotdb.db.node_commons.plan.relational.sql.util + .ExpressionFormatter.formatGroupBy(groupBy.getGroupingElements())) + .append('\n')); + + node.getHaving() + .ifPresent( + having -> + append(indent, "HAVING " + SqlFormatter.formatExpression(having)).append('\n')); + + node.getOrderBy().ifPresent(orderBy -> process(orderBy, indent)); + node.getOffset().ifPresent(offset -> process(offset, indent)); + node.getLimit().ifPresent(limit -> process(limit, indent)); + return null; + } + + @Override + public Void visitSelect(Select node, Integer indent) { + append(indent, "SELECT"); + if (node.isDistinct()) { + builder.append(" DISTINCT"); + } + + if (node.getSelectItems().size() > 1) { + boolean first = true; + for (org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem item : + node.getSelectItems()) { + builder.append("\n").append(indentString(indent)).append(first ? " " : ", "); + process(item, indent); + first = false; + } + } else { + builder.append(' '); + process(com.google.common.collect.Iterables.getOnlyElement(node.getSelectItems()), indent); + } + + builder.append('\n'); + + return null; + } + + @Override + public Void visitTable(Table node, Integer indent) { + builder.append(SqlFormatter.formatName(node.getName())); + return null; + } + + @Override + public Void visitPatternRecognitionRelation(PatternRecognitionRelation node, Integer indent) { + processRelationSuffix(node.getInput(), indent); + + builder.append(" MATCH_RECOGNIZE (\n"); + if (!node.getPartitionBy().isEmpty()) { + append(indent + 1, "PARTITION BY ") + .append( + node.getPartitionBy().stream() + .map( + org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter + ::formatExpression) + .collect(joining(", "))) + .append("\n"); + } + if (node.getOrderBy().isPresent()) { + process(node.getOrderBy().get(), indent + 1); + } + if (!node.getMeasures().isEmpty()) { + append(indent + 1, "MEASURES"); + formatDefinitionList( + node.getMeasures().stream() + .map( + measure -> + SqlFormatter.formatExpression(measure.getExpression()) + + " AS " + + SqlFormatter.formatExpression(measure.getName())) + .collect(com.google.common.collect.ImmutableList.toImmutableList()), + indent + 2); + } + if (node.getRowsPerMatch().isPresent()) { + String rowsPerMatch; + switch (node.getRowsPerMatch().get()) { + case ONE: + rowsPerMatch = "ONE ROW PER MATCH"; + break; + case ALL_SHOW_EMPTY: + rowsPerMatch = "ALL ROWS PER MATCH SHOW EMPTY MATCHES"; + break; + case ALL_OMIT_EMPTY: + rowsPerMatch = "ALL ROWS PER MATCH OMIT EMPTY MATCHES"; + break; + case ALL_WITH_UNMATCHED: + rowsPerMatch = "ALL ROWS PER MATCH WITH UNMATCHED ROWS"; + break; + default: + throw new IllegalStateException( + "unexpected rowsPerMatch: " + node.getRowsPerMatch().get()); + } + append(indent + 1, rowsPerMatch).append("\n"); + } + if (node.getAfterMatchSkipTo().isPresent()) { + String skipTo; + switch (node.getAfterMatchSkipTo().get().getPosition()) { + case PAST_LAST: + skipTo = "AFTER MATCH SKIP PAST LAST ROW"; + break; + case NEXT: + skipTo = "AFTER MATCH SKIP TO NEXT ROW"; + break; + case LAST: + checkState( + node.getAfterMatchSkipTo().get().getIdentifier().isPresent(), + "missing identifier in AFTER MATCH SKIP TO LAST"); + skipTo = + "AFTER MATCH SKIP TO LAST " + + SqlFormatter.formatExpression( + node.getAfterMatchSkipTo().get().getIdentifier().get()); + break; + case FIRST: + checkState( + node.getAfterMatchSkipTo().get().getIdentifier().isPresent(), + "missing identifier in AFTER MATCH SKIP TO FIRST"); + skipTo = + "AFTER MATCH SKIP TO FIRST " + + SqlFormatter.formatExpression( + node.getAfterMatchSkipTo().get().getIdentifier().get()); + break; + default: + throw new IllegalStateException("unexpected skipTo: " + node.getAfterMatchSkipTo().get()); + } + append(indent + 1, skipTo).append("\n"); + } + append(indent + 1, "PATTERN (").append(formatPattern(node.getPattern())).append(")\n"); + if (!node.getSubsets().isEmpty()) { + append(indent + 1, "SUBSET"); + formatDefinitionList( + node.getSubsets().stream() + .map( + subset -> + SqlFormatter.formatExpression(subset.getName()) + + " = " + + subset.getIdentifiers().stream() + .map( + org.apache.iotdb.db.node_commons.plan.relational.sql.util + .ExpressionFormatter + ::formatExpression) + .collect(joining(", ", "(", ")"))) + .collect(com.google.common.collect.ImmutableList.toImmutableList()), + indent + 2); + } + append(indent + 1, "DEFINE"); + formatDefinitionList( + node.getVariableDefinitions().stream() + .map( + variable -> + SqlFormatter.formatExpression(variable.getName()) + + " AS " + + SqlFormatter.formatExpression(variable.getExpression())) + .collect(com.google.common.collect.ImmutableList.toImmutableList()), + indent + 2); + + builder.append(")"); + + return null; + } + + @Override + public Void visitUnion(Union node, Integer indent) { + Iterator relations = node.getRelations().iterator(); + + while (relations.hasNext()) { + processRelation(relations.next(), indent); + + if (relations.hasNext()) { + builder.append("UNION "); + if (!node.isDistinct()) { + builder.append("ALL "); + } + } + } + + return null; + } + + @Override + public Void visitExcept(Except node, Integer indent) { + processRelation(node.getLeft(), indent); + + builder.append("EXCEPT "); + if (!node.isDistinct()) { + builder.append("ALL "); + } + + processRelation(node.getRight(), indent); + + return null; + } + + @Override + public Void visitIntersect(Intersect node, Integer indent) { + Iterator relations = node.getRelations().iterator(); + + while (relations.hasNext()) { + processRelation(relations.next(), indent); + + if (relations.hasNext()) { + builder.append("INTERSECT "); + if (!node.isDistinct()) { + builder.append("ALL "); + } + } + } + + return null; + } + + @Override + public Void visitExplain(Explain node, Integer indent) { + builder.append("EXPLAIN "); + builder.append("\n"); + process(node.getStatement(), indent); + return null; + } + + @Override + public Void visitCopyTo(CopyTo node, Integer context) { + builder.append("COPY\n"); + builder.append("(\n"); + process(node.getQueryStatement(), context); + builder.append("\n) "); + builder.append("TO "); + builder.append('\''); + builder.append(node.getTargetFileName()); + builder.append('\''); + builder.append("\n"); + builder.append(node.getOptions().toString()); + return null; + } + + @Override + public Void visitExplainAnalyze(ExplainAnalyze node, Integer indent) { + builder.append("EXPLAIN ANALYZE"); + if (node.isVerbose()) { + builder.append(" VERBOSE"); + } + builder.append("\n"); + process(node.getStatement(), indent); + return null; + } + + @Override + public Void visitShowDB(ShowDB node, Integer indent) { + builder.append("SHOW DATABASE"); + return null; + } + + @Override + public Void visitShowTables(ShowTables node, Integer indent) { + builder.append("SHOW TABLES"); + + if (node.isDetails()) { + builder.append(" DETAILS"); + } + + node.getDbName().ifPresent(db -> builder.append(" FROM ").append(SqlFormatter.formatName(db))); + + return null; + } + + @Override + public Void visitShowFunctions(ShowFunctions node, Integer indent) { + builder.append("SHOW FUNCTIONS"); + return null; + } + + @Override + public Void visitShowCurrentSqlDialect(ShowCurrentSqlDialect node, Integer context) { + builder.append(node.toString()); + return null; + } + + @Override + public Void visitShowCurrentDatabase(ShowCurrentDatabase node, Integer context) { + builder.append(node.toString()); + return null; + } + + @Override + public Void visitShowCurrentUser(ShowCurrentUser node, Integer context) { + builder.append(node.toString()); + return null; + } + + @Override + public Void visitShowVersion(ShowVersion node, Integer context) { + builder.append(node.toString()); + return null; + } + + @Override + public Void visitShowVariables(ShowVariables node, Integer context) { + builder.append(node.toString()); + return null; + } + + @Override + public Void visitShowClusterId(ShowClusterId node, Integer context) { + builder.append(node.toString()); + return null; + } + + @Override + public Void visitShowCurrentTimestamp(ShowCurrentTimestamp node, Integer context) { + builder.append(node.toString()); + return null; + } + + @Override + public Void visitDelete(Delete node, Integer indent) { + builder.append("DELETE FROM ").append(SqlFormatter.formatName(node.getTable().getName())); + node.getWhere() + .ifPresent(where -> builder.append(" WHERE ").append(SqlFormatter.formatExpression(where))); + return null; + } + + @Override + public Void visitCreateDB(CreateDB node, Integer indent) { + builder.append("CREATE DATABASE "); + if (node.exists()) { + builder.append("IF NOT EXISTS "); + } + builder.append(node.getDbName()).append(" "); + builder.append(formatPropertiesMultiLine(node.getProperties())); + return null; + } + + @Override + public Void visitAlterDB(AlterDB node, Integer indent) { + builder.append("ALTER DATABASE "); + if (node.exists()) { + builder.append("IF EXISTS "); + } + builder.append(node.getDbName()).append(" "); + builder.append(formatPropertiesMultiLine(node.getProperties())); + return null; + } + + @Override + public Void visitDropDB(DropDB node, Integer indent) { + builder.append("DROP DATABASE "); + if (node.isExists()) { + builder.append("IF EXISTS "); + } + builder.append(SqlFormatter.formatName(node.getDbName())); + return null; + } + + @Override + public Void visitCreateTable(CreateTable node, Integer indent) { + builder.append("CREATE TABLE "); + if (node.isIfNotExists()) { + builder.append("IF NOT EXISTS "); + } + String tableName = SqlFormatter.formatName(node.getName()); + builder.append(tableName).append(" (\n"); + + String elementIndent = indentString(indent + 1); + String columnList = + node.getElements().stream() + .map( + element -> { + if (element != null) { + return elementIndent + formatColumnDefinition(element); + } + throw new UnsupportedOperationException("unknown table element: " + element); + }) + .collect(joining(",\n")); + builder.append(columnList); + builder.append("\n").append(")"); + + node.getCharsetName().ifPresent(charset -> builder.append(" CHARSET ").append(charset)); + + if (Objects.nonNull(node.getComment())) { + builder.append(" COMMENT '").append(node.getComment()).append("'"); + } + + builder.append(formatPropertiesMultiLine(node.getProperties())); + return null; + } + + @Override + public Void visitCreateView(CreateView node, Integer indent) { + builder.append("CREATE "); + if (node.isReplace()) { + builder.append("OR REPLACE "); + } + builder.append("VIEW "); + String tableName = SqlFormatter.formatName(node.getName()); + builder.append(tableName).append(" (\n"); + + String elementIndent = indentString(indent + 1); + String columnList = + node.getElements().stream() + .map( + element -> { + if (element != null) { + return elementIndent + formatColumnDefinition(element); + } + throw new UnsupportedOperationException("unknown table element: " + element); + }) + .collect(joining(",\n")); + builder.append(columnList); + builder.append("\n").append(")"); + + if (Objects.nonNull(node.getComment())) { + builder.append(" COMMENT '").append(node.getComment()).append("'"); + } + + if (node.isRestrict()) { + builder.append(" RESTRICT"); + } + + builder.append(formatPropertiesMultiLine(node.getProperties())); + builder.append(" AS ").append(node.getPrefixPath().toString()); + + return null; + } + + @Override + public Void visitDropTable(DropTable node, Integer indent) { + builder.append("DROP"); + builder.append(node.isView() ? " VIEW " : " TABLE "); + if (node.isExists()) { + builder.append("IF EXISTS "); + } + builder.append(SqlFormatter.formatName(node.getTableName())); + + return null; + } + + @Override + public Void visitRenameTable(RenameTable node, Integer indent) { + builder.append("ALTER"); + builder.append(node.isView() ? " VIEW " : " TABLE "); + if (node.tableIfExists()) { + builder.append("IF EXISTS "); + } + + builder + .append(SqlFormatter.formatName(node.getSource())) + .append(" RENAME TO ") + .append(SqlFormatter.formatName(node.getTarget())); + + return null; + } + + @Override + public Void visitSetProperties(SetProperties node, Integer context) { + SetProperties.Type type = node.getType(); + builder.append("ALTER "); + switch (type) { + case TABLE: + builder.append("TABLE "); + case MATERIALIZED_VIEW: + builder.append("MATERIALIZED VIEW "); + case TREE_VIEW: + builder.append("VIEW "); + } + if (node.ifExists()) { + builder.append("IF EXISTS "); + } + + builder + .append(SqlFormatter.formatName(node.getName())) + .append(" SET PROPERTIES ") + .append(joinProperties(node.getProperties())); + + return null; + } + + @Override + public Void visitRenameColumn(RenameColumn node, Integer indent) { + builder.append("ALTER"); + builder.append(node.isView() ? " VIEW " : " TABLE "); + if (node.tableIfExists()) { + builder.append("IF EXISTS "); + } + + builder.append(SqlFormatter.formatName(node.getTable())).append("RENAME COLUMN "); + if (node.columnIfExists()) { + builder.append("IF EXISTS "); + } + + builder + .append(SqlFormatter.formatName(node.getSource())) + .append(" TO ") + .append(SqlFormatter.formatName(node.getTarget())); + + return null; + } + + @Override + public Void visitDropColumn(DropColumn node, Integer indent) { + builder.append("ALTER"); + builder.append(node.isView() ? " VIEW " : " TABLE "); + if (node.tableIfExists()) { + builder.append("IF EXISTS "); + } + + builder.append(SqlFormatter.formatName(node.getTable())).append("DROP COLUMN "); + if (node.columnIfExists()) { + builder.append("IF EXISTS "); + } + + builder.append(SqlFormatter.formatName(node.getField())); + + return null; + } + + @Override + public Void visitAddColumn(AddColumn node, Integer indent) { + builder.append("ALTER"); + builder.append(node.isView() ? " VIEW " : " TABLE "); + if (node.tableIfExists()) { + builder.append("IF EXISTS "); + } + + builder.append(SqlFormatter.formatName(node.getTableName())).append("ADD COLUMN "); + if (node.columnIfNotExists()) { + builder.append("IF NOT EXISTS "); + } + + builder.append(formatColumnDefinition(node.getColumn())); + + return null; + } + + @Override + public Void visitSetTableComment(SetTableComment node, Integer indent) { + builder + .append("COMMENT ON") + .append(node.isView() ? " VIEW " : " TABLE ") + .append(SqlFormatter.formatName(node.getTableName())) + .append(" IS ") + .append(node.getComment()); + + return null; + } + + @Override + public Void visitSetColumnComment(SetColumnComment node, Integer indent) { + builder + .append("COMMENT ON COLUMN ") + .append(SqlFormatter.formatName(node.getTable())) + .append(".") + .append(SqlFormatter.formatName(node.getField())) + .append(" IS ") + .append(node.getComment()); + return null; + } + + @Override + public Void visitInsert(Insert node, Integer indent) { + builder.append("INSERT INTO ").append(SqlFormatter.formatName(node.getTarget())); + + node.getColumns() + .ifPresent( + columns -> builder.append(" (").append(Joiner.on(", ").join(columns)).append(")")); + + builder.append("\n"); + + process(node.getQuery(), indent); + + return null; + } + + @Override + public Void visitUpdate(Update node, Integer indent) { + builder + .append("UPDATE ") + .append(SqlFormatter.formatName(node.getTable().getName())) + .append(" SET"); + int setCounter = node.getAssignments().size() - 1; + for (UpdateAssignment assignment : node.getAssignments()) { + builder + .append("\n") + .append(indentString(indent + 1)) + .append(((Identifier) assignment.getName()).getValue()) + .append(" = ") + .append(SqlFormatter.formatExpression(assignment.getValue())); + if (setCounter > 0) { + builder.append(","); + } + setCounter--; + } + node.getWhere() + .ifPresent( + where -> + builder + .append("\n") + .append(indentString(indent)) + .append("WHERE ") + .append(SqlFormatter.formatExpression(where))); + return null; + } + + @Override + public Void visitCreateFunction(CreateFunction node, Integer indent) { + builder + .append("CREATE FUNCTION ") + .append(node.getUdfName()) + .append(" AS ") + .append(node.getClassName()); + node.getUriString().ifPresent(uri -> builder.append(" USING URI ").append(uri)); + return null; + } + + @Override + public Void visitDropFunction(DropFunction node, Integer indent) { + builder.append("DROP FUNCTION "); + builder.append(node.getUdfName()); + return null; + } + + @Override + public Void visitLoadTsFile(LoadTsFile node, Integer indent) { + builder.append("LOAD "); + builder.append("\"" + node.getFilePath() + "\""); + builder.append(" \n"); + + if (!node.getLoadAttributes().isEmpty()) { + builder + .append("WITH (") + .append("\n") + .append( + node.getLoadAttributes().entrySet().stream() + .map( + entry -> + indentString(1) + + "\"" + + entry.getKey() + + "\" = \"" + + entry.getValue() + + "\"") + .collect(joining(", " + "\n"))) + .append(")\n"); + } + return null; + } + + @Override + public Void visitCreatePipe(CreatePipe node, Integer context) { + builder.append("CREATE PIPE "); + if (node.hasIfNotExistsCondition()) { + builder.append("IF NOT EXISTS "); + } + builder.append(node.getPipeName()); + builder.append(" \n"); + + if (!node.getSourceAttributes().isEmpty()) { + builder + .append("WITH SOURCE (") + .append("\n") + .append( + node.getSourceAttributes().entrySet().stream() + .map( + entry -> + indentString(1) + + "\"" + + entry.getKey() + + "\" = \"" + + entry.getValue() + + "\"") + .collect(joining(", " + "\n"))) + .append(")\n"); + } + + if (!node.getProcessorAttributes().isEmpty()) { + builder + .append("WITH PROCESSOR (") + .append("\n") + .append( + node.getProcessorAttributes().entrySet().stream() + .map( + entry -> + indentString(1) + + "\"" + + entry.getKey() + + "\" = \"" + + entry.getValue() + + "\"") + .collect(joining(", " + "\n"))) + .append(")\n"); + } + + if (!node.getSinkAttributes().isEmpty()) { + builder + .append("WITH SINK (") + .append("\n") + .append( + node.getSinkAttributes().entrySet().stream() + .map( + entry -> + indentString(1) + + "\"" + + entry.getKey() + + "\" = \"" + + entry.getValue() + + "\"") + .collect(joining(", " + "\n"))) + .append(")"); + } + + return null; + } + + @Override + public Void visitAlterPipe(AlterPipe node, Integer context) { + builder.append("ALTER PIPE "); + if (node.hasIfExistsCondition()) { + builder.append("IF EXISTS "); + } + builder.append(node.getPipeName()); + builder.append(" \n"); + + builder + .append(node.isReplaceAllExtractorAttributes() ? "REPLACE" : "MODIFY") + .append(" SOURCE (") + .append("\n") + .append( + node.getExtractorAttributes().entrySet().stream() + .map( + entry -> + indentString(1) + + "\"" + + entry.getKey() + + "\" = \"" + + entry.getValue() + + "\"") + .collect(joining(", " + "\n"))) + .append(")\n"); + + builder + .append(node.isReplaceAllProcessorAttributes() ? "REPLACE" : "MODIFY") + .append(" PROCESSOR (") + .append("\n") + .append( + node.getProcessorAttributes().entrySet().stream() + .map( + entry -> + indentString(1) + + "\"" + + entry.getKey() + + "\" = \"" + + entry.getValue() + + "\"") + .collect(joining(", " + "\n"))) + .append(")\n"); + + builder + .append(node.isReplaceAllConnectorAttributes() ? "REPLACE" : "MODIFY") + .append(" SINK (") + .append("\n") + .append( + node.getConnectorAttributes().entrySet().stream() + .map( + entry -> + indentString(1) + + "\"" + + entry.getKey() + + "\" = \"" + + entry.getValue() + + "\"") + .collect(joining(", " + "\n"))) + .append(")"); + + return null; + } + + @Override + public Void visitDropPipe(DropPipe node, Integer context) { + builder.append("DROP PIPE "); + if (node.hasIfExistsCondition()) { + builder.append("IF EXISTS "); + } + builder.append(node.getPipeName()); + + return null; + } + + @Override + public Void visitStartPipe(StartPipe node, Integer context) { + builder.append("START PIPE ").append(node.getPipeName()); + return null; + } + + @Override + public Void visitStopPipe(StopPipe node, Integer context) { + builder.append("STOP PIPE ").append(node.getPipeName()); + return null; + } + + @Override + public Void visitShowPipes(ShowPipes node, Integer context) { + builder.append("SHOW PIPES"); + return null; + } + + @Override + public Void visitCreatePipePlugin(CreatePipePlugin node, Integer context) { + builder.append("CREATE PIPEPLUGIN "); + if (node.hasIfNotExistsCondition()) { + builder.append("IF NOT EXISTS "); + } + builder.append(node.getPluginName()); + builder.append("\n"); + + builder.append("AS \""); + builder.append(node.getClassName()); + builder.append("\"\n"); + + builder.append("USING URI \""); + builder.append(node.getUriString()); + builder.append("\""); + + return null; + } + + @Override + public Void visitDropPipePlugin(DropPipePlugin node, Integer context) { + builder.append("DROP PIPEPLUGIN "); + if (node.hasIfExistsCondition()) { + builder.append("IF EXISTS "); + } + builder.append(node.getPluginName()); + + return null; + } + + @Override + public Void visitShowPipePlugins(ShowPipePlugins node, Integer context) { + builder.append("SHOW PIPEPLUGINS"); + return null; + } + + @Override + public Void visitCreateTopic(CreateTopic node, Integer context) { + builder.append("CREATE TOPIC "); + if (node.hasIfNotExistsCondition()) { + builder.append("IF NOT EXISTS "); + } + builder.append(node.getTopicName()); + builder.append(" \n"); + + if (!node.getTopicAttributes().isEmpty()) { + builder + .append("WITH (") + .append("\n") + .append( + node.getTopicAttributes().entrySet().stream() + .map( + entry -> + indentString(1) + + "\"" + + entry.getKey() + + "\" = \"" + + entry.getValue() + + "\"") + .collect(joining(", " + "\n"))) + .append(")\n"); + } + + return null; + } + + @Override + public Void visitDropTopic(DropTopic node, Integer context) { + builder.append("DROP TOPIC "); + if (node.hasIfExistsCondition()) { + builder.append("IF EXISTS "); + } + builder.append(node.getTopicName()); + + return null; + } + + @Override + public Void visitShowTopics(ShowTopics node, Integer context) { + if (Objects.isNull(node.getTopicName())) { + builder.append("SHOW TOPICS"); + } else { + builder.append("SHOW TOPIC ").append(node.getTopicName()); + } + + return null; + } + + @Override + public Void visitShowSubscriptions(ShowSubscriptions node, Integer context) { + if (Objects.isNull(node.getTopicName())) { + builder.append("SHOW SUBSCRIPTIONS"); + } else { + builder.append("SHOW SUBSCRIPTIONS ON ").append(node.getTopicName()); + } + + return null; + } + + @Override + public Void visitDropSubscription(DropSubscription node, Integer context) { + builder.append("DROP SUBSCRIPTION "); + if (node.hasIfExistsCondition()) { + builder.append("IF EXISTS "); + } + builder.append(node.getSubscriptionId()); + + return null; + } + + @Override + public Void visitRelationalAuthorPlan(RelationalAuthorStatement node, Integer context) { + switch (node.getAuthorType()) { + case GRANT_USER_ANY: + builder.append( + "GRANT " + + node.getPrivilegesString() + + " ON ANY" + + " TO USER " + + node.getUserName() + + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); + break; + case GRANT_USER_ALL: + builder.append( + "GRANT ALL TO USER " + + node.getUserName() + + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); + break; + case GRANT_USER_DB: + builder.append( + "GRANT " + + node.getPrivilegesString() + + " ON DATABASE " + + node.getDatabase() + + " TO USER " + + node.getUserName() + + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); + break; + case GRANT_USER_SYS: + builder.append( + "GRANT " + + node.getPrivilegesString() + + " TO USER " + + node.getUserName() + + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); + break; + case GRANT_USER_TB: + builder.append( + "GRANT " + + node.getPrivilegesString() + + " ON TABLE " + + node.getDatabase() + + "." + + node.getTableName() + + " TO USER " + + node.getUserName() + + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); + break; + case GRANT_ROLE_ANY: + builder.append( + "GRANT " + + node.getPrivilegesString() + + " ON ANY" + + " TO ROLE " + + node.getRoleName() + + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); + break; + case GRANT_ROLE_ALL: + builder.append( + "GRANT ALL TO ROLE " + + node.getRoleName() + + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); + break; + case GRANT_ROLE_DB: + builder.append( + "GRANT " + + node.getPrivilegesString() + + " ON DATABASE " + + node.getDatabase() + + " TO ROLE " + + node.getRoleName() + + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); + break; + case GRANT_ROLE_SYS: + builder.append( + "GRANT " + + node.getPrivilegesString() + + " TO ROLE " + + node.getRoleName() + + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); + break; + case GRANT_ROLE_TB: + builder.append( + "GRANT " + + node.getPrivilegesString() + + " ON TABLE " + + node.getDatabase() + + "." + + node.getTableName() + + " TO ROLE " + + node.getRoleName() + + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); + break; + case REVOKE_USER_ANY: + builder.append( + "REVOKE " + + (node.isGrantOption() ? "GRANT OPTION FOR " : "") + + node.getPrivilegesString() + + " ON ANY FROM USER " + + node.getUserName()); + break; + case REVOKE_USER_ALL: + builder.append( + "REVOKE" + + (node.isGrantOption() ? "GRANT OPTION FOR ALL" : "ALL") + + " FROM USER " + + node.getUserName()); + break; + case REVOKE_USER_DB: + builder.append( + "REVOKE " + + (node.isGrantOption() ? "GRANT OPTION FOR " : "") + + node.getPrivilegesString() + + " ON DATABASE " + + node.getDatabase() + + " FROM USER " + + node.getUserName()); + break; + case REVOKE_USER_SYS: + builder.append( + "REVOKE " + + (node.isGrantOption() ? "GRANT OPTION FOR " : "") + + node.getPrivilegesString() + + "FROM USER " + + node.getUserName()); + break; + case REVOKE_USER_TB: + builder.append( + "REVOKE " + + (node.isGrantOption() ? "GRANT OPTION FOR " : "") + + node.getPrivilegesString() + + " ON TABLE " + + node.getDatabase() + + "." + + node.getTableName() + + " FROM USER " + + node.getUserName()); + break; + case REVOKE_ROLE_ANY: + builder.append( + "REVOKE " + + (node.isGrantOption() ? "GRANT OPTION FOR " : "") + + node.getPrivilegesString() + + " ON ANY FROM ROLE " + + node.getRoleName()); + break; + case REVOKE_ROLE_ALL: + builder.append( + "REVOKE " + + (node.isGrantOption() ? "GRANT OPTION FOR ALL" : "ALL") + + " FROM ROLE " + + node.getRoleName()); + break; + case REVOKE_ROLE_DB: + builder.append( + "REVOKE " + + (node.isGrantOption() ? "GRANT OPTION FOR " : "") + + node.getPrivilegesString() + + " ON DATABASE " + + node.getDatabase() + + " FROM ROLE " + + node.getRoleName()); + break; + case REVOKE_ROLE_SYS: + builder.append( + "REVOKE " + + (node.isGrantOption() ? "GRANT OPTION FOR " : "") + + node.getPrivilegesString() + + " FROM ROLE " + + node.getRoleName()); + break; + case REVOKE_ROLE_TB: + builder.append( + "REVOKE " + + (node.isGrantOption() ? "GRANT OPTION FOR " : "") + + node.getPrivilegesString() + + " ON TABLE " + + node.getDatabase() + + "." + + node.getTableName() + + " FROM ROLE " + + node.getRoleName()); + break; + case GRANT_USER_ROLE: + builder.append("GRANT ROLE " + node.getRoleName() + " TO " + node.getUserName()); + break; + case REVOKE_USER_ROLE: + builder.append("REVOKE ROLE " + node.getRoleName() + " FROM " + node.getUserName()); + break; + case CREATE_USER: + builder.append("CREATE USER " + node.getUserName()); + break; + case CREATE_ROLE: + builder.append("CREATE ROLE " + node.getRoleName()); + break; + case UPDATE_USER: + builder.append("ALTER USER " + node.getUserName() + " SET PASSWORD"); + break; + case LIST_USER: + builder.append("LIST USER "); + break; + case LIST_ROLE: + builder.append("LIST ROLE "); + break; + case LIST_USER_PRIV: + builder.append("LIST PRIVILEGES OF USER " + node.getUserName()); + break; + case LIST_ROLE_PRIV: + builder.append("LIST PRIVILEGES OF ROLE " + node.getRoleName()); + break; + case DROP_ROLE: + builder.append("DROP ROLE " + node.getRoleName()); + break; + case DROP_USER: + builder.append("DROP USER " + node.getUserName()); + break; + default: + break; + } + return null; + } + + @Override + public Void visitTableFunctionInvocation(TableFunctionInvocation node, Integer indent) { + append(indent, "TABLE("); + appendTableFunctionInvocation(node, indent + 1); + builder.append(")"); + return null; + } + + @Override + public Void visitTableArgument(TableFunctionTableArgument node, Integer indent) { + Relation relation = node.getTable(); + Node unaliased = + relation instanceof AliasedRelation ? ((AliasedRelation) relation).getRelation() : relation; + if (unaliased instanceof TableSubquery) { + unaliased = ((TableSubquery) unaliased).getQuery(); + } + builder.append("TABLE("); + process(unaliased, indent); + builder.append(")"); + if (relation instanceof AliasedRelation) { + AliasedRelation aliasedRelation = (AliasedRelation) relation; + builder.append(" AS ").append(SqlFormatter.formatName(aliasedRelation.getAlias())); + appendAliasColumns(builder, aliasedRelation.getColumnNames()); + } + if (node.getPartitionBy().isPresent()) { + builder.append("\n"); + append(indent, "PARTITION BY ") + .append( + node.getPartitionBy().get().stream() + .map(SqlFormatter::formatExpression) + .collect(joining(", "))); + } + node.getOrderBy() + .ifPresent( + orderBy -> { + builder.append("\n"); + append(indent, formatOrderBy(orderBy)); + }); + + return null; + } + + @Override + protected boolean needsParenthesesForRelationSuffix(Relation relation) { + return super.needsParenthesesForRelationSuffix(relation) + || relation instanceof PatternRecognitionRelation; + } + + @Override + protected boolean isSimpleTableRelation(Relation relation) { + return relation instanceof Table; + } + + @Override + protected String formatSimpleTableRelationName(Relation relation) { + return SqlFormatter.formatName(((Table) relation).getName()); + } + + private String formatPropertiesMultiLine(List properties) { + if (properties.isEmpty()) { + return ""; + } + + String propertyList = + properties.stream() + .map( + element -> + SqlFormatter.INDENT + + SqlFormatter.formatName(element.getName()) + + " = " + + (element.isSetToDefault() + ? "DEFAULT" + : SqlFormatter.formatExpression(element.getNonDefaultValue()))) + .collect(joining(",\n")); + + return "\nWITH (\n" + propertyList + "\n)"; + } + + private String formatColumnDefinition(ColumnDefinition column) { + StringBuilder stringBuilder = + new StringBuilder() + .append(SqlFormatter.formatName(column.getName())) + .append(" ") + .append(column.getType()) + .append(" ") + .append(column.getColumnCategory()); + + column.getCharsetName().ifPresent(charset -> stringBuilder.append(" CHARSET ").append(charset)); + + if (Objects.nonNull(column.getComment())) { + stringBuilder.append(" COMMENT '").append(column.getComment()).append("'"); + } + return stringBuilder.toString(); + } + + private String joinProperties(List properties) { + return properties.stream() + .map( + element -> + SqlFormatter.formatName(element.getName()) + + " = " + + (element.isSetToDefault() + ? "DEFAULT" + : SqlFormatter.formatExpression(element.getNonDefaultValue()))) + .collect(joining(", ")); + } + + private void appendTableFunctionInvocation(TableFunctionInvocation node, Integer indent) { + builder.append(SqlFormatter.formatName(node.getName())).append("(\n"); + appendTableFunctionArguments(node.getArguments(), indent + 1); + builder.append(")"); + } + + private void appendTableFunctionArguments(List arguments, int indent) { + for (int i = 0; i < arguments.size(); i++) { + TableFunctionArgument argument = arguments.get(i); + if (argument.getName().isPresent()) { + append(indent, SqlFormatter.formatName(argument.getName().get())); + builder.append(" => "); + } else { + append(indent, ""); + } + Node value = argument.getValue(); + if (value instanceof Expression) { + builder.append(SqlFormatter.formatExpression((Expression) value)); + } else { + process(value, indent + 1); + } + if (i < arguments.size() - 1) { + builder.append(",\n"); + } + } + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java index dc59e32c76f6a..69bfe239750dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java @@ -19,126 +19,30 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter; -import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ColumnDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CopyTo; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateDB; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateFunction; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreatePipe; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreatePipePlugin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateTopic; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateView; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; -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.DropFunction; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropPipe; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropPipePlugin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropSubscription; -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.Except; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; -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.LoadTsFile; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RelationalAuthorStatement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameColumn; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetColumnComment; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetProperties; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetTableComment; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowClusterId; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowCurrentDatabase; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowCurrentSqlDialect; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowCurrentTimestamp; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowCurrentUser; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDB; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowFunctions; -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.ShowSubscriptions; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTables; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTopics; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVariables; -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.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionArgument; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; -import com.google.common.base.Joiner; -import com.google.common.base.Strings; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; -import java.util.Optional; - -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkState; -import static com.google.common.collect.ImmutableList.toImmutableList; -import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.joining; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter.formatGroupBy; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter.formatOrderBy; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.RowPatternFormatter.formatPattern; public final class SqlFormatter { - private static final String INDENT = " "; + protected static final String INDENT = " "; private SqlFormatter() {} public static String formatSql(Node root) { StringBuilder builder = new StringBuilder(); - new Formatter(builder).process(root, 0); + new DataNodeSqlFormatter(builder).process(root, 0); return builder.toString(); } - private static String formatName(Identifier identifier) { + static String formatName(Identifier identifier) { return ExpressionFormatter.formatExpression(identifier); } @@ -146,1622 +50,27 @@ public static String formatName(QualifiedName name) { return name.getOriginalParts().stream().map(SqlFormatter::formatName).collect(joining(".")); } - private static String formatExpression(Expression expression) { + static String formatExpression(Expression expression) { return ExpressionFormatter.formatExpression(expression); } - private static class Formatter implements AstVisitor { - private static class SqlBuilder { - private final StringBuilder builder; - - public SqlBuilder(StringBuilder builder) { - this.builder = requireNonNull(builder, "builder is null"); - } - - @CanIgnoreReturnValue - public SqlBuilder append(CharSequence value) { - builder.append(value); - return this; - } - - @CanIgnoreReturnValue - public SqlBuilder append(char c) { - builder.append(c); - return this; - } - } - - private final SqlBuilder builder; - - public Formatter(StringBuilder builder) { - this.builder = new SqlBuilder(builder); - } - - @Override - public Void visitNode(Node node, Integer indent) { - throw new UnsupportedOperationException("not yet implemented: " + node); - } - - @Override - public Void visitExpression(Expression node, Integer indent) { - checkArgument(indent == 0, "visitExpression should only be called at root"); - builder.append(formatExpression(node)); - return null; - } - - @Override - public Void visitRowPattern(RowPattern node, Integer indent) { - checkArgument(indent == 0, "visitRowPattern should only be called at root"); - builder.append(formatPattern(node)); - return null; - } - - @Override - public Void visitQuery(Query node, Integer indent) { - - node.getWith() - .ifPresent( - with -> { - append(indent, "WITH"); - if (with.isRecursive()) { - builder.append(" RECURSIVE"); - } - builder.append("\n "); - Iterator queries = with.getQueries().iterator(); - while (queries.hasNext()) { - WithQuery query = queries.next(); - append(indent, formatName(query.getName())); - query - .getColumnNames() - .ifPresent(columnNames -> appendAliasColumns(builder, columnNames)); - builder.append(" AS "); - process(new TableSubquery(query.getQuery()), indent); - builder.append('\n'); - if (queries.hasNext()) { - builder.append(", "); - } - } - }); - - processRelation(node.getQueryBody(), indent); - node.getOrderBy().ifPresent(orderBy -> process(orderBy, indent)); - node.getOffset().ifPresent(offset -> process(offset, indent)); - node.getLimit().ifPresent(limit -> process(limit, indent)); - return null; - } - - @Override - public Void visitQuerySpecification(QuerySpecification node, Integer indent) { - process(node.getSelect(), indent); - - node.getFrom() - .ifPresent( - from -> { - append(indent, "FROM"); - builder.append('\n'); - append(indent, " "); - process(from, indent); - }); - - builder.append('\n'); - - node.getWhere() - .ifPresent(where -> append(indent, "WHERE " + formatExpression(where)).append('\n')); - - node.getGroupBy() - .ifPresent( - groupBy -> - append( - indent, - "GROUP BY " - + (groupBy.isDistinct() ? " DISTINCT " : "") - + formatGroupBy(groupBy.getGroupingElements())) - .append('\n')); - - node.getHaving() - .ifPresent(having -> append(indent, "HAVING " + formatExpression(having)).append('\n')); - - node.getOrderBy().ifPresent(orderBy -> process(orderBy, indent)); - node.getOffset().ifPresent(offset -> process(offset, indent)); - node.getLimit().ifPresent(limit -> process(limit, indent)); - return null; - } - - @Override - public Void visitFill(Fill node, Integer indent) { - append(indent, "FILL METHOD ").append(node.getFillMethod().name()); - - if (node.getFillMethod() == FillPolicy.CONSTANT) { - builder.append(formatExpression(node.getFillValue().get())); - } else if (node.getFillMethod() == FillPolicy.LINEAR) { - node.getTimeColumnIndex() - .ifPresent(index -> builder.append(" TIME_COLUMN ").append(String.valueOf(index))); - node.getFillGroupingElements() - .ifPresent( - elements -> - builder - .append(" FILL_GROUP ") - .append( - elements.stream() - .map(SqlFormatter::formatExpression) - .collect(joining(", ")))); - } else if (node.getFillMethod() == FillPolicy.PREVIOUS) { - node.getTimeBound() - .ifPresent(timeBound -> builder.append(" TIME_BOUND ").append(timeBound.toString())); - node.getTimeColumnIndex() - .ifPresent(index -> builder.append(" TIME_COLUMN ").append(String.valueOf(index))); - node.getFillGroupingElements() - .ifPresent( - elements -> - builder - .append(" FILL_GROUP ") - .append( - elements.stream() - .map(SqlFormatter::formatExpression) - .collect(joining(", ")))); - } else { - throw new IllegalArgumentException("Unknown fill method: " + node.getFillMethod()); - } - return null; - } - - @Override - public Void visitOrderBy(OrderBy node, Integer indent) { - append(indent, formatOrderBy(node)).append('\n'); - return null; - } - - @Override - public Void visitOffset(Offset node, Integer indent) { - append(indent, "OFFSET ").append(formatExpression(node.getRowCount())).append(" ROWS\n"); - return null; - } - - @Override - public Void visitLimit(Limit node, Integer indent) { - append(indent, "LIMIT ").append(formatExpression(node.getRowCount())).append('\n'); - return null; - } - - @Override - public Void visitSelect(Select node, Integer indent) { - append(indent, "SELECT"); - if (node.isDistinct()) { - builder.append(" DISTINCT"); - } - - if (node.getSelectItems().size() > 1) { - boolean first = true; - for (SelectItem item : node.getSelectItems()) { - builder.append("\n").append(indentString(indent)).append(first ? " " : ", "); - - process(item, indent); - first = false; - } - } else { - builder.append(' '); - process(getOnlyElement(node.getSelectItems()), indent); - } - - builder.append('\n'); - - return null; - } - - @Override - public Void visitSingleColumn(SingleColumn node, Integer indent) { - builder.append(formatExpression(node.getExpression())); - node.getAlias().ifPresent(alias -> builder.append(' ').append(formatName(alias))); - - return null; - } - - @Override - public Void visitAllColumns(AllColumns node, Integer indent) { - node.getTarget().ifPresent(value -> builder.append(formatExpression(value)).append(".")); - builder.append("*"); - - if (!node.getAliases().isEmpty()) { - builder - .append(" AS (") - .append( - Joiner.on(", ") - .join( - node.getAliases().stream() - .map(SqlFormatter::formatName) - .collect(toImmutableList()))) - .append(")"); - } - - return null; - } - - @Override - public Void visitTable(Table node, Integer indent) { - builder.append(formatName(node.getName())); - return null; - } - - @Override - public Void visitJoin(Join node, Integer indent) { - JoinCriteria criteria = node.getCriteria().orElse(null); - String type = node.getType().toString(); - if (criteria instanceof NaturalJoin) { - type = "NATURAL " + type; - } - - if (node.getType() != Join.Type.IMPLICIT) { - builder.append('('); - } - process(node.getLeft(), indent); - - builder.append('\n'); - if (node.getType() == Join.Type.IMPLICIT) { - append(indent, ", "); - } else { - append(indent, type).append(" JOIN "); - } - - process(node.getRight(), indent); - - if (node.getType() != Join.Type.CROSS && node.getType() != Join.Type.IMPLICIT) { - if (criteria instanceof JoinUsing) { - JoinUsing using = (JoinUsing) criteria; - builder.append(" USING (").append(Joiner.on(", ").join(using.getColumns())).append(")"); - } else if (criteria instanceof JoinOn) { - JoinOn on = (JoinOn) criteria; - builder.append(" ON ").append(formatExpression(on.getExpression())); - } else if (!(criteria instanceof NaturalJoin)) { - throw new UnsupportedOperationException("unknown join criteria: " + criteria); - } - } - - if (node.getType() != Join.Type.IMPLICIT) { - builder.append(")"); - } - - return null; - } - - @Override - public Void visitAliasedRelation(AliasedRelation node, Integer indent) { - processRelationSuffix(node.getRelation(), indent); - - builder.append(' ').append(formatName(node.getAlias())); - appendAliasColumns(builder, node.getColumnNames()); - - return null; - } - - @Override - public Void visitPatternRecognitionRelation(PatternRecognitionRelation node, Integer indent) { - processRelationSuffix(node.getInput(), indent); - - builder.append(" MATCH_RECOGNIZE (\n"); - if (!node.getPartitionBy().isEmpty()) { - append(indent + 1, "PARTITION BY ") - .append( - node.getPartitionBy().stream() - .map(ExpressionFormatter::formatExpression) - .collect(joining(", "))) - .append("\n"); - } - if (node.getOrderBy().isPresent()) { - process(node.getOrderBy().get(), indent + 1); - } - if (!node.getMeasures().isEmpty()) { - append(indent + 1, "MEASURES"); - formatDefinitionList( - node.getMeasures().stream() - .map( - measure -> - formatExpression(measure.getExpression()) - + " AS " - + formatExpression(measure.getName())) - .collect(toImmutableList()), - indent + 2); - } - if (node.getRowsPerMatch().isPresent()) { - String rowsPerMatch; - switch (node.getRowsPerMatch().get()) { - case ONE: - rowsPerMatch = "ONE ROW PER MATCH"; - break; - case ALL_SHOW_EMPTY: - rowsPerMatch = "ALL ROWS PER MATCH SHOW EMPTY MATCHES"; - break; - case ALL_OMIT_EMPTY: - rowsPerMatch = "ALL ROWS PER MATCH OMIT EMPTY MATCHES"; - break; - case ALL_WITH_UNMATCHED: - rowsPerMatch = "ALL ROWS PER MATCH WITH UNMATCHED ROWS"; - break; - default: - // RowsPerMatch of type WINDOW cannot occur in MATCH_RECOGNIZE clause - throw new IllegalStateException( - "unexpected rowsPerMatch: " + node.getRowsPerMatch().get()); - } - append(indent + 1, rowsPerMatch).append("\n"); - } - if (node.getAfterMatchSkipTo().isPresent()) { - String skipTo; - switch (node.getAfterMatchSkipTo().get().getPosition()) { - case PAST_LAST: - skipTo = "AFTER MATCH SKIP PAST LAST ROW"; - break; - case NEXT: - skipTo = "AFTER MATCH SKIP TO NEXT ROW"; - break; - case LAST: - checkState( - node.getAfterMatchSkipTo().get().getIdentifier().isPresent(), - "missing identifier in AFTER MATCH SKIP TO LAST"); - skipTo = - "AFTER MATCH SKIP TO LAST " - + formatExpression(node.getAfterMatchSkipTo().get().getIdentifier().get()); - break; - case FIRST: - checkState( - node.getAfterMatchSkipTo().get().getIdentifier().isPresent(), - "missing identifier in AFTER MATCH SKIP TO FIRST"); - skipTo = - "AFTER MATCH SKIP TO FIRST " - + formatExpression(node.getAfterMatchSkipTo().get().getIdentifier().get()); - break; - default: - throw new IllegalStateException( - "unexpected skipTo: " + node.getAfterMatchSkipTo().get()); - } - append(indent + 1, skipTo).append("\n"); - } - append(indent + 1, "PATTERN (").append(formatPattern(node.getPattern())).append(")\n"); - if (!node.getSubsets().isEmpty()) { - append(indent + 1, "SUBSET"); - formatDefinitionList( - node.getSubsets().stream() - .map( - subset -> - formatExpression(subset.getName()) - + " = " - + subset.getIdentifiers().stream() - .map(ExpressionFormatter::formatExpression) - .collect(joining(", ", "(", ")"))) - .collect(toImmutableList()), - indent + 2); - } - append(indent + 1, "DEFINE"); - formatDefinitionList( - node.getVariableDefinitions().stream() - .map( - variable -> - formatExpression(variable.getName()) - + " AS " - + formatExpression(variable.getExpression())) - .collect(toImmutableList()), - indent + 2); - - builder.append(")"); - - return null; - } - - private void processRelationSuffix(Relation relation, Integer indent) { - if ((relation instanceof AliasedRelation) - || (relation instanceof PatternRecognitionRelation)) { - builder.append("( "); - process(relation, indent + 1); - append(indent, ")"); - } else { - process(relation, indent); - } - } - - @Override - public Void visitValues(Values node, Integer indent) { - builder.append(" VALUES "); - - boolean first = true; - for (Expression row : node.getRows()) { - builder.append("\n").append(indentString(indent)).append(first ? " " : ", "); - - builder.append(formatExpression(row)); - first = false; - } - builder.append('\n'); - - return null; - } - - @Override - public Void visitTableSubquery(TableSubquery node, Integer indent) { - builder.append('(').append('\n'); - - process(node.getQuery(), indent + 1); + protected static class SqlBuilder { + private final StringBuilder builder; - append(indent, ") "); - - return null; + public SqlBuilder(StringBuilder builder) { + this.builder = requireNonNull(builder, "builder is null"); } - @Override - public Void visitUnion(Union node, Integer indent) { - Iterator relations = node.getRelations().iterator(); - - while (relations.hasNext()) { - processRelation(relations.next(), indent); - - if (relations.hasNext()) { - builder.append("UNION "); - if (!node.isDistinct()) { - builder.append("ALL "); - } - } - } - - return null; + @CanIgnoreReturnValue + public SqlBuilder append(CharSequence value) { + builder.append(value); + return this; } - @Override - public Void visitExcept(Except node, Integer indent) { - processRelation(node.getLeft(), indent); - - builder.append("EXCEPT "); - if (!node.isDistinct()) { - builder.append("ALL "); - } - - processRelation(node.getRight(), indent); - - return null; - } - - @Override - public Void visitIntersect(Intersect node, Integer indent) { - Iterator relations = node.getRelations().iterator(); - - while (relations.hasNext()) { - processRelation(relations.next(), indent); - - if (relations.hasNext()) { - builder.append("INTERSECT "); - if (!node.isDistinct()) { - builder.append("ALL "); - } - } - } - - return null; - } - - @Override - public Void visitExplain(Explain node, Integer indent) { - builder.append("EXPLAIN "); - - builder.append("\n"); - - process(node.getStatement(), indent); - - return null; - } - - @Override - public Void visitCopyTo(CopyTo node, Integer context) { - builder.append("COPY\n"); - builder.append("(\n"); - process(node.getQueryStatement(), context); - builder.append("\n) "); - builder.append("TO "); - builder.append('\''); - builder.append(node.getTargetFileName()); - builder.append('\''); - builder.append("\n"); - builder.append(node.getOptions().toString()); - return null; - } - - @Override - public Void visitExplainAnalyze(ExplainAnalyze node, Integer indent) { - builder.append("EXPLAIN ANALYZE"); - if (node.isVerbose()) { - builder.append(" VERBOSE"); - } - builder.append("\n"); - - process(node.getStatement(), indent); - - return null; - } - - @Override - public Void visitShowDB(ShowDB node, Integer indent) { - builder.append("SHOW DATABASE"); - - return null; - } - - @Override - public Void visitShowTables(final ShowTables node, final Integer indent) { - builder.append("SHOW TABLES"); - - if (node.isDetails()) { - builder.append(" DETAILS"); - } - - node.getDbName().ifPresent(db -> builder.append(" FROM ").append(formatName(db))); - - return null; - } - - @Override - public Void visitShowFunctions(ShowFunctions node, Integer indent) { - builder.append("SHOW FUNCTIONS"); - - return null; - } - - @Override - public Void visitShowCurrentSqlDialect(ShowCurrentSqlDialect node, Integer context) { - builder.append(node.toString()); - return null; - } - - @Override - public Void visitShowCurrentDatabase(ShowCurrentDatabase node, Integer context) { - builder.append(node.toString()); - return null; - } - - @Override - public Void visitShowCurrentUser(ShowCurrentUser node, Integer context) { - builder.append(node.toString()); - return null; - } - - @Override - public Void visitShowVersion(ShowVersion node, Integer context) { - builder.append(node.toString()); - return null; - } - - @Override - public Void visitShowVariables(ShowVariables node, Integer context) { - builder.append(node.toString()); - return null; - } - - @Override - public Void visitShowClusterId(ShowClusterId node, Integer context) { - builder.append(node.toString()); - return null; - } - - @Override - public Void visitShowCurrentTimestamp(ShowCurrentTimestamp node, Integer context) { - builder.append(node.toString()); - return null; - } - - @Override - public Void visitDelete(final Delete node, final Integer indent) { - builder.append("DELETE FROM ").append(formatName(node.getTable().getName())); - - node.getWhere().ifPresent(where -> builder.append(" WHERE ").append(formatExpression(where))); - - return null; - } - - @Override - public Void visitCreateDB(final CreateDB node, final Integer indent) { - builder.append("CREATE DATABASE "); - if (node.exists()) { - builder.append("IF NOT EXISTS "); - } - builder.append(node.getDbName()).append(" "); - - builder.append(formatPropertiesMultiLine(node.getProperties())); - - return null; - } - - @Override - public Void visitAlterDB(final AlterDB node, final Integer indent) { - builder.append("ALTER DATABASE "); - if (node.exists()) { - builder.append("IF EXISTS "); - } - builder.append(node.getDbName()).append(" "); - - builder.append(formatPropertiesMultiLine(node.getProperties())); - - return null; - } - - @Override - public Void visitDropDB(final DropDB node, final Integer indent) { - builder.append("DROP DATABASE "); - if (node.isExists()) { - builder.append("IF EXISTS "); - } - builder.append(formatName(node.getDbName())); - return null; - } - - @Override - public Void visitCreateTable(final CreateTable node, final Integer indent) { - builder.append("CREATE TABLE "); - if (node.isIfNotExists()) { - builder.append("IF NOT EXISTS "); - } - final String tableName = formatName(node.getName()); - builder.append(tableName).append(" (\n"); - - final String elementIndent = indentString(indent + 1); - final String columnList = - node.getElements().stream() - .map( - element -> { - if (element != null) { - return elementIndent + formatColumnDefinition(element); - } - - throw new UnsupportedOperationException("unknown table element: " + element); - }) - .collect(joining(",\n")); - builder.append(columnList); - builder.append("\n").append(")"); - - node.getCharsetName().ifPresent(charset -> builder.append(" CHARSET ").append(charset)); - - if (Objects.nonNull(node.getComment())) { - builder.append(" COMMENT '").append(node.getComment()).append("'"); - } - - builder.append(formatPropertiesMultiLine(node.getProperties())); - - return null; - } - - @Override - public Void visitCreateView(final CreateView node, final Integer indent) { - builder.append("CREATE "); - if (node.isReplace()) { - builder.append("OR REPLACE "); - } - builder.append("VIEW "); - final String tableName = formatName(node.getName()); - builder.append(tableName).append(" (\n"); - - final String elementIndent = indentString(indent + 1); - final String columnList = - node.getElements().stream() - .map( - element -> { - if (element != null) { - return elementIndent + formatColumnDefinition(element); - } - - throw new UnsupportedOperationException("unknown table element: " + element); - }) - .collect(joining(",\n")); - builder.append(columnList); - builder.append("\n").append(")"); - - if (Objects.nonNull(node.getComment())) { - builder.append(" COMMENT '").append(node.getComment()).append("'"); - } - - if (node.isRestrict()) { - builder.append(" RESTRICT"); - } - - builder.append(formatPropertiesMultiLine(node.getProperties())); - - builder.append(" AS ").append(node.getPrefixPath().toString()); - - return null; - } - - private String formatPropertiesMultiLine(List properties) { - if (properties.isEmpty()) { - return ""; - } - - String propertyList = - properties.stream() - .map( - element -> - INDENT - + formatName(element.getName()) - + " = " - + (element.isSetToDefault() - ? "DEFAULT" - : formatExpression(element.getNonDefaultValue()))) - .collect(joining(",\n")); - - return "\nWITH (\n" + propertyList + "\n)"; - } - - private String formatPropertiesSingleLine(List properties) { - if (properties.isEmpty()) { - return ""; - } - - return " WITH ( " + joinProperties(properties) + " )"; - } - - private String formatColumnDefinition(ColumnDefinition column) { - StringBuilder stringBuilder = - new StringBuilder() - .append(formatName(column.getName())) - .append(" ") - .append(column.getType()) - .append(" ") - .append(column.getColumnCategory()); - - column - .getCharsetName() - .ifPresent(charset -> stringBuilder.append(" CHARSET ").append(charset)); - - if (Objects.nonNull(column.getComment())) { - stringBuilder.append(" COMMENT '").append(column.getComment()).append("'"); - } - return stringBuilder.toString(); - } - - @Override - public Void visitDropTable(final DropTable node, final Integer indent) { - builder.append("DROP"); - builder.append(node.isView() ? " VIEW " : " TABLE "); - if (node.isExists()) { - builder.append("IF EXISTS "); - } - builder.append(formatName(node.getTableName())); - - return null; - } - - @Override - public Void visitRenameTable(final RenameTable node, final Integer indent) { - builder.append("ALTER"); - builder.append(node.isView() ? " VIEW " : " TABLE "); - if (node.tableIfExists()) { - builder.append("IF EXISTS "); - } - - builder - .append(formatName(node.getSource())) - .append(" RENAME TO ") - .append(formatName(node.getTarget())); - - return null; - } - - @Override - public Void visitSetProperties(final SetProperties node, final Integer context) { - final SetProperties.Type type = node.getType(); - builder.append("ALTER "); - switch (type) { - case TABLE: - builder.append("TABLE "); - case MATERIALIZED_VIEW: - builder.append("MATERIALIZED VIEW "); - case TREE_VIEW: - builder.append("VIEW "); - } - if (node.ifExists()) { - builder.append("IF EXISTS "); - } - - builder - .append(formatName(node.getName())) - .append(" SET PROPERTIES ") - .append(joinProperties(node.getProperties())); - - return null; - } - - private String joinProperties(List properties) { - return properties.stream() - .map( - element -> - formatName(element.getName()) - + " = " - + (element.isSetToDefault() - ? "DEFAULT" - : formatExpression(element.getNonDefaultValue()))) - .collect(joining(", ")); - } - - @Override - public Void visitRenameColumn(RenameColumn node, Integer indent) { - builder.append("ALTER"); - builder.append(node.isView() ? " VIEW " : " TABLE "); - if (node.tableIfExists()) { - builder.append("IF EXISTS "); - } - - builder.append(formatName(node.getTable())).append("RENAME COLUMN "); - if (node.columnIfExists()) { - builder.append("IF EXISTS "); - } - - builder - .append(formatName(node.getSource())) - .append(" TO ") - .append(formatName(node.getTarget())); - - return null; - } - - @Override - public Void visitDropColumn(final DropColumn node, final Integer indent) { - builder.append("ALTER"); - builder.append(node.isView() ? " VIEW " : " TABLE "); - if (node.tableIfExists()) { - builder.append("IF EXISTS "); - } - - builder.append(formatName(node.getTable())).append("DROP COLUMN "); - if (node.columnIfExists()) { - builder.append("IF EXISTS "); - } - - builder.append(formatName(node.getField())); - - return null; - } - - @Override - public Void visitAddColumn(final AddColumn node, final Integer indent) { - builder.append("ALTER"); - builder.append(node.isView() ? " VIEW " : " TABLE "); - if (node.tableIfExists()) { - builder.append("IF EXISTS "); - } - - builder.append(formatName(node.getTableName())).append("ADD COLUMN "); - if (node.columnIfNotExists()) { - builder.append("IF NOT EXISTS "); - } - - builder.append(formatColumnDefinition(node.getColumn())); - - return null; - } - - @Override - public Void visitSetTableComment(final SetTableComment node, final Integer indent) { - builder - .append("COMMENT ON") - .append(node.isView() ? " VIEW " : " TABLE ") - .append(formatName(node.getTableName())) - .append(" IS ") - .append(node.getComment()); - return null; - } - - @Override - public Void visitSetColumnComment(final SetColumnComment node, final Integer indent) { - builder - .append("COMMENT ON COLUMN ") - .append(formatName(node.getTable())) - .append(".") - .append(formatName(node.getField())) - .append(" IS ") - .append(node.getComment()); - return null; - } - - @Override - public Void visitInsert(Insert node, Integer indent) { - builder.append("INSERT INTO ").append(formatName(node.getTarget())); - - node.getColumns() - .ifPresent( - columns -> builder.append(" (").append(Joiner.on(", ").join(columns)).append(")")); - - builder.append("\n"); - - process(node.getQuery(), indent); - - return null; - } - - @Override - public Void visitUpdate(Update node, Integer indent) { - builder.append("UPDATE ").append(formatName(node.getTable().getName())).append(" SET"); - int setCounter = node.getAssignments().size() - 1; - for (UpdateAssignment assignment : node.getAssignments()) { - builder - .append("\n") - .append(indentString(indent + 1)) - .append(((Identifier) assignment.getName()).getValue()) - .append(" = ") - .append(formatExpression(assignment.getValue())); - if (setCounter > 0) { - builder.append(","); - } - setCounter--; - } - node.getWhere() - .ifPresent( - where -> - builder - .append("\n") - .append(indentString(indent)) - .append("WHERE ") - .append(formatExpression(where))); - return null; - } - - @Override - public Void visitRow(Row node, Integer indent) { - builder.append("ROW("); - boolean firstItem = true; - for (Expression item : node.getItems()) { - if (!firstItem) { - builder.append(", "); - } - process(item, indent); - firstItem = false; - } - builder.append(")"); - return null; - } - - @Override - public Void visitCreateFunction(CreateFunction node, Integer indent) { - builder - .append("CREATE FUNCTION ") - .append(node.getUdfName()) - .append(" AS ") - .append(node.getClassName()); - node.getUriString().ifPresent(uri -> builder.append(" USING URI ").append(uri)); - return null; - } - - @Override - public Void visitDropFunction(DropFunction node, Integer indent) { - builder.append("DROP FUNCTION "); - builder.append(node.getUdfName()); - return null; - } - - @Override - public Void visitLoadTsFile(final LoadTsFile node, final Integer indent) { - builder.append("LOAD "); - builder.append("\"" + node.getFilePath() + "\""); - builder.append(" \n"); - - if (!node.getLoadAttributes().isEmpty()) { - builder - .append("WITH (") - .append("\n") - .append( - node.getLoadAttributes().entrySet().stream() - .map( - entry -> - indentString(1) - + "\"" - + entry.getKey() - + "\" = \"" - + entry.getValue() - + "\"") - .collect(joining(", " + "\n"))) - .append(")\n"); - } - return null; - } - - @Override - public Void visitCreatePipe(CreatePipe node, Integer context) { - builder.append("CREATE PIPE "); - if (node.hasIfNotExistsCondition()) { - builder.append("IF NOT EXISTS "); - } - builder.append(node.getPipeName()); - builder.append(" \n"); - - if (!node.getSourceAttributes().isEmpty()) { - builder - .append("WITH SOURCE (") - .append("\n") - .append( - node.getSourceAttributes().entrySet().stream() - .map( - entry -> - indentString(1) - + "\"" - + entry.getKey() - + "\" = \"" - + entry.getValue() - + "\"") - .collect(joining(", " + "\n"))) - .append(")\n"); - } - - if (!node.getProcessorAttributes().isEmpty()) { - builder - .append("WITH PROCESSOR (") - .append("\n") - .append( - node.getProcessorAttributes().entrySet().stream() - .map( - entry -> - indentString(1) - + "\"" - + entry.getKey() - + "\" = \"" - + entry.getValue() - + "\"") - .collect(joining(", " + "\n"))) - .append(")\n"); - } - - if (!node.getSinkAttributes().isEmpty()) { - builder - .append("WITH SINK (") - .append("\n") - .append( - node.getSinkAttributes().entrySet().stream() - .map( - entry -> - indentString(1) - + "\"" - + entry.getKey() - + "\" = \"" - + entry.getValue() - + "\"") - .collect(joining(", " + "\n"))) - .append(")"); - } - - return null; - } - - @Override - public Void visitAlterPipe(AlterPipe node, Integer context) { - builder.append("ALTER PIPE "); - if (node.hasIfExistsCondition()) { - builder.append("IF EXISTS "); - } - builder.append(node.getPipeName()); - builder.append(" \n"); - - builder - .append(node.isReplaceAllExtractorAttributes() ? "REPLACE" : "MODIFY") - .append(" SOURCE (") - .append("\n") - .append( - node.getExtractorAttributes().entrySet().stream() - .map( - entry -> - indentString(1) - + "\"" - + entry.getKey() - + "\" = \"" - + entry.getValue() - + "\"") - .collect(joining(", " + "\n"))) - .append(")\n"); - - builder - .append(node.isReplaceAllProcessorAttributes() ? "REPLACE" : "MODIFY") - .append(" PROCESSOR (") - .append("\n") - .append( - node.getProcessorAttributes().entrySet().stream() - .map( - entry -> - indentString(1) - + "\"" - + entry.getKey() - + "\" = \"" - + entry.getValue() - + "\"") - .collect(joining(", " + "\n"))) - .append(")\n"); - - builder - .append(node.isReplaceAllConnectorAttributes() ? "REPLACE" : "MODIFY") - .append(" SINK (") - .append("\n") - .append( - node.getConnectorAttributes().entrySet().stream() - .map( - entry -> - indentString(1) - + "\"" - + entry.getKey() - + "\" = \"" - + entry.getValue() - + "\"") - .collect(joining(", " + "\n"))) - .append(")"); - - return null; - } - - @Override - public Void visitDropPipe(DropPipe node, Integer context) { - builder.append("DROP PIPE "); - if (node.hasIfExistsCondition()) { - builder.append("IF EXISTS "); - } - builder.append(node.getPipeName()); - - return null; - } - - @Override - public Void visitStartPipe(StartPipe node, Integer context) { - builder.append("START PIPE ").append(node.getPipeName()); - - return null; - } - - @Override - public Void visitStopPipe(StopPipe node, Integer context) { - builder.append("STOP PIPE ").append(node.getPipeName()); - - return null; - } - - @Override - public Void visitShowPipes(ShowPipes node, Integer context) { - builder.append("SHOW PIPES"); - - // TODO: consider pipeName and hasWhereClause in node - - return null; - } - - @Override - public Void visitCreatePipePlugin(CreatePipePlugin node, Integer context) { - builder.append("CREATE PIPEPLUGIN "); - if (node.hasIfNotExistsCondition()) { - builder.append("IF NOT EXISTS "); - } - builder.append(node.getPluginName()); - builder.append("\n"); - - builder.append("AS \""); - builder.append(node.getClassName()); - builder.append("\"\n"); - - builder.append("USING URI \""); - builder.append(node.getUriString()); - builder.append("\""); - - return null; - } - - @Override - public Void visitDropPipePlugin(DropPipePlugin node, Integer context) { - builder.append("DROP PIPEPLUGIN "); - if (node.hasIfExistsCondition()) { - builder.append("IF EXISTS "); - } - builder.append(node.getPluginName()); - - return null; - } - - @Override - public Void visitShowPipePlugins(ShowPipePlugins node, Integer context) { - builder.append("SHOW PIPEPLUGINS"); - - return null; - } - - @Override - public Void visitCreateTopic(CreateTopic node, Integer context) { - builder.append("CREATE TOPIC "); - if (node.hasIfNotExistsCondition()) { - builder.append("IF NOT EXISTS "); - } - builder.append(node.getTopicName()); - builder.append(" \n"); - - if (!node.getTopicAttributes().isEmpty()) { - builder - .append("WITH (") - .append("\n") - .append( - node.getTopicAttributes().entrySet().stream() - .map( - entry -> - indentString(1) - + "\"" - + entry.getKey() - + "\" = \"" - + entry.getValue() - + "\"") - .collect(joining(", " + "\n"))) - .append(")\n"); - } - - return null; - } - - @Override - public Void visitDropTopic(DropTopic node, Integer context) { - builder.append("DROP TOPIC "); - if (node.hasIfExistsCondition()) { - builder.append("IF EXISTS "); - } - builder.append(node.getTopicName()); - - return null; - } - - @Override - public Void visitShowTopics(ShowTopics node, Integer context) { - if (Objects.isNull(node.getTopicName())) { - builder.append("SHOW TOPICS"); - } else { - builder.append("SHOW TOPIC ").append(node.getTopicName()); - } - - return null; - } - - @Override - public Void visitShowSubscriptions(ShowSubscriptions node, Integer context) { - if (Objects.isNull(node.getTopicName())) { - builder.append("SHOW SUBSCRIPTIONS"); - } else { - builder.append("SHOW SUBSCRIPTIONS ON ").append(node.getTopicName()); - } - - return null; - } - - @Override - public Void visitDropSubscription(DropSubscription node, Integer context) { - builder.append("DROP SUBSCRIPTION "); - if (node.hasIfExistsCondition()) { - builder.append("IF EXISTS "); - } - builder.append(node.getSubscriptionId()); - - return null; - } - - @Override - public Void visitRelationalAuthorPlan(RelationalAuthorStatement node, Integer context) { - switch (node.getAuthorType()) { - case GRANT_USER_ANY: - builder.append( - "GRANT " - + node.getPrivilegesString() - + " ON ANY" - + " TO USER " - + node.getUserName() - + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); - break; - case GRANT_USER_ALL: - builder.append( - "GRANT ALL TO USER " - + node.getUserName() - + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); - break; - case GRANT_USER_DB: - builder.append( - "GRANT " - + node.getPrivilegesString() - + " ON DATABASE " - + node.getDatabase() - + " TO USER " - + node.getUserName() - + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); - break; - case GRANT_USER_SYS: - builder.append( - "GRANT " - + node.getPrivilegesString() - + " TO USER " - + node.getUserName() - + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); - break; - case GRANT_USER_TB: - builder.append( - "GRANT " - + node.getPrivilegesString() - + " ON TABLE " - + node.getDatabase() - + "." - + node.getTableName() - + " TO USER " - + node.getUserName() - + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); - break; - case GRANT_ROLE_ANY: - builder.append( - "GRANT " - + node.getPrivilegesString() - + " ON ANY" - + " TO ROLE " - + node.getRoleName() - + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); - break; - case GRANT_ROLE_ALL: - builder.append( - "GRANT ALL TO ROLE " - + node.getRoleName() - + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); - break; - case GRANT_ROLE_DB: - builder.append( - "GRANT " - + node.getPrivilegesString() - + " ON DATABASE " - + node.getDatabase() - + " TO ROLE " - + node.getRoleName() - + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); - break; - case GRANT_ROLE_SYS: - builder.append( - "GRANT " - + node.getPrivilegesString() - + " TO ROLE " - + node.getRoleName() - + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); - break; - case GRANT_ROLE_TB: - builder.append( - "GRANT " - + node.getPrivilegesString() - + " ON TABLE " - + node.getDatabase() - + "." - + node.getTableName() - + " TO ROLE " - + node.getRoleName() - + (node.isGrantOption() ? " WITH GRANT OPTION" : "")); - break; - case REVOKE_USER_ANY: - builder.append( - "REVOKE " - + (node.isGrantOption() ? "GRANT OPTION FOR " : "") - + node.getPrivilegesString() - + " ON ANY FROM USER " - + node.getUserName()); - break; - case REVOKE_USER_ALL: - builder.append( - "REVOKE" - + (node.isGrantOption() ? "GRANT OPTION FOR ALL" : "ALL") - + " FROM USER " - + node.getUserName()); - break; - case REVOKE_USER_DB: - builder.append( - "REVOKE " - + (node.isGrantOption() ? "GRANT OPTION FOR " : "") - + node.getPrivilegesString() - + " ON DATABASE " - + node.getDatabase() - + " FROM USER " - + node.getUserName()); - break; - case REVOKE_USER_SYS: - builder.append( - "REVOKE " - + (node.isGrantOption() ? "GRANT OPTION FOR " : "") - + node.getPrivilegesString() - + "FROM USER " - + node.getUserName()); - break; - case REVOKE_USER_TB: - builder.append( - "REVOKE " - + (node.isGrantOption() ? "GRANT OPTION FOR " : "") - + node.getPrivilegesString() - + " ON TABLE " - + node.getDatabase() - + "." - + node.getTableName() - + " FROM USER " - + node.getUserName()); - break; - case REVOKE_ROLE_ANY: - builder.append( - "REVOKE " - + (node.isGrantOption() ? "GRANT OPTION FOR " : "") - + node.getPrivilegesString() - + " ON ANY FROM ROLE " - + node.getRoleName()); - break; - case REVOKE_ROLE_ALL: - builder.append( - "REVOKE " - + (node.isGrantOption() ? "GRANT OPTION FOR ALL" : "ALL") - + " FROM ROLE " - + node.getRoleName()); - break; - case REVOKE_ROLE_DB: - builder.append( - "REVOKE " - + (node.isGrantOption() ? "GRANT OPTION FOR " : "") - + node.getPrivilegesString() - + " ON DATABASE " - + node.getDatabase() - + " FROM ROLE " - + node.getRoleName()); - break; - case REVOKE_ROLE_SYS: - builder.append( - "REVOKE " - + (node.isGrantOption() ? "GRANT OPTION FOR " : "") - + node.getPrivilegesString() - + " FROM ROLE " - + node.getRoleName()); - break; - case REVOKE_ROLE_TB: - builder.append( - "REVOKE " - + (node.isGrantOption() ? "GRANT OPTION FOR " : "") - + node.getPrivilegesString() - + " ON TABLE " - + node.getDatabase() - + "." - + node.getTableName() - + " FROM ROLE " - + node.getRoleName()); - break; - case GRANT_USER_ROLE: - builder.append("GRANT ROLE " + node.getRoleName() + " TO " + node.getUserName()); - break; - case REVOKE_USER_ROLE: - builder.append("REVOKE ROLE " + node.getRoleName() + " FROM " + node.getUserName()); - break; - case CREATE_USER: - builder.append("CREATE USER " + node.getUserName()); - break; - case CREATE_ROLE: - builder.append("CREATE ROLE " + node.getRoleName()); - break; - case UPDATE_USER: - builder.append("ALTER USER " + node.getUserName() + " SET PASSWORD"); - break; - case LIST_USER: - builder.append("LIST USER "); - break; - case LIST_ROLE: - builder.append("LIST ROLE "); - break; - case LIST_USER_PRIV: - builder.append("LIST PRIVILEGES OF USER " + node.getUserName()); - break; - case LIST_ROLE_PRIV: - builder.append("LIST PRIVILEGES OF ROLE " + node.getRoleName()); - break; - case DROP_ROLE: - builder.append("DROP ROLE " + node.getRoleName()); - break; - case DROP_USER: - builder.append("DROP USER " + node.getUserName()); - break; - default: - break; - } - return null; - } - - private void appendBeginLabel(Optional label) { - label.ifPresent(value -> builder.append(formatName(value)).append(": ")); - } - - private void processRelation(Relation relation, Integer indent) { - // TODO: handle this properly - if (relation instanceof Table) { - builder.append("TABLE ").append(formatName(((Table) relation).getName())).append('\n'); - } else { - process(relation, indent); - } - } - - private SqlBuilder append(int indent, String value) { - return builder.append(indentString(indent)).append(value); - } - - private static String indentString(int indent) { - return Strings.repeat(INDENT, indent); - } - - private void formatDefinitionList(List elements, int indent) { - if (elements.size() == 1) { - builder.append(" ").append(getOnlyElement(elements)).append("\n"); - } else { - builder.append("\n"); - for (int i = 0; i < elements.size() - 1; i++) { - append(indent, elements.get(i)).append(",\n"); - } - append(indent, elements.get(elements.size() - 1)).append("\n"); - } - } - - private void appendAliasColumns(Formatter.SqlBuilder builder, List columns) { - if ((columns != null) && !columns.isEmpty()) { - String formattedColumns = - columns.stream().map(SqlFormatter::formatName).collect(joining(", ")); - - builder.append(" (").append(formattedColumns).append(')'); - } - } - - @Override - public Void visitTableFunctionInvocation(TableFunctionInvocation node, Integer indent) { - append(indent, "TABLE("); - appendTableFunctionInvocation(node, indent + 1); - builder.append(")"); - return null; - } - - private void appendTableFunctionInvocation(TableFunctionInvocation node, Integer indent) { - builder.append(formatName(node.getName())).append("(\n"); - appendTableFunctionArguments(node.getArguments(), indent + 1); - builder.append(")"); - } - - private void appendTableFunctionArguments(List arguments, int indent) { - for (int i = 0; i < arguments.size(); i++) { - TableFunctionArgument argument = arguments.get(i); - if (argument.getName().isPresent()) { - append(indent, formatName(argument.getName().get())); - builder.append(" => "); - } else { - append(indent, ""); - } - Node value = argument.getValue(); - if (value instanceof Expression) { - builder.append(formatExpression((Expression) value)); - } else { - process(value, indent + 1); - } - if (i < arguments.size() - 1) { - builder.append(",\n"); - } - } - } - - @Override - public Void visitTableArgument(TableFunctionTableArgument node, Integer indent) { - Relation relation = node.getTable(); - Node unaliased = - relation instanceof AliasedRelation - ? ((AliasedRelation) relation).getRelation() - : relation; - if (unaliased instanceof TableSubquery) { - // unpack the relation from TableSubquery to avoid adding another pair of parentheses - unaliased = ((TableSubquery) unaliased).getQuery(); - } - builder.append("TABLE("); - process(unaliased, indent); - builder.append(")"); - if (relation instanceof AliasedRelation) { - AliasedRelation aliasedRelation = (AliasedRelation) relation; - builder.append(" AS ").append(formatName(aliasedRelation.getAlias())); - appendAliasColumns(builder, aliasedRelation.getColumnNames()); - } - if (node.getPartitionBy().isPresent()) { - builder.append("\n"); - append(indent, "PARTITION BY ") - .append( - node.getPartitionBy().get().stream() - .map(SqlFormatter::formatExpression) - .collect(joining(", "))); - } - node.getOrderBy() - .ifPresent( - orderBy -> { - builder.append("\n"); - append(indent, formatOrderBy(orderBy)); - }); - - return null; + @CanIgnoreReturnValue + public SqlBuilder append(char c) { + builder.append(c); + return this; } } } From 5f1639cac34d22361fc7718af79cd83eed09478e Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Thu, 16 Apr 2026 16:53:34 +0800 Subject: [PATCH 25/45] refactor --- .../relational/sql/ast/AnchorPattern.java | 9 +- .../sql/ast/CommonQueryAstVisitor.java | 121 ++++++ .../plan/relational/sql/ast/EmptyPattern.java | 9 +- .../plan/relational/sql/ast/Except.java | 10 +- .../relational/sql/ast/ExcludedPattern.java | 9 +- .../plan/relational/sql/ast/Intersect.java | 10 +- .../relational/sql/ast/MeasureDefinition.java | 11 +- .../sql/ast/OneOrMoreQuantifier.java | 8 +- .../sql/ast/PatternAlternation.java | 9 +- .../sql/ast/PatternConcatenation.java | 9 +- .../sql/ast/PatternPermutation.java | 9 +- .../relational/sql/ast/PatternQuantifier.java | 8 +- .../sql/ast/PatternRecognitionRelation.java | 12 +- .../relational/sql/ast/PatternVariable.java | 10 +- .../relational/sql/ast/QuantifiedPattern.java | 9 +- .../sql/ast/QuerySpecification.java | 16 +- .../relational/sql/ast/RangeQuantifier.java | 10 +- .../plan/relational/sql/ast/RowPattern.java | 8 +- .../plan/relational/sql/ast/Select.java | 10 +- .../plan/relational/sql/ast/SetOperation.java | 9 +- .../plan/relational/sql/ast/SkipTo.java | 18 +- .../relational/sql/ast/SubsetDefinition.java | 10 +- .../plan/relational/sql/ast/Table.java | 11 +- .../sql/ast/TableFunctionArgument.java | 11 +- .../sql/ast/TableFunctionInvocation.java | 11 +- .../sql/ast/TableFunctionTableArgument.java | 12 +- .../plan/relational/sql/ast/Union.java | 10 +- .../sql/ast/VariableDefinition.java | 11 +- .../relational/sql/ast/WindowDefinition.java | 11 +- .../sql/ast/ZeroOrMoreQuantifier.java | 8 +- .../sql/ast/ZeroOrOneQuantifier.java | 8 +- .../sql/util/ExpressionFormatter.java | 10 +- .../visitor/PipePlanToStatementVisitor.java | 2 +- .../queryengine/common/MPPQueryContext.java | 2 +- .../operator/ExplainAnalyzeOperator.java | 2 +- .../db/queryengine/plan/Coordinator.java | 2 +- ...ableModelStatementMemorySourceVisitor.java | 2 +- .../plan/relational/analyzer/Analysis.java | 12 +- .../analyzer/ExpressionAnalyzer.java | 6 +- .../analyzer/PatternRecognitionAnalysis.java | 2 +- .../analyzer/PatternRecognitionAnalyzer.java | 18 +- .../plan/relational/analyzer/Scope.java | 2 +- .../analyzer/StatementAnalyzer.java | 34 +- .../relational/planner/CteMaterializer.java | 2 +- .../plan/relational/planner/QueryPlanner.java | 6 +- .../relational/planner/RelationPlanner.java | 30 +- .../planner/TableLogicalPlanner.java | 2 +- .../rowpattern/RowPatternToIrRewriter.java | 28 +- .../sql/ast/AbstractQueryDeviceWithCache.java | 1 + .../sql/ast/AbstractTraverseDevice.java | 1 + .../plan/relational/sql/ast/AstVisitor.java | 121 ------ .../plan/relational/sql/ast/CountDevice.java | 1 + .../sql/ast/DefaultTraversalVisitor.java | 10 + .../plan/relational/sql/ast/Delete.java | 1 + .../plan/relational/sql/ast/DeleteDevice.java | 1 + .../plan/relational/sql/ast/Insert.java | 1 + .../plan/relational/sql/ast/ShowDevice.java | 1 + .../plan/relational/sql/ast/Update.java | 1 + .../relational/sql/parser/AstBuilder.java | 80 ++-- .../relational/sql/rewrite/ShowRewrite.java | 2 +- .../sql/util/CommonQuerySqlFormatter.java | 288 +++++++++++- .../sql/util/DataNodeSqlFormatter.java | 410 ++---------------- .../plan/relational/sql/util/QueryUtil.java | 8 +- .../sql/util/RowPatternFormatter.java | 30 +- .../relational/sql/util/SqlFormatter.java | 76 ---- 65 files changed, 657 insertions(+), 965 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/AnchorPattern.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/EmptyPattern.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Except.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/ExcludedPattern.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Intersect.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/MeasureDefinition.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/OneOrMoreQuantifier.java (78%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/PatternAlternation.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/PatternConcatenation.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/PatternPermutation.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/PatternQuantifier.java (84%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/PatternRecognitionRelation.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/PatternVariable.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/QuantifiedPattern.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/QuerySpecification.java (87%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/RangeQuantifier.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/RowPattern.java (73%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Select.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/SetOperation.java (73%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/SkipTo.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/SubsetDefinition.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Table.java (81%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/TableFunctionArgument.java (83%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/TableFunctionInvocation.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/TableFunctionTableArgument.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/Union.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/VariableDefinition.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/WindowDefinition.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/ZeroOrMoreQuantifier.java (78%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/ZeroOrOneQuantifier.java (78%) delete mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AnchorPattern.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AnchorPattern.java index 881741ee0986b..9af2abdd77e4b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AnchorPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AnchorPattern.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -55,7 +50,7 @@ public Type getType() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitAnchorPattern(this, context); + return ((CommonQueryAstVisitor) visitor).visitAnchorPattern(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java index b1721897f8d8f..c5a14b6485bef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java @@ -343,4 +343,125 @@ default R visitOffset(Offset node, C context) { default R visitLimit(Limit node, C context) { return visitNode(node, context); } + + default R visitSelect(Select node, C context) { + return visitNode(node, context); + } + + default R visitTable(Table node, C context) { + return visitQueryBody(node, context); + } + + default R visitQuerySpecification(QuerySpecification node, C context) { + return visitQueryBody(node, context); + } + + default R visitWindowDefinition(WindowDefinition node, C context) { + return visitNode(node, context); + } + + default R visitSetOperation(SetOperation node, C context) { + return visitQueryBody(node, context); + } + + default R visitUnion(Union node, C context) { + return visitSetOperation(node, context); + } + + default R visitIntersect(Intersect node, C context) { + return visitSetOperation(node, context); + } + + default R visitExcept(Except node, C context) { + return visitSetOperation(node, context); + } + + default R visitTableArgument(TableFunctionTableArgument tableFunctionTableArgument, C context) { + return visitNode(tableFunctionTableArgument, context); + } + + default R visitTableFunctionArgument(TableFunctionArgument tableFunctionArgument, C context) { + return visitNode(tableFunctionArgument, context); + } + + default R visitTableFunctionInvocation( + TableFunctionInvocation tableFunctionInvocation, C context) { + return visitNode(tableFunctionInvocation, context); + } + + default R visitPatternRecognitionRelation(PatternRecognitionRelation node, C context) { + return visitRelation(node, context); + } + + default R visitRowPattern(RowPattern node, C context) { + return visitNode(node, context); + } + + default R visitPatternAlternation(PatternAlternation node, C context) { + return visitRowPattern(node, context); + } + + default R visitPatternConcatenation(PatternConcatenation node, C context) { + return visitRowPattern(node, context); + } + + default R visitQuantifiedPattern(QuantifiedPattern node, C context) { + return visitRowPattern(node, context); + } + + default R visitAnchorPattern(AnchorPattern node, C context) { + return visitRowPattern(node, context); + } + + default R visitEmptyPattern(EmptyPattern node, C context) { + return visitRowPattern(node, context); + } + + default R visitExcludedPattern(ExcludedPattern node, C context) { + return visitRowPattern(node, context); + } + + default R visitPatternPermutation(PatternPermutation node, C context) { + return visitRowPattern(node, context); + } + + default R visitPatternVariable(PatternVariable node, C context) { + return visitRowPattern(node, context); + } + + default R visitPatternQuantifier(PatternQuantifier node, C context) { + return visitNode(node, context); + } + + default R visitZeroOrMoreQuantifier(ZeroOrMoreQuantifier node, C context) { + return visitPatternQuantifier(node, context); + } + + default R visitOneOrMoreQuantifier(OneOrMoreQuantifier node, C context) { + return visitPatternQuantifier(node, context); + } + + default R visitZeroOrOneQuantifier(ZeroOrOneQuantifier node, C context) { + return visitPatternQuantifier(node, context); + } + + default R visitRangeQuantifier(RangeQuantifier node, C context) { + return visitPatternQuantifier(node, context); + } + + default R visitMeasureDefinition(MeasureDefinition node, C context) { + return visitNode(node, context); + } + + default R visitSkipTo(SkipTo node, C context) { + return visitNode(node, context); + } + + default R visitSubsetDefinition(SubsetDefinition node, C context) { + return visitNode(node, context); + } + + default R visitVariableDefinition(VariableDefinition node, C context) { + return visitNode(node, context); + } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/EmptyPattern.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/EmptyPattern.java index 34e4fbf0f6cde..ffd04baec1c13 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/EmptyPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/EmptyPattern.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -41,7 +36,7 @@ public EmptyPattern(NodeLocation location) { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitEmptyPattern(this, context); + return ((CommonQueryAstVisitor) visitor).visitEmptyPattern(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Except.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Except.java index 1e4bfb3c927a4..7e8275dbcb988 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Except.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Except.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -64,7 +58,7 @@ public Relation getRight() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitExcept(this, context); + return ((CommonQueryAstVisitor) visitor).visitExcept(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ExcludedPattern.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ExcludedPattern.java index 5bf356f0ed09d..99301435bc16b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExcludedPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ExcludedPattern.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -50,7 +45,7 @@ public RowPattern getPattern() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitExcludedPattern(this, context); + return ((CommonQueryAstVisitor) visitor).visitExcludedPattern(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Intersect.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Intersect.java index a79aa412eabf5..03899734dac87 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Intersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Intersect.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -57,7 +51,7 @@ public List getRelations() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitIntersect(this, context); + return ((CommonQueryAstVisitor) visitor).visitIntersect(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/MeasureDefinition.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/MeasureDefinition.java index a8f640d575df3..9293e3f154a85 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MeasureDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/MeasureDefinition.java @@ -17,14 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -58,7 +51,7 @@ public Identifier getName() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitMeasureDefinition(this, context); + return ((CommonQueryAstVisitor) visitor).visitMeasureDefinition(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/OneOrMoreQuantifier.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/OneOrMoreQuantifier.java index 57b3bd52ff997..2a682c6f40d47 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/OneOrMoreQuantifier.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; @@ -35,7 +31,7 @@ public OneOrMoreQuantifier(NodeLocation location, boolean greedy) { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitOneOrMoreQuantifier(this, context); + return ((CommonQueryAstVisitor) visitor).visitOneOrMoreQuantifier(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternAlternation.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternAlternation.java index 237c1bf7b0e4d..42a324d52ba50 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternAlternation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternAlternation.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -52,7 +47,7 @@ public List getPatterns() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitPatternAlternation(this, context); + return ((CommonQueryAstVisitor) visitor).visitPatternAlternation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternConcatenation.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternConcatenation.java index 3466e3d42545b..0b83aca9feeb9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternConcatenation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternConcatenation.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -52,7 +47,7 @@ public List getPatterns() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitPatternConcatenation(this, context); + return ((CommonQueryAstVisitor) visitor).visitPatternConcatenation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternPermutation.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternPermutation.java index 90901c9f7e333..84c55c27a43f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternPermutation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternPermutation.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -52,7 +47,7 @@ public List getPatterns() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitPatternPermutation(this, context); + return ((CommonQueryAstVisitor) visitor).visitPatternPermutation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternQuantifier.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternQuantifier.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternQuantifier.java index 0467833ef8f15..51aee17ff43b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternQuantifier.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; @@ -44,7 +40,7 @@ public boolean isGreedy() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitPatternQuantifier(this, context); + return ((CommonQueryAstVisitor) visitor).visitPatternQuantifier(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternRecognitionRelation.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternRecognitionRelation.java index 3ebc7d922e3e2..05aacbf2f71ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternRecognitionRelation.java @@ -17,15 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -115,7 +107,7 @@ public List getVariableDefinitions() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitPatternRecognitionRelation(this, context); + return ((CommonQueryAstVisitor) visitor).visitPatternRecognitionRelation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternVariable.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternVariable.java index 16ca5a93fd306..4130de8503be2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PatternVariable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternVariable.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -51,7 +45,7 @@ public Identifier getName() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitPatternVariable(this, context); + return ((CommonQueryAstVisitor) visitor).visitPatternVariable(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuantifiedPattern.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuantifiedPattern.java index 4c863497f7d48..f6e4ae23d176f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuantifiedPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuantifiedPattern.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -57,7 +52,7 @@ public PatternQuantifier getPatternQuantifier() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitQuantifiedPattern(this, context); + return ((CommonQueryAstVisitor) visitor).visitQuantifiedPattern(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuerySpecification.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuerySpecification.java index e893c3990f0e7..ba3e87dcfb2a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/QuerySpecification.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuerySpecification.java @@ -17,19 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -139,7 +127,7 @@ public Optional getLimit() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitQuerySpecification(this, context); + return ((CommonQueryAstVisitor) visitor).visitQuerySpecification(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/RangeQuantifier.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/RangeQuantifier.java index ce73d6fdd94b6..c7e42e59c0bcc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RangeQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/RangeQuantifier.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -62,7 +56,7 @@ public Optional getAtMost() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitRangeQuantifier(this, context); + return ((CommonQueryAstVisitor) visitor).visitRangeQuantifier(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RowPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/RowPattern.java similarity index 73% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RowPattern.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/RowPattern.java index 946b4a321a55a..a9e54c2808618 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RowPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/RowPattern.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; public abstract class RowPattern extends Node { protected RowPattern(NodeLocation location) { @@ -30,6 +26,6 @@ protected RowPattern(NodeLocation location) { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitRowPattern(this, context); + return ((CommonQueryAstVisitor) visitor).visitRowPattern(this, context); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Select.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Select.java index 8d643d61826d5..0781bac309f22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Select.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Select.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -63,7 +57,7 @@ public List getSelectItems() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitSelect(this, context); + return ((CommonQueryAstVisitor) visitor).visitSelect(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SetOperation.java similarity index 73% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SetOperation.java index 331df91492e98..aa2ae381e6330 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetOperation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SetOperation.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import java.util.List; @@ -40,7 +35,7 @@ public boolean isDistinct() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitSetOperation(this, context); + return ((CommonQueryAstVisitor) visitor).visitSetOperation(this, context); } public abstract List getRelations(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SkipTo.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SkipTo.java index be44c5e61a838..28828eb58559a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SkipTo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SkipTo.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -35,10 +29,10 @@ import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.Position.FIRST; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.Position.LAST; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.Position.NEXT; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.Position.PAST_LAST; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.Position.FIRST; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.Position.LAST; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.Position.NEXT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.Position.PAST_LAST; public class SkipTo extends Node { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(SkipTo.class); @@ -96,7 +90,7 @@ public Optional getIdentifier() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitSkipTo(this, context); + return ((CommonQueryAstVisitor) visitor).visitSkipTo(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubsetDefinition.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubsetDefinition.java index 8a5ad1c75ac96..1b3883af0bfa0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubsetDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubsetDefinition.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; @@ -59,7 +53,7 @@ public List getIdentifiers() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitSubsetDefinition(this, context); + return ((CommonQueryAstVisitor) visitor).visitSubsetDefinition(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Table.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Table.java index 0e511e67579d6..ade146f6e88ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Table.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Table.java @@ -17,14 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -57,7 +50,7 @@ public QualifiedName getName() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitTable(this, context); + return ((CommonQueryAstVisitor) visitor).visitTable(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionArgument.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionArgument.java index 25f4b1a05b8c2..e68beb5c5e2c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionArgument.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionArgument.java @@ -17,14 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -61,7 +54,7 @@ public Node getValue() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitTableFunctionArgument(this, context); + return ((CommonQueryAstVisitor) visitor).visitTableFunctionArgument(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionInvocation.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionInvocation.java index 5f3cac3292035..5918339a40577 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionInvocation.java @@ -17,14 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; @@ -58,7 +51,7 @@ public List getArguments() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitTableFunctionInvocation(this, context); + return ((CommonQueryAstVisitor) visitor).visitTableFunctionInvocation(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionTableArgument.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionTableArgument.java index 01f07c3ddb407..57d200b8f7755 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionTableArgument.java @@ -17,15 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -75,7 +67,7 @@ public void updateOrderBy(OrderBy orderBy) { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitTableArgument(this, context); + return ((CommonQueryAstVisitor) visitor).visitTableArgument(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Union.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Union.java index ee746365b973b..b11b2d3b36ae6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Union.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Union.java @@ -17,13 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -57,7 +51,7 @@ public List getRelations() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitUnion(this, context); + return ((CommonQueryAstVisitor) visitor).visitUnion(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/VariableDefinition.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/VariableDefinition.java index 2be9e0f759fae..e1324f67edd5e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/VariableDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/VariableDefinition.java @@ -17,14 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -58,7 +51,7 @@ public Expression getExpression() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitVariableDefinition(this, context); + return ((CommonQueryAstVisitor) visitor).visitVariableDefinition(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowDefinition.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowDefinition.java index 4adadc82afd9c..14909ce3bc086 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WindowDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowDefinition.java @@ -17,14 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -58,7 +51,7 @@ public WindowSpecification getWindow() { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitWindowDefinition(this, context); + return ((CommonQueryAstVisitor) visitor).visitWindowDefinition(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ZeroOrMoreQuantifier.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ZeroOrMoreQuantifier.java index 113905c8a3b55..d8dc9aac340fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ZeroOrMoreQuantifier.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; @@ -35,7 +31,7 @@ public ZeroOrMoreQuantifier(NodeLocation location, boolean greedy) { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitZeroOrMoreQuantifier(this, context); + return ((CommonQueryAstVisitor) visitor).visitZeroOrMoreQuantifier(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ZeroOrOneQuantifier.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ZeroOrOneQuantifier.java index e14915b874369..e942a68c468b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ZeroOrOneQuantifier.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; @@ -35,7 +31,7 @@ public ZeroOrOneQuantifier(NodeLocation location, boolean greedy) { @Override public R accept(IAstVisitor visitor, C context) { - return ((AstVisitor) visitor).visitZeroOrOneQuantifier(this, context); + return ((CommonQueryAstVisitor) visitor).visitZeroOrOneQuantifier(this, context); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java index 4da7aa0b3c7f7..f710a18325408 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java @@ -82,6 +82,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; +import org.apache.iotdb.db.queryengine.plan.relational.sql.util.CommonQuerySqlFormatter; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; @@ -99,9 +100,8 @@ import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.CommonQuerySqlFormatter.formatName; import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.ReservedIdentifiers.reserved; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.SqlFormatter.formatName; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.SqlFormatter.formatSql; public final class ExpressionFormatter { @@ -116,6 +116,12 @@ public static String formatExpression(Expression expression) { return new Formatter(Optional.empty(), Optional.empty()).process(expression, null); } + private static String formatSql(Node root) { + StringBuilder builder = new StringBuilder(); + new CommonQuerySqlFormatter(builder).process(root, 0); + return builder.toString(); + } + public static class Formatter implements CommonQueryAstVisitor { private final Optional> literalFormatter; private final Optional> symbolReferenceFormatter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java index b23474619539b..525418e5889f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; @@ -45,7 +46,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateOrUpdateDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.crud.DeleteDataStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java index bc18bb75375fc..c682644d482ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java @@ -31,13 +31,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.analyze.lock.SchemaLockType; import org.apache.iotdb.db.queryengine.plan.planner.memory.NotThreadSafeMemoryReservationManager; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.statistics.QueryPlanStatistics; import org.apache.iotdb.db.utils.cte.CteDataStore; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java index 01fde66d65a6a..ed7f3c88eb1da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java @@ -30,12 +30,12 @@ import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.execution.QueryExecution; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.statistics.FragmentInstanceStatisticsDrawer; import org.apache.iotdb.db.queryengine.statistics.QueryStatisticsFetcher; import org.apache.iotdb.db.queryengine.statistics.StatisticLine; 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 fb195f08dd97f..a8b11dea77daa 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 @@ -43,6 +43,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; @@ -142,7 +143,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopExternalService; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopRepairData; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubscriptionStatement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UnloadModel; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WrappedInsertStatement; 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 6f8fdb12c92b0..7c2535a49ebcc 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 @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; 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; @@ -37,7 +38,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDevice; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; 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 2cccc1c931738..698020c3a4f40 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 @@ -46,9 +46,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RangeQuantifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionInvocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; @@ -65,13 +71,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowStatement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import com.google.common.collect.ArrayListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 923bf22b3fee3..039fcbbf6dd1c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -72,13 +72,16 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ProcessingMode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RangeQuantifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StackableAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubsetDefinition; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; @@ -99,9 +102,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java index ef0f2bbae21dd..28ddb808fdf01 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RangeQuantifier; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java index 846ec6b8bd0f4..a0af3ea3b3414 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java @@ -21,20 +21,20 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExcludedPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.MeasureDefinition; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.Range; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java index ce24d7246dee0..83e10a3530be2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java @@ -25,8 +25,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.rpc.TSStatusCode; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index 05b6d98459dfb..258407ee5b83c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -41,6 +41,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Columns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Except; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; @@ -55,6 +56,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Intersect; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; @@ -64,32 +66,46 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Select; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SetOperation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleGroupBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubsetDefinition; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionArgument; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionInvocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionTableArgument; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Union; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Window; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowDefinition; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; @@ -148,7 +164,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropSubscription; 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.Except; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FetchDevice; @@ -156,20 +171,14 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRow; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertTablet; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; 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.LoadTsFile; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetOperation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetProperties; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDevice; @@ -180,20 +189,11 @@ 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; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo; 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.SubsetDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionArgument; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WrappedInsertStatement; import org.apache.iotdb.db.queryengine.plan.relational.type.CompatibleResolver; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertBaseStatement; @@ -279,6 +279,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.LEFT; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.RIGHT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; import static org.apache.iotdb.db.queryengine.execution.warnings.StandardWarningCode.REDUNDANT_ORDER_BY; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AggregationAnalyzer.verifyOrderByAggregations; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AggregationAnalyzer.verifySourceAggregations; @@ -290,7 +291,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope.BasisType.TABLE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.MetadataUtil.createQualifiedObjectName; import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.AstUtil.preOrder; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java index df94bde9c817a..f1c4c6ab2d5c5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java @@ -30,6 +30,7 @@ import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.protocol.session.SessionManager; @@ -45,7 +46,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import org.apache.iotdb.db.queryengine.statistics.FragmentInstanceStatisticsDrawer; import org.apache.iotdb.db.queryengine.statistics.QueryStatisticsFetcher; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index b7281d16b9451..7d105013bffaf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -50,13 +50,16 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -67,9 +70,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GapFillStartAndEndTimeExtractVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; 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 1b717e1edad62..1dd87458570ed 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 @@ -55,19 +55,32 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Except; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Intersect; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SetOperation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionInvocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Union; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -109,26 +122,13 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Delete; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Except; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRow; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertTablet; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; 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.LoadTsFile; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetOperation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowsStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; @@ -169,6 +169,8 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.INNER; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.LEFT; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.RIGHT; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.Position.PAST_LAST; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.NavigationAnchor.LAST; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.NavigationMode.RUNNING; import static org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingTranslator.sortItemToSortOrder; @@ -178,8 +180,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.QueryPlanner.extractPatternRecognitionExpressions; import static org.apache.iotdb.db.queryengine.plan.relational.planner.QueryPlanner.pruneInvisibleFields; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractPredicates; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.Position.PAST_LAST; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; import static org.apache.tsfile.read.common.type.LongType.INT64; import static org.apache.tsfile.read.common.type.StringType.STRING; 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 ccb5cad7f8c60..cf63bc86cb168 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 @@ -39,6 +39,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -84,7 +85,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowDevice; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WrappedStatement; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java index 80e0001eb5c9e..41d74ae049741 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java @@ -30,23 +30,23 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantified; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier; import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AnchorPattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.EmptyPattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExcludedPattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OneOrMoreQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternAlternation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternConcatenation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternPermutation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternVariable; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedPattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrMoreQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrOneQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.Range; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AnchorPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.EmptyPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OneOrMoreQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternAlternation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternConcatenation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternPermutation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternVariable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ZeroOrMoreQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ZeroOrOneQuantifier; import java.util.List; 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 ecd4bef96a726..8a596ddb5b4e6 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 @@ -26,6 +26,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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/AbstractTraverseDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractTraverseDevice.java index 3debfdd058c1f..313465765ca1b 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 @@ -29,6 +29,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.MetadataUtil; 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 2294907eb41ab..ea8f8b8200370 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 @@ -55,38 +55,6 @@ default R visitDeallocate(Deallocate node, C context) { return visitStatement(node, context); } - default R visitSelect(Select node, C context) { - return visitNode(node, context); - } - - default R visitQuerySpecification(QuerySpecification node, C context) { - return visitQueryBody(node, context); - } - - default R visitSetOperation(SetOperation node, C context) { - return visitQueryBody(node, context); - } - - default R visitUnion(Union node, C context) { - return visitSetOperation(node, context); - } - - default R visitIntersect(Intersect node, C context) { - return visitSetOperation(node, context); - } - - default R visitExcept(Except node, C context) { - return visitSetOperation(node, context); - } - - default R visitWindowDefinition(WindowDefinition node, C context) { - return visitNode(node, context); - } - - default R visitTable(Table node, C context) { - return visitQueryBody(node, context); - } - default R visitColumnDefinition(ColumnDefinition node, C context) { return visitNode(node, context); } @@ -490,93 +458,4 @@ default R visitUnloadModel(UnloadModel node, C context) { default R visitDropModel(DropModel node, C context) { return visitStatement(node, context); } - - default R visitTableArgument(TableFunctionTableArgument tableFunctionTableArgument, C context) { - return visitNode(tableFunctionTableArgument, context); - } - - default R visitTableFunctionArgument(TableFunctionArgument tableFunctionArgument, C context) { - return visitNode(tableFunctionArgument, context); - } - - default R visitTableFunctionInvocation( - TableFunctionInvocation tableFunctionInvocation, C context) { - return visitNode(tableFunctionInvocation, context); - } - - default R visitMeasureDefinition(MeasureDefinition node, C context) { - return visitNode(node, context); - } - - default R visitSkipTo(SkipTo node, C context) { - return visitNode(node, context); - } - - default R visitSubsetDefinition(SubsetDefinition node, C context) { - return visitNode(node, context); - } - - default R visitVariableDefinition(VariableDefinition node, C context) { - return visitNode(node, context); - } - - default R visitPatternRecognitionRelation(PatternRecognitionRelation node, C context) { - return visitRelation(node, context); - } - - default R visitRowPattern(RowPattern node, C context) { - return visitNode(node, context); - } - - default R visitPatternAlternation(PatternAlternation node, C context) { - return visitRowPattern(node, context); - } - - default R visitPatternConcatenation(PatternConcatenation node, C context) { - return visitRowPattern(node, context); - } - - default R visitQuantifiedPattern(QuantifiedPattern node, C context) { - return visitRowPattern(node, context); - } - - default R visitAnchorPattern(AnchorPattern node, C context) { - return visitRowPattern(node, context); - } - - default R visitEmptyPattern(EmptyPattern node, C context) { - return visitRowPattern(node, context); - } - - default R visitExcludedPattern(ExcludedPattern node, C context) { - return visitRowPattern(node, context); - } - - default R visitPatternPermutation(PatternPermutation node, C context) { - return visitRowPattern(node, context); - } - - default R visitPatternVariable(PatternVariable node, C context) { - return visitRowPattern(node, context); - } - - default R visitPatternQuantifier(PatternQuantifier node, C context) { - return visitNode(node, context); - } - - default R visitZeroOrMoreQuantifier(ZeroOrMoreQuantifier node, C context) { - return visitPatternQuantifier(node, context); - } - - default R visitOneOrMoreQuantifier(OneOrMoreQuantifier node, C context) { - return visitPatternQuantifier(node, context); - } - - default R visitZeroOrOneQuantifier(ZeroOrOneQuantifier node, C context) { - return visitPatternQuantifier(node, context); - } - - default R visitRangeQuantifier(RangeQuantifier node, C context) { - return visitPatternQuantifier(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 4d01dfb5c6480..11c480bb5f908 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 @@ -23,6 +23,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; 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/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java index 118ab56940d2b..8a57ff1d024aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java @@ -28,6 +28,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExcludedPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; @@ -50,12 +51,21 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternAlternation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternConcatenation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternPermutation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternVariable; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Select; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SetOperation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleGroupBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java index a6130a857e5f4..3173acde25a62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java @@ -26,6 +26,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.storageengine.dataregion.modification.TableDeletionEntry; import com.google.common.collect.ImmutableList; 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 c061fed44055a..87657581d704c 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 @@ -33,6 +33,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceBlackListConstructor; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.TableDeviceQuerySource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java index 55459f961a84f..6304177481355 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java @@ -27,6 +27,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.LongType; 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 2e46c31c7ca7c..120ce603e920a 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 @@ -28,6 +28,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; 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/Update.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java index 9fafb5243717d..934faf1eae56d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; 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 411439e274788..99d193f79ebe5 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 @@ -38,6 +38,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllRows; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AnchorPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; @@ -54,6 +55,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataTypeParameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.EmptyPattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Except; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExcludedPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; @@ -68,6 +72,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Intersect; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; @@ -77,6 +82,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; @@ -84,36 +90,60 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OneOrMoreQuantifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternAlternation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternConcatenation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternPermutation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternVariable; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ProcessingMode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RangeQuantifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Select; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleGroupBy; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionArgument; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionInvocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionTableArgument; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Union; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Window; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowDefinition; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrMoreQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrOneQuantifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; @@ -121,7 +151,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterColumnDataType; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AnchorPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ClearCache; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ColumnDefinition; @@ -152,9 +181,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropSubscription; 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.EmptyPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Except; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExcludedPattern; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Execute; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExecuteImmediate; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; @@ -163,29 +189,16 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Flush; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; 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.LoadConfiguration; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadModel; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MigrateRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OneOrMoreQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternAlternation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternConcatenation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternPermutation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternVariable; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Prepare; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ReconstructRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RelationalAuthorStatement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RemoveAINode; @@ -194,8 +207,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RemoveRegion; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetColumnComment; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetConfiguration; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetProperties; @@ -231,26 +242,15 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTopics; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVariables; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVersion; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StartPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StartRepairData; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopPipe; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopRepairData; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionArgument; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UnloadModel; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ViewFieldDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowDefinition; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ZeroOrMoreQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ZeroOrOneQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.sql.util.AstUtil; import org.apache.iotdb.db.queryengine.plan.relational.sql.util.QueryUtil; import org.apache.iotdb.db.queryengine.plan.relational.type.AuthorRType; @@ -315,29 +315,29 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_END; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_START; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets.Type.CUBE; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets.Type.EXPLICIT; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets.Type.ROLLUP; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_OMIT_EMPTY; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_SHOW_EMPTY; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_WITH_UNMATCHED; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ProcessingMode.Mode.FINAL; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ProcessingMode.Mode.RUNNING; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName.mapIdentifier; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.skipPastLastRow; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.skipToFirst; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.skipToLast; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.skipToNextRow; import static org.apache.iotdb.db.queryengine.plan.execution.config.TableConfigTaskVisitor.DATABASE_NOT_SPECIFIED; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.SERVICE_MANAGEMENT_NOT_SUPPORTED; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.parseDateTimeFormat; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.parseIdentifier; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.parseNodeString; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.parseStringLiteral; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_END; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_START; import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn.constructAsofJoinOn; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_OMIT_EMPTY; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_SHOW_EMPTY; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_WITH_UNMATCHED; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.skipPastLastRow; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.skipToFirst; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.skipToLast; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SkipTo.skipToNextRow; 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.table; import static org.apache.iotdb.db.utils.TimestampPrecisionUtils.currPrecision; 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 index 9d4a66a1cf912..a6c933efedc7b 100644 --- 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 @@ -29,13 +29,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Select; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.StatementAnalyzerFactory; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountStatement; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowExternalService; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowQueriesStatement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java index 762200bf1a31b..714bcdccc5c25 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java @@ -22,22 +22,34 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Except; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Intersect; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Select; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionArgument; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionInvocation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionTableArgument; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Union; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter; import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinOn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinUsing; @@ -45,6 +57,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Strings; +import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Iterator; import java.util.List; @@ -52,15 +65,32 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; +import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.joining; import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter.formatOrderBy; +import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.RowPatternFormatter.formatPattern; public class CommonQuerySqlFormatter implements CommonQueryAstVisitor { - protected final SqlFormatter.SqlBuilder builder; + protected static final String INDENT = " "; + protected final SqlBuilder builder; public CommonQuerySqlFormatter(StringBuilder builder) { - this.builder = new SqlFormatter.SqlBuilder(builder); + this.builder = new SqlBuilder(builder); + } + + protected static String formatName(Identifier identifier) { + return ExpressionFormatter.formatExpression(identifier); + } + + public static String formatName(QualifiedName name) { + return name.getOriginalParts().stream() + .map(CommonQuerySqlFormatter::formatName) + .collect(joining(".")); + } + + protected static String formatExpression(Expression expression) { + return ExpressionFormatter.formatExpression(expression); } @Override @@ -71,7 +101,7 @@ public Void visitNode(Node node, Integer indent) { @Override public Void visitExpression(Expression node, Integer indent) { checkArgument(indent == 0, "visitExpression should only be called at root"); - builder.append(SqlFormatter.formatExpression(node)); + builder.append(formatExpression(node)); return null; } @@ -88,7 +118,7 @@ public Void visitQuery(Query node, Integer indent) { Iterator queries = with.getQueries().iterator(); while (queries.hasNext()) { WithQuery query = queries.next(); - append(indent, SqlFormatter.formatName(query.getName())); + append(indent, formatName(query.getName())); query .getColumnNames() .ifPresent(columnNames -> appendAliasColumns(builder, columnNames)); @@ -113,7 +143,7 @@ public Void visitFill(Fill node, Integer indent) { append(indent, "FILL METHOD ").append(node.getFillMethod().name()); if (node.getFillMethod() == FillPolicy.CONSTANT) { - builder.append(SqlFormatter.formatExpression(node.getFillValue().get())); + builder.append(formatExpression(node.getFillValue().get())); } else if (node.getFillMethod() == FillPolicy.LINEAR) { node.getTimeColumnIndex() .ifPresent(index -> builder.append(" TIME_COLUMN ").append(String.valueOf(index))); @@ -124,7 +154,7 @@ public Void visitFill(Fill node, Integer indent) { .append(" FILL_GROUP ") .append( elements.stream() - .map(SqlFormatter::formatExpression) + .map(CommonQuerySqlFormatter::formatExpression) .collect(joining(", ")))); } else if (node.getFillMethod() == FillPolicy.PREVIOUS) { node.getTimeBound() @@ -138,7 +168,7 @@ public Void visitFill(Fill node, Integer indent) { .append(" FILL_GROUP ") .append( elements.stream() - .map(SqlFormatter::formatExpression) + .map(CommonQuerySqlFormatter::formatExpression) .collect(joining(", ")))); } else { throw new IllegalArgumentException("Unknown fill method: " + node.getFillMethod()); @@ -154,29 +184,26 @@ public Void visitOrderBy(OrderBy node, Integer indent) { @Override public Void visitOffset(Offset node, Integer indent) { - append(indent, "OFFSET ") - .append(SqlFormatter.formatExpression(node.getRowCount())) - .append(" ROWS\n"); + append(indent, "OFFSET ").append(formatExpression(node.getRowCount())).append(" ROWS\n"); return null; } @Override public Void visitLimit(Limit node, Integer indent) { - append(indent, "LIMIT ").append(SqlFormatter.formatExpression(node.getRowCount())).append('\n'); + append(indent, "LIMIT ").append(formatExpression(node.getRowCount())).append('\n'); return null; } @Override public Void visitSingleColumn(SingleColumn node, Integer indent) { - builder.append(SqlFormatter.formatExpression(node.getExpression())); - node.getAlias().ifPresent(alias -> builder.append(' ').append(SqlFormatter.formatName(alias))); + builder.append(formatExpression(node.getExpression())); + node.getAlias().ifPresent(alias -> builder.append(' ').append(formatName(alias))); return null; } @Override public Void visitAllColumns(AllColumns node, Integer indent) { - node.getTarget() - .ifPresent(value -> builder.append(SqlFormatter.formatExpression(value)).append(".")); + node.getTarget().ifPresent(value -> builder.append(formatExpression(value)).append(".")); builder.append("*"); if (!node.getAliases().isEmpty()) { @@ -186,7 +213,7 @@ public Void visitAllColumns(AllColumns node, Integer indent) { Joiner.on(", ") .join( node.getAliases().stream() - .map(SqlFormatter::formatName) + .map(CommonQuerySqlFormatter::formatName) .collect(toImmutableList()))) .append(")"); } @@ -222,7 +249,7 @@ public Void visitJoin(Join node, Integer indent) { builder.append(" USING (").append(Joiner.on(", ").join(using.getColumns())).append(")"); } else if (criteria instanceof JoinOn) { JoinOn on = (JoinOn) criteria; - builder.append(" ON ").append(SqlFormatter.formatExpression(on.getExpression())); + builder.append(" ON ").append(formatExpression(on.getExpression())); } else if (!(criteria instanceof NaturalJoin)) { throw new UnsupportedOperationException("unknown join criteria: " + criteria); } @@ -239,7 +266,7 @@ public Void visitJoin(Join node, Integer indent) { public Void visitAliasedRelation(AliasedRelation node, Integer indent) { processRelationSuffix(node.getRelation(), indent); - builder.append(' ').append(SqlFormatter.formatName(node.getAlias())); + builder.append(' ').append(formatName(node.getAlias())); appendAliasColumns(builder, node.getColumnNames()); return null; @@ -252,7 +279,7 @@ public Void visitValues(Values node, Integer indent) { boolean first = true; for (Expression row : node.getRows()) { builder.append("\n").append(indentString(indent)).append(first ? " " : ", "); - builder.append(SqlFormatter.formatExpression(row)); + builder.append(formatExpression(row)); first = false; } builder.append('\n'); @@ -316,12 +343,12 @@ protected String formatSimpleTableRelationName(Relation relation) { throw new UnsupportedOperationException("unsupported relation: " + relation); } - protected SqlFormatter.SqlBuilder append(int indent, String value) { + protected SqlBuilder append(int indent, String value) { return builder.append(indentString(indent)).append(value); } protected static String indentString(int indent) { - return Strings.repeat(SqlFormatter.INDENT, indent); + return Strings.repeat(INDENT, indent); } protected void formatDefinitionList(List elements, int indent) { @@ -336,11 +363,226 @@ protected void formatDefinitionList(List elements, int indent) { } } - protected void appendAliasColumns(SqlFormatter.SqlBuilder builder, List columns) { + protected void appendAliasColumns(SqlBuilder builder, List columns) { if ((columns != null) && !columns.isEmpty()) { String formattedColumns = - columns.stream().map(SqlFormatter::formatName).collect(joining(", ")); + columns.stream().map(CommonQuerySqlFormatter::formatName).collect(joining(", ")); builder.append(" (").append(formattedColumns).append(')'); } } + + @Override + public Void visitRowPattern(RowPattern node, Integer indent) { + checkArgument(indent == 0, "visitRowPattern should only be called at root"); + builder.append(formatPattern(node)); + return null; + } + + @Override + public Void visitQuerySpecification(QuerySpecification node, Integer indent) { + process(node.getSelect(), indent); + + node.getFrom() + .ifPresent( + from -> { + append(indent, "FROM"); + builder.append('\n'); + append(indent, " "); + process(from, indent); + }); + + builder.append('\n'); + + node.getWhere() + .ifPresent(where -> append(indent, "WHERE " + formatExpression(where)).append('\n')); + + node.getGroupBy() + .ifPresent( + groupBy -> + append( + indent, + "GROUP BY " + + (groupBy.isDistinct() ? " DISTINCT " : "") + + org.apache.iotdb.db.node_commons.plan.relational.sql.util + .ExpressionFormatter.formatGroupBy(groupBy.getGroupingElements())) + .append('\n')); + + node.getHaving() + .ifPresent(having -> append(indent, "HAVING " + formatExpression(having)).append('\n')); + + node.getOrderBy().ifPresent(orderBy -> process(orderBy, indent)); + node.getOffset().ifPresent(offset -> process(offset, indent)); + node.getLimit().ifPresent(limit -> process(limit, indent)); + return null; + } + + @Override + public Void visitSelect(Select node, Integer indent) { + append(indent, "SELECT"); + if (node.isDistinct()) { + builder.append(" DISTINCT"); + } + + if (node.getSelectItems().size() > 1) { + boolean first = true; + for (org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem item : + node.getSelectItems()) { + builder.append("\n").append(indentString(indent)).append(first ? " " : ", "); + process(item, indent); + first = false; + } + } else { + builder.append(' '); + process(com.google.common.collect.Iterables.getOnlyElement(node.getSelectItems()), indent); + } + + builder.append('\n'); + + return null; + } + + @Override + public Void visitTable(Table node, Integer indent) { + builder.append(formatName(node.getName())); + return null; + } + + @Override + public Void visitUnion(Union node, Integer indent) { + Iterator relations = node.getRelations().iterator(); + + while (relations.hasNext()) { + processRelation(relations.next(), indent); + + if (relations.hasNext()) { + builder.append("UNION "); + if (!node.isDistinct()) { + builder.append("ALL "); + } + } + } + + return null; + } + + @Override + public Void visitExcept(Except node, Integer indent) { + processRelation(node.getLeft(), indent); + + builder.append("EXCEPT "); + if (!node.isDistinct()) { + builder.append("ALL "); + } + + processRelation(node.getRight(), indent); + + return null; + } + + @Override + public Void visitIntersect(Intersect node, Integer indent) { + Iterator relations = node.getRelations().iterator(); + + while (relations.hasNext()) { + processRelation(relations.next(), indent); + + if (relations.hasNext()) { + builder.append("INTERSECT "); + if (!node.isDistinct()) { + builder.append("ALL "); + } + } + } + + return null; + } + + @Override + public Void visitTableFunctionInvocation(TableFunctionInvocation node, Integer indent) { + append(indent, "TABLE("); + appendTableFunctionInvocation(node, indent + 1); + builder.append(")"); + return null; + } + + @Override + public Void visitTableArgument(TableFunctionTableArgument node, Integer indent) { + Relation relation = node.getTable(); + Node unaliased = + relation instanceof AliasedRelation ? ((AliasedRelation) relation).getRelation() : relation; + if (unaliased instanceof TableSubquery) { + unaliased = ((TableSubquery) unaliased).getQuery(); + } + builder.append("TABLE("); + process(unaliased, indent); + builder.append(")"); + if (relation instanceof AliasedRelation) { + AliasedRelation aliasedRelation = (AliasedRelation) relation; + builder.append(" AS ").append(formatName(aliasedRelation.getAlias())); + appendAliasColumns(builder, aliasedRelation.getColumnNames()); + } + if (node.getPartitionBy().isPresent()) { + builder.append("\n"); + append(indent, "PARTITION BY ") + .append( + node.getPartitionBy().get().stream() + .map(CommonQuerySqlFormatter::formatExpression) + .collect(joining(", "))); + } + node.getOrderBy() + .ifPresent( + orderBy -> { + builder.append("\n"); + append(indent, formatOrderBy(orderBy)); + }); + + return null; + } + + private void appendTableFunctionInvocation(TableFunctionInvocation node, Integer indent) { + builder.append(formatName(node.getName())).append("(\n"); + appendTableFunctionArguments(node.getArguments(), indent + 1); + builder.append(")"); + } + + private void appendTableFunctionArguments(List arguments, int indent) { + for (int i = 0; i < arguments.size(); i++) { + TableFunctionArgument argument = arguments.get(i); + if (argument.getName().isPresent()) { + append(indent, formatName(argument.getName().get())); + builder.append(" => "); + } else { + append(indent, ""); + } + Node value = argument.getValue(); + if (value instanceof Expression) { + builder.append(formatExpression((Expression) value)); + } else { + process(value, indent + 1); + } + if (i < arguments.size() - 1) { + builder.append(",\n"); + } + } + } + + protected static class SqlBuilder { + private final StringBuilder builder; + + public SqlBuilder(StringBuilder builder) { + this.builder = requireNonNull(builder, "builder is null"); + } + + @CanIgnoreReturnValue + public SqlBuilder append(CharSequence value) { + builder.append(value); + return this; + } + + @CanIgnoreReturnValue + public SqlBuilder append(char c) { + builder.append(c); + return this; + } + } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java index a57b5893510d5..0ac347699f1b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java @@ -19,12 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; @@ -47,20 +46,14 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropSubscription; 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.Except; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExplainAnalyze; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Intersect; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RelationalAuthorStatement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameTable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetColumnComment; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetProperties; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetTableComment; @@ -80,277 +73,27 @@ 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.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionArgument; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Union; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Update; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; import com.google.common.base.Joiner; -import java.util.Iterator; import java.util.List; import java.util.Objects; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkState; import static java.util.stream.Collectors.joining; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter.formatOrderBy; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.RowPatternFormatter.formatPattern; -public class DataNodeSqlFormatter extends CommonQuerySqlFormatter +public final class DataNodeSqlFormatter extends CommonQuerySqlFormatter implements AstVisitor { - public DataNodeSqlFormatter(StringBuilder builder) { - super(builder); - } - - @Override - public Void visitRowPattern(RowPattern node, Integer indent) { - checkArgument(indent == 0, "visitRowPattern should only be called at root"); - builder.append(formatPattern(node)); - return null; - } - - @Override - public Void visitQuerySpecification(QuerySpecification node, Integer indent) { - process(node.getSelect(), indent); - - node.getFrom() - .ifPresent( - from -> { - append(indent, "FROM"); - builder.append('\n'); - append(indent, " "); - process(from, indent); - }); - - builder.append('\n'); - - node.getWhere() - .ifPresent( - where -> append(indent, "WHERE " + SqlFormatter.formatExpression(where)).append('\n')); - - node.getGroupBy() - .ifPresent( - groupBy -> - append( - indent, - "GROUP BY " - + (groupBy.isDistinct() ? " DISTINCT " : "") - + org.apache.iotdb.db.node_commons.plan.relational.sql.util - .ExpressionFormatter.formatGroupBy(groupBy.getGroupingElements())) - .append('\n')); - - node.getHaving() - .ifPresent( - having -> - append(indent, "HAVING " + SqlFormatter.formatExpression(having)).append('\n')); - - node.getOrderBy().ifPresent(orderBy -> process(orderBy, indent)); - node.getOffset().ifPresent(offset -> process(offset, indent)); - node.getLimit().ifPresent(limit -> process(limit, indent)); - return null; - } - - @Override - public Void visitSelect(Select node, Integer indent) { - append(indent, "SELECT"); - if (node.isDistinct()) { - builder.append(" DISTINCT"); - } - - if (node.getSelectItems().size() > 1) { - boolean first = true; - for (org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem item : - node.getSelectItems()) { - builder.append("\n").append(indentString(indent)).append(first ? " " : ", "); - process(item, indent); - first = false; - } - } else { - builder.append(' '); - process(com.google.common.collect.Iterables.getOnlyElement(node.getSelectItems()), indent); - } - - builder.append('\n'); - - return null; - } - - @Override - public Void visitTable(Table node, Integer indent) { - builder.append(SqlFormatter.formatName(node.getName())); - return null; - } - - @Override - public Void visitPatternRecognitionRelation(PatternRecognitionRelation node, Integer indent) { - processRelationSuffix(node.getInput(), indent); - - builder.append(" MATCH_RECOGNIZE (\n"); - if (!node.getPartitionBy().isEmpty()) { - append(indent + 1, "PARTITION BY ") - .append( - node.getPartitionBy().stream() - .map( - org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter - ::formatExpression) - .collect(joining(", "))) - .append("\n"); - } - if (node.getOrderBy().isPresent()) { - process(node.getOrderBy().get(), indent + 1); - } - if (!node.getMeasures().isEmpty()) { - append(indent + 1, "MEASURES"); - formatDefinitionList( - node.getMeasures().stream() - .map( - measure -> - SqlFormatter.formatExpression(measure.getExpression()) - + " AS " - + SqlFormatter.formatExpression(measure.getName())) - .collect(com.google.common.collect.ImmutableList.toImmutableList()), - indent + 2); - } - if (node.getRowsPerMatch().isPresent()) { - String rowsPerMatch; - switch (node.getRowsPerMatch().get()) { - case ONE: - rowsPerMatch = "ONE ROW PER MATCH"; - break; - case ALL_SHOW_EMPTY: - rowsPerMatch = "ALL ROWS PER MATCH SHOW EMPTY MATCHES"; - break; - case ALL_OMIT_EMPTY: - rowsPerMatch = "ALL ROWS PER MATCH OMIT EMPTY MATCHES"; - break; - case ALL_WITH_UNMATCHED: - rowsPerMatch = "ALL ROWS PER MATCH WITH UNMATCHED ROWS"; - break; - default: - throw new IllegalStateException( - "unexpected rowsPerMatch: " + node.getRowsPerMatch().get()); - } - append(indent + 1, rowsPerMatch).append("\n"); - } - if (node.getAfterMatchSkipTo().isPresent()) { - String skipTo; - switch (node.getAfterMatchSkipTo().get().getPosition()) { - case PAST_LAST: - skipTo = "AFTER MATCH SKIP PAST LAST ROW"; - break; - case NEXT: - skipTo = "AFTER MATCH SKIP TO NEXT ROW"; - break; - case LAST: - checkState( - node.getAfterMatchSkipTo().get().getIdentifier().isPresent(), - "missing identifier in AFTER MATCH SKIP TO LAST"); - skipTo = - "AFTER MATCH SKIP TO LAST " - + SqlFormatter.formatExpression( - node.getAfterMatchSkipTo().get().getIdentifier().get()); - break; - case FIRST: - checkState( - node.getAfterMatchSkipTo().get().getIdentifier().isPresent(), - "missing identifier in AFTER MATCH SKIP TO FIRST"); - skipTo = - "AFTER MATCH SKIP TO FIRST " - + SqlFormatter.formatExpression( - node.getAfterMatchSkipTo().get().getIdentifier().get()); - break; - default: - throw new IllegalStateException("unexpected skipTo: " + node.getAfterMatchSkipTo().get()); - } - append(indent + 1, skipTo).append("\n"); - } - append(indent + 1, "PATTERN (").append(formatPattern(node.getPattern())).append(")\n"); - if (!node.getSubsets().isEmpty()) { - append(indent + 1, "SUBSET"); - formatDefinitionList( - node.getSubsets().stream() - .map( - subset -> - SqlFormatter.formatExpression(subset.getName()) - + " = " - + subset.getIdentifiers().stream() - .map( - org.apache.iotdb.db.node_commons.plan.relational.sql.util - .ExpressionFormatter - ::formatExpression) - .collect(joining(", ", "(", ")"))) - .collect(com.google.common.collect.ImmutableList.toImmutableList()), - indent + 2); - } - append(indent + 1, "DEFINE"); - formatDefinitionList( - node.getVariableDefinitions().stream() - .map( - variable -> - SqlFormatter.formatExpression(variable.getName()) - + " AS " - + SqlFormatter.formatExpression(variable.getExpression())) - .collect(com.google.common.collect.ImmutableList.toImmutableList()), - indent + 2); - - builder.append(")"); - - return null; - } - - @Override - public Void visitUnion(Union node, Integer indent) { - Iterator relations = node.getRelations().iterator(); - - while (relations.hasNext()) { - processRelation(relations.next(), indent); - - if (relations.hasNext()) { - builder.append("UNION "); - if (!node.isDistinct()) { - builder.append("ALL "); - } - } - } - - return null; - } - - @Override - public Void visitExcept(Except node, Integer indent) { - processRelation(node.getLeft(), indent); - - builder.append("EXCEPT "); - if (!node.isDistinct()) { - builder.append("ALL "); - } - - processRelation(node.getRight(), indent); - - return null; + public static String formatDataNodeSql(Node root) { + StringBuilder builder = new StringBuilder(); + new DataNodeSqlFormatter(builder).process(root, 0); + return builder.toString(); } - @Override - public Void visitIntersect(Intersect node, Integer indent) { - Iterator relations = node.getRelations().iterator(); - - while (relations.hasNext()) { - processRelation(relations.next(), indent); - - if (relations.hasNext()) { - builder.append("INTERSECT "); - if (!node.isDistinct()) { - builder.append("ALL "); - } - } - } - - return null; + private DataNodeSqlFormatter(StringBuilder builder) { + super(builder); } @Override @@ -401,7 +144,8 @@ public Void visitShowTables(ShowTables node, Integer indent) { builder.append(" DETAILS"); } - node.getDbName().ifPresent(db -> builder.append(" FROM ").append(SqlFormatter.formatName(db))); + node.getDbName() + .ifPresent(db -> builder.append(" FROM ").append(CommonQuerySqlFormatter.formatName(db))); return null; } @@ -456,9 +200,13 @@ public Void visitShowCurrentTimestamp(ShowCurrentTimestamp node, Integer context @Override public Void visitDelete(Delete node, Integer indent) { - builder.append("DELETE FROM ").append(SqlFormatter.formatName(node.getTable().getName())); + builder + .append("DELETE FROM ") + .append(CommonQuerySqlFormatter.formatName(node.getTable().getName())); node.getWhere() - .ifPresent(where -> builder.append(" WHERE ").append(SqlFormatter.formatExpression(where))); + .ifPresent( + where -> + builder.append(" WHERE ").append(CommonQuerySqlFormatter.formatExpression(where))); return null; } @@ -490,7 +238,7 @@ public Void visitDropDB(DropDB node, Integer indent) { if (node.isExists()) { builder.append("IF EXISTS "); } - builder.append(SqlFormatter.formatName(node.getDbName())); + builder.append(CommonQuerySqlFormatter.formatName(node.getDbName())); return null; } @@ -500,7 +248,7 @@ public Void visitCreateTable(CreateTable node, Integer indent) { if (node.isIfNotExists()) { builder.append("IF NOT EXISTS "); } - String tableName = SqlFormatter.formatName(node.getName()); + String tableName = CommonQuerySqlFormatter.formatName(node.getName()); builder.append(tableName).append(" (\n"); String elementIndent = indentString(indent + 1); @@ -534,7 +282,7 @@ public Void visitCreateView(CreateView node, Integer indent) { builder.append("OR REPLACE "); } builder.append("VIEW "); - String tableName = SqlFormatter.formatName(node.getName()); + String tableName = CommonQuerySqlFormatter.formatName(node.getName()); builder.append(tableName).append(" (\n"); String elementIndent = indentString(indent + 1); @@ -572,7 +320,7 @@ public Void visitDropTable(DropTable node, Integer indent) { if (node.isExists()) { builder.append("IF EXISTS "); } - builder.append(SqlFormatter.formatName(node.getTableName())); + builder.append(CommonQuerySqlFormatter.formatName(node.getTableName())); return null; } @@ -586,9 +334,9 @@ public Void visitRenameTable(RenameTable node, Integer indent) { } builder - .append(SqlFormatter.formatName(node.getSource())) + .append(CommonQuerySqlFormatter.formatName(node.getSource())) .append(" RENAME TO ") - .append(SqlFormatter.formatName(node.getTarget())); + .append(CommonQuerySqlFormatter.formatName(node.getTarget())); return null; } @@ -610,7 +358,7 @@ public Void visitSetProperties(SetProperties node, Integer context) { } builder - .append(SqlFormatter.formatName(node.getName())) + .append(CommonQuerySqlFormatter.formatName(node.getName())) .append(" SET PROPERTIES ") .append(joinProperties(node.getProperties())); @@ -625,15 +373,15 @@ public Void visitRenameColumn(RenameColumn node, Integer indent) { builder.append("IF EXISTS "); } - builder.append(SqlFormatter.formatName(node.getTable())).append("RENAME COLUMN "); + builder.append(CommonQuerySqlFormatter.formatName(node.getTable())).append("RENAME COLUMN "); if (node.columnIfExists()) { builder.append("IF EXISTS "); } builder - .append(SqlFormatter.formatName(node.getSource())) + .append(CommonQuerySqlFormatter.formatName(node.getSource())) .append(" TO ") - .append(SqlFormatter.formatName(node.getTarget())); + .append(CommonQuerySqlFormatter.formatName(node.getTarget())); return null; } @@ -646,12 +394,12 @@ public Void visitDropColumn(DropColumn node, Integer indent) { builder.append("IF EXISTS "); } - builder.append(SqlFormatter.formatName(node.getTable())).append("DROP COLUMN "); + builder.append(CommonQuerySqlFormatter.formatName(node.getTable())).append("DROP COLUMN "); if (node.columnIfExists()) { builder.append("IF EXISTS "); } - builder.append(SqlFormatter.formatName(node.getField())); + builder.append(CommonQuerySqlFormatter.formatName(node.getField())); return null; } @@ -664,7 +412,7 @@ public Void visitAddColumn(AddColumn node, Integer indent) { builder.append("IF EXISTS "); } - builder.append(SqlFormatter.formatName(node.getTableName())).append("ADD COLUMN "); + builder.append(CommonQuerySqlFormatter.formatName(node.getTableName())).append("ADD COLUMN "); if (node.columnIfNotExists()) { builder.append("IF NOT EXISTS "); } @@ -679,7 +427,7 @@ public Void visitSetTableComment(SetTableComment node, Integer indent) { builder .append("COMMENT ON") .append(node.isView() ? " VIEW " : " TABLE ") - .append(SqlFormatter.formatName(node.getTableName())) + .append(CommonQuerySqlFormatter.formatName(node.getTableName())) .append(" IS ") .append(node.getComment()); @@ -690,9 +438,9 @@ public Void visitSetTableComment(SetTableComment node, Integer indent) { public Void visitSetColumnComment(SetColumnComment node, Integer indent) { builder .append("COMMENT ON COLUMN ") - .append(SqlFormatter.formatName(node.getTable())) + .append(CommonQuerySqlFormatter.formatName(node.getTable())) .append(".") - .append(SqlFormatter.formatName(node.getField())) + .append(CommonQuerySqlFormatter.formatName(node.getField())) .append(" IS ") .append(node.getComment()); return null; @@ -700,7 +448,7 @@ public Void visitSetColumnComment(SetColumnComment node, Integer indent) { @Override public Void visitInsert(Insert node, Integer indent) { - builder.append("INSERT INTO ").append(SqlFormatter.formatName(node.getTarget())); + builder.append("INSERT INTO ").append(CommonQuerySqlFormatter.formatName(node.getTarget())); node.getColumns() .ifPresent( @@ -717,7 +465,7 @@ public Void visitInsert(Insert node, Integer indent) { public Void visitUpdate(Update node, Integer indent) { builder .append("UPDATE ") - .append(SqlFormatter.formatName(node.getTable().getName())) + .append(CommonQuerySqlFormatter.formatName(node.getTable().getName())) .append(" SET"); int setCounter = node.getAssignments().size() - 1; for (UpdateAssignment assignment : node.getAssignments()) { @@ -726,7 +474,7 @@ public Void visitUpdate(Update node, Integer indent) { .append(indentString(indent + 1)) .append(((Identifier) assignment.getName()).getValue()) .append(" = ") - .append(SqlFormatter.formatExpression(assignment.getValue())); + .append(CommonQuerySqlFormatter.formatExpression(assignment.getValue())); if (setCounter > 0) { builder.append(","); } @@ -739,7 +487,7 @@ public Void visitUpdate(Update node, Integer indent) { .append("\n") .append(indentString(indent)) .append("WHERE ") - .append(SqlFormatter.formatExpression(where))); + .append(CommonQuerySqlFormatter.formatExpression(where))); return null; } @@ -1278,48 +1026,6 @@ public Void visitRelationalAuthorPlan(RelationalAuthorStatement node, Integer co return null; } - @Override - public Void visitTableFunctionInvocation(TableFunctionInvocation node, Integer indent) { - append(indent, "TABLE("); - appendTableFunctionInvocation(node, indent + 1); - builder.append(")"); - return null; - } - - @Override - public Void visitTableArgument(TableFunctionTableArgument node, Integer indent) { - Relation relation = node.getTable(); - Node unaliased = - relation instanceof AliasedRelation ? ((AliasedRelation) relation).getRelation() : relation; - if (unaliased instanceof TableSubquery) { - unaliased = ((TableSubquery) unaliased).getQuery(); - } - builder.append("TABLE("); - process(unaliased, indent); - builder.append(")"); - if (relation instanceof AliasedRelation) { - AliasedRelation aliasedRelation = (AliasedRelation) relation; - builder.append(" AS ").append(SqlFormatter.formatName(aliasedRelation.getAlias())); - appendAliasColumns(builder, aliasedRelation.getColumnNames()); - } - if (node.getPartitionBy().isPresent()) { - builder.append("\n"); - append(indent, "PARTITION BY ") - .append( - node.getPartitionBy().get().stream() - .map(SqlFormatter::formatExpression) - .collect(joining(", "))); - } - node.getOrderBy() - .ifPresent( - orderBy -> { - builder.append("\n"); - append(indent, formatOrderBy(orderBy)); - }); - - return null; - } - @Override protected boolean needsParenthesesForRelationSuffix(Relation relation) { return super.needsParenthesesForRelationSuffix(relation) @@ -1333,7 +1039,7 @@ protected boolean isSimpleTableRelation(Relation relation) { @Override protected String formatSimpleTableRelationName(Relation relation) { - return SqlFormatter.formatName(((Table) relation).getName()); + return CommonQuerySqlFormatter.formatName(((Table) relation).getName()); } private String formatPropertiesMultiLine(List properties) { @@ -1345,12 +1051,13 @@ private String formatPropertiesMultiLine(List properties) { properties.stream() .map( element -> - SqlFormatter.INDENT - + SqlFormatter.formatName(element.getName()) + CommonQuerySqlFormatter.INDENT + + CommonQuerySqlFormatter.formatName(element.getName()) + " = " + (element.isSetToDefault() ? "DEFAULT" - : SqlFormatter.formatExpression(element.getNonDefaultValue()))) + : CommonQuerySqlFormatter.formatExpression( + element.getNonDefaultValue()))) .collect(joining(",\n")); return "\nWITH (\n" + propertyList + "\n)"; @@ -1359,7 +1066,7 @@ private String formatPropertiesMultiLine(List properties) { private String formatColumnDefinition(ColumnDefinition column) { StringBuilder stringBuilder = new StringBuilder() - .append(SqlFormatter.formatName(column.getName())) + .append(CommonQuerySqlFormatter.formatName(column.getName())) .append(" ") .append(column.getType()) .append(" ") @@ -1377,38 +1084,11 @@ private String joinProperties(List properties) { return properties.stream() .map( element -> - SqlFormatter.formatName(element.getName()) + CommonQuerySqlFormatter.formatName(element.getName()) + " = " + (element.isSetToDefault() ? "DEFAULT" - : SqlFormatter.formatExpression(element.getNonDefaultValue()))) + : CommonQuerySqlFormatter.formatExpression(element.getNonDefaultValue()))) .collect(joining(", ")); } - - private void appendTableFunctionInvocation(TableFunctionInvocation node, Integer indent) { - builder.append(SqlFormatter.formatName(node.getName())).append("(\n"); - appendTableFunctionArguments(node.getArguments(), indent + 1); - builder.append(")"); - } - - private void appendTableFunctionArguments(List arguments, int indent) { - for (int i = 0; i < arguments.size(); i++) { - TableFunctionArgument argument = arguments.get(i); - if (argument.getName().isPresent()) { - append(indent, SqlFormatter.formatName(argument.getName().get())); - builder.append(" => "); - } else { - append(indent, ""); - } - Node value = argument.getValue(); - if (value instanceof Expression) { - builder.append(SqlFormatter.formatExpression((Expression) value)); - } else { - process(value, indent + 1); - } - if (i < arguments.size() - 1) { - builder.append(",\n"); - } - } - } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java index fd65156ff1eb7..14edc4027babe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java @@ -35,18 +35,18 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Select; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Select; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowDefinition; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowDefinition; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java index 525808014381a..c25057d15a0ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java @@ -19,22 +19,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AnchorPattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.EmptyPattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExcludedPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OneOrMoreQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternAlternation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternConcatenation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternPermutation; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternVariable; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedPattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrMoreQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrOneQuantifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AnchorPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.EmptyPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.OneOrMoreQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternAlternation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternConcatenation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternPermutation; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PatternVariable; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ZeroOrMoreQuantifier; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ZeroOrOneQuantifier; import static java.util.stream.Collectors.joining; @@ -45,7 +45,7 @@ public static String formatPattern(RowPattern pattern) { return new Formatter().process(pattern, null); } - public static class Formatter implements AstVisitor { + public static class Formatter implements CommonQueryAstVisitor { @Override public String visitNode(Node node, Void context) { throw new UnsupportedOperationException(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java deleted file mode 100644 index 69bfe239750dd..0000000000000 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/SqlFormatter.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * 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.util; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter; - -import com.google.errorprone.annotations.CanIgnoreReturnValue; - -import static java.util.Objects.requireNonNull; -import static java.util.stream.Collectors.joining; - -public final class SqlFormatter { - - protected static final String INDENT = " "; - - private SqlFormatter() {} - - public static String formatSql(Node root) { - StringBuilder builder = new StringBuilder(); - new DataNodeSqlFormatter(builder).process(root, 0); - return builder.toString(); - } - - static String formatName(Identifier identifier) { - return ExpressionFormatter.formatExpression(identifier); - } - - public static String formatName(QualifiedName name) { - return name.getOriginalParts().stream().map(SqlFormatter::formatName).collect(joining(".")); - } - - static String formatExpression(Expression expression) { - return ExpressionFormatter.formatExpression(expression); - } - - protected static class SqlBuilder { - private final StringBuilder builder; - - public SqlBuilder(StringBuilder builder) { - this.builder = requireNonNull(builder, "builder is null"); - } - - @CanIgnoreReturnValue - public SqlBuilder append(CharSequence value) { - builder.append(value); - return this; - } - - @CanIgnoreReturnValue - public SqlBuilder append(char c) { - builder.append(c); - return this; - } - } -} From 5f7ac0c5abe8e6bd95d57c434a3f1b861bb3581c Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Thu, 16 Apr 2026 17:07:09 +0800 Subject: [PATCH 26/45] fix --- .../sql/util/CommonQuerySqlFormatter.java | 119 ++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java index 714bcdccc5c25..32aa0616fdf33 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java @@ -33,6 +33,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; @@ -63,6 +64,7 @@ import java.util.List; import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; @@ -585,4 +587,121 @@ public SqlBuilder append(char c) { return this; } } + + @Override + public Void visitPatternRecognitionRelation(PatternRecognitionRelation node, Integer indent) { + processRelationSuffix(node.getInput(), indent); + + builder.append(" MATCH_RECOGNIZE (\n"); + if (!node.getPartitionBy().isEmpty()) { + append(indent + 1, "PARTITION BY ") + .append( + node.getPartitionBy().stream() + .map( + org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter + ::formatExpression) + .collect(joining(", "))) + .append("\n"); + } + if (node.getOrderBy().isPresent()) { + process(node.getOrderBy().get(), indent + 1); + } + if (!node.getMeasures().isEmpty()) { + append(indent + 1, "MEASURES"); + formatDefinitionList( + node.getMeasures().stream() + .map( + measure -> + formatExpression(measure.getExpression()) + + " AS " + + formatExpression(measure.getName())) + .collect(com.google.common.collect.ImmutableList.toImmutableList()), + indent + 2); + } + if (node.getRowsPerMatch().isPresent()) { + String rowsPerMatch; + switch (node.getRowsPerMatch().get()) { + case ONE: + rowsPerMatch = "ONE ROW PER MATCH"; + break; + case ALL_SHOW_EMPTY: + rowsPerMatch = "ALL ROWS PER MATCH SHOW EMPTY MATCHES"; + break; + case ALL_OMIT_EMPTY: + rowsPerMatch = "ALL ROWS PER MATCH OMIT EMPTY MATCHES"; + break; + case ALL_WITH_UNMATCHED: + rowsPerMatch = "ALL ROWS PER MATCH WITH UNMATCHED ROWS"; + break; + default: + throw new IllegalStateException( + "unexpected rowsPerMatch: " + node.getRowsPerMatch().get()); + } + append(indent + 1, rowsPerMatch).append("\n"); + } + if (node.getAfterMatchSkipTo().isPresent()) { + String skipTo; + switch (node.getAfterMatchSkipTo().get().getPosition()) { + case PAST_LAST: + skipTo = "AFTER MATCH SKIP PAST LAST ROW"; + break; + case NEXT: + skipTo = "AFTER MATCH SKIP TO NEXT ROW"; + break; + case LAST: + checkState( + node.getAfterMatchSkipTo().get().getIdentifier().isPresent(), + "missing identifier in AFTER MATCH SKIP TO LAST"); + skipTo = + "AFTER MATCH SKIP TO LAST " + + formatExpression( + node.getAfterMatchSkipTo().get().getIdentifier().get()); + break; + case FIRST: + checkState( + node.getAfterMatchSkipTo().get().getIdentifier().isPresent(), + "missing identifier in AFTER MATCH SKIP TO FIRST"); + skipTo = + "AFTER MATCH SKIP TO FIRST " + + formatExpression( + node.getAfterMatchSkipTo().get().getIdentifier().get()); + break; + default: + throw new IllegalStateException("unexpected skipTo: " + node.getAfterMatchSkipTo().get()); + } + append(indent + 1, skipTo).append("\n"); + } + append(indent + 1, "PATTERN (").append(formatPattern(node.getPattern())).append(")\n"); + if (!node.getSubsets().isEmpty()) { + append(indent + 1, "SUBSET"); + formatDefinitionList( + node.getSubsets().stream() + .map( + subset -> + formatExpression(subset.getName()) + + " = " + + subset.getIdentifiers().stream() + .map( + org.apache.iotdb.db.node_commons.plan.relational.sql.util + .ExpressionFormatter + ::formatExpression) + .collect(joining(", ", "(", ")"))) + .collect(com.google.common.collect.ImmutableList.toImmutableList()), + indent + 2); + } + append(indent + 1, "DEFINE"); + formatDefinitionList( + node.getVariableDefinitions().stream() + .map( + variable -> + formatExpression(variable.getName()) + + " AS " + + formatExpression(variable.getExpression())) + .collect(com.google.common.collect.ImmutableList.toImmutableList()), + indent + 2); + + builder.append(")"); + + return null; + } } From 8f9dc14f825c7f67cc3655bf970524914e8b2bfe Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Thu, 16 Apr 2026 17:49:44 +0800 Subject: [PATCH 27/45] move ReservedIdentifiers --- .../plan/relational/sql/ast/JoinOn.java | 7 +- .../plan/relational/sql/ast/JoinUsing.java | 7 +- .../plan/relational/sql/ast/NaturalJoin.java | 5 +- .../sql/parser/CaseInsensitiveStream.java | 2 +- .../sql/util/CommonQuerySqlFormatter.java | 27 +++--- .../sql/util/ExpressionFormatter.java | 5 +- .../sql/util/ReservedIdentifiers.java | 84 +++++++++++++++++++ .../sql/util/RowPatternFormatter.java | 3 +- ...formationSchemaContentSupplierFactory.java | 2 +- .../analyzer/ExpressionAnalyzer.java | 2 +- .../analyzer/StatementAnalyzer.java | 6 +- .../relational/planner/RelationPlanner.java | 4 +- .../plan/relational/sql/ast/AsofJoinOn.java | 1 + .../sql/ast/DefaultTraversalVisitor.java | 1 + .../sql/ast/StackableAstVisitor.java | 6 +- .../relational/sql/parser/AstBuilder.java | 6 +- .../plan/relational/sql/parser/SqlParser.java | 1 + .../sql/util/DataNodeSqlFormatter.java | 1 + .../sql/util/ReservedIdentifiers.java | 49 ----------- 19 files changed, 120 insertions(+), 99 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/JoinOn.java (86%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/JoinUsing.java (85%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/ast/NaturalJoin.java (88%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/parser/CaseInsensitiveStream.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/util/CommonQuerySqlFormatter.java (95%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ReservedIdentifiers.java rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/sql/util/RowPatternFormatter.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons => queryengine}/plan/relational/sql/ast/StackableAstVisitor.java (90%) delete mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinOn.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinOn.java index 0da1a8f5137ed..8e1100ceabf9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinOn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinOn.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinUsing.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinUsing.java index f455c04359c96..bfa78f32ab90c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/JoinUsing.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinUsing.java @@ -17,12 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NaturalJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NaturalJoin.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NaturalJoin.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NaturalJoin.java index 46551a913d6fc..efe1bfde4ed77 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/NaturalJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NaturalJoin.java @@ -17,10 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/CaseInsensitiveStream.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/parser/CaseInsensitiveStream.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/CaseInsensitiveStream.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/parser/CaseInsensitiveStream.java index ff7185d08686a..774e761f6265e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/CaseInsensitiveStream.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/parser/CaseInsensitiveStream.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; +package org.apache.iotdb.db.node_commons.plan.relational.sql.parser; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.IntStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/CommonQuerySqlFormatter.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/CommonQuerySqlFormatter.java index 32aa0616fdf33..fa2a9542f9720 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/CommonQuerySqlFormatter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +package org.apache.iotdb.db.node_commons.plan.relational.sql.util; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; @@ -29,7 +29,10 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Intersect; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinUsing; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NaturalJoin; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; @@ -50,11 +53,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Union; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; -import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter; import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; -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.NaturalJoin; import com.google.common.base.Joiner; import com.google.common.base.Strings; @@ -70,7 +69,7 @@ import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.joining; import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter.formatOrderBy; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.RowPatternFormatter.formatPattern; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.RowPatternFormatter.formatPattern; public class CommonQuerySqlFormatter implements CommonQueryAstVisitor { @@ -654,8 +653,7 @@ public Void visitPatternRecognitionRelation(PatternRecognitionRelation node, Int "missing identifier in AFTER MATCH SKIP TO LAST"); skipTo = "AFTER MATCH SKIP TO LAST " - + formatExpression( - node.getAfterMatchSkipTo().get().getIdentifier().get()); + + formatExpression(node.getAfterMatchSkipTo().get().getIdentifier().get()); break; case FIRST: checkState( @@ -663,8 +661,7 @@ public Void visitPatternRecognitionRelation(PatternRecognitionRelation node, Int "missing identifier in AFTER MATCH SKIP TO FIRST"); skipTo = "AFTER MATCH SKIP TO FIRST " - + formatExpression( - node.getAfterMatchSkipTo().get().getIdentifier().get()); + + formatExpression(node.getAfterMatchSkipTo().get().getIdentifier().get()); break; default: throw new IllegalStateException("unexpected skipTo: " + node.getAfterMatchSkipTo().get()); @@ -681,11 +678,11 @@ public Void visitPatternRecognitionRelation(PatternRecognitionRelation node, Int formatExpression(subset.getName()) + " = " + subset.getIdentifiers().stream() - .map( - org.apache.iotdb.db.node_commons.plan.relational.sql.util - .ExpressionFormatter - ::formatExpression) - .collect(joining(", ", "(", ")"))) + .map( + org.apache.iotdb.db.node_commons.plan.relational.sql.util + .ExpressionFormatter + ::formatExpression) + .collect(joining(", ", "(", ")"))) .collect(com.google.common.collect.ImmutableList.toImmutableList()), indent + 2); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java index f710a18325408..513eca0f70b7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java @@ -82,7 +82,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowReference; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; -import org.apache.iotdb.db.queryengine.plan.relational.sql.util.CommonQuerySqlFormatter; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; @@ -100,8 +99,8 @@ import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.CommonQuerySqlFormatter.formatName; -import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.ReservedIdentifiers.reserved; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.CommonQuerySqlFormatter.formatName; +import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.ReservedIdentifiers.reserved; public final class ExpressionFormatter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ReservedIdentifiers.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ReservedIdentifiers.java new file mode 100644 index 0000000000000..032bac80769f9 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ReservedIdentifiers.java @@ -0,0 +1,84 @@ +/* + * 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.node_commons.plan.relational.sql.util; + +import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.CaseInsensitiveStream; +import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlLexer; +import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlParser; + +import org.antlr.v4.runtime.ANTLRErrorListener; +import org.antlr.v4.runtime.BaseErrorListener; +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.CommonTokenStream; +import org.antlr.v4.runtime.RecognitionException; +import org.antlr.v4.runtime.Recognizer; +import org.antlr.v4.runtime.Token; + +import java.util.Set; + +import static com.google.common.collect.ImmutableSet.toImmutableSet; +import static org.apache.iotdb.db.relational.grammar.sql.RelationalSqlKeywords.sqlKeywords; + +public final class ReservedIdentifiers { + + private static final ANTLRErrorListener ERROR_LISTENER = + new BaseErrorListener() { + @Override + public void syntaxError( + Recognizer recognizer, + Object offendingSymbol, + int line, + int charPositionInLine, + String message, + RecognitionException e) { + throw new ParsingException(message, e, line, charPositionInLine + 1); + } + }; + + private ReservedIdentifiers() {} + + public static Set reservedIdentifiers() { + return sqlKeywords().stream() + .filter(ReservedIdentifiers::reserved) + .sorted() + .collect(toImmutableSet()); + } + + public static boolean reserved(final String name) { + try { + RelationalSqlLexer lexer = + new RelationalSqlLexer(new CaseInsensitiveStream(CharStreams.fromString(name))); + CommonTokenStream tokenStream = new CommonTokenStream(lexer); + RelationalSqlParser parser = new RelationalSqlParser(tokenStream); + + lexer.removeErrorListeners(); + lexer.addErrorListener(ERROR_LISTENER); + + parser.removeErrorListeners(); + parser.addErrorListener(ERROR_LISTENER); + + parser.identifier(); + return parser.getCurrentToken().getType() != Token.EOF; + } catch (final ParsingException ignored) { + return true; + } + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/RowPatternFormatter.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/RowPatternFormatter.java index c25057d15a0ca..e74c5e03e08ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/RowPatternFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/RowPatternFormatter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +package org.apache.iotdb.db.node_commons.plan.relational.sql.util; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AnchorPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; @@ -34,7 +34,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrMoreQuantifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrOneQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter; import static java.util.stream.Collectors.joining; 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 index 789887544573a..288c686a4e6d7 100644 --- 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 @@ -72,6 +72,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ReservedIdentifiers; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; @@ -86,7 +87,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableDiskUsageInformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.relational.sql.util.ReservedIdentifiers; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlKeywords; import org.apache.iotdb.db.schemaengine.table.InformationSchemaUtils; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 039fcbbf6dd1c..e32f3764e4f39 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -78,7 +78,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StackableAstVisitor; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubsetDefinition; @@ -102,6 +101,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; +import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StackableAstVisitor; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index 258407ee5b83c..41e833cba640f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -61,12 +61,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinUsing; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.MeasureDefinition; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NaturalJoin; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; @@ -171,10 +174,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRow; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertTablet; -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.LoadTsFile; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RenameColumn; 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 1dd87458570ed..c82bead621c74 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 @@ -61,6 +61,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Intersect; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinUsing; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.MeasureDefinition; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; @@ -125,8 +127,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRow; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertTablet; -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.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java index 0669aa2361e8f..8cd5249d1ea66 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinOn; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java index 8a57ff1d024aa..cb6d62a644d59 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java @@ -43,6 +43,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinOn; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StackableAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StackableAstVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java index 53a5671ee0923..503eb4ff54778 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StackableAstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import java.util.LinkedList; import java.util.Optional; @@ -31,7 +31,7 @@ public class StackableAstVisitor public R process(Node node, StackableAstVisitorContext context) { context.push(node); try { - return node.accept(this, context); + return AstVisitor.super.process(node, context); } finally { context.pop(); } 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 99d193f79ebe5..953357f3aeda2 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 @@ -77,12 +77,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinUsing; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.MeasureDefinition; +import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NaturalJoin; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; @@ -189,14 +192,11 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Flush; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; -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.LoadConfiguration; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadModel; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.MigrateRegion; -import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NaturalJoin; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Prepare; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Property; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ReconstructRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java index bf13ae1e8711e..494bcb092ae6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.CaseInsensitiveStream; import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlBaseListener; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java index 0ac347699f1b8..11eb8cceb6c17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.db.node_commons.plan.relational.sql.util.CommonQuerySqlFormatter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java deleted file mode 100644 index 4e9108aacbe21..0000000000000 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/ReservedIdentifiers.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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.util; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; -import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; - -import java.time.ZoneId; -import java.util.Set; - -import static com.google.common.collect.ImmutableSet.toImmutableSet; -import static org.apache.iotdb.db.relational.grammar.sql.RelationalSqlKeywords.sqlKeywords; - -public final class ReservedIdentifiers { - private static final SqlParser PARSER = new SqlParser(); - - public static Set reservedIdentifiers() { - return sqlKeywords().stream() - .filter(ReservedIdentifiers::reserved) - .sorted() - .collect(toImmutableSet()); - } - - public static boolean reserved(final String name) { - try { - return !(PARSER.createExpression(name, ZoneId.systemDefault()) instanceof Identifier); - } catch (final ParsingException ignored) { - return true; - } - } -} From cfa5b7dc3cb9e5c2812d29a53a3ee56d99cc4835 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Thu, 16 Apr 2026 18:56:54 +0800 Subject: [PATCH 28/45] delete some methods --- .../relational/ColumnTransformerBuilder.java | 10 +--------- .../plan/planner/TableOperatorGenerator.java | 14 ++++++++------ .../planner/DataNodeTableOperatorGenerator.java | 16 ++++++++++------ .../plan/relational/sql/ast/DeleteDevice.java | 4 ++-- .../impl/SchemaRegionMemoryImpl.java | 8 ++++---- .../sink/SinkOperatorDownStreamNodeIdTest.java | 5 ++--- 6 files changed, 27 insertions(+), 30 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java index af96c98faf8a1..3349bffd332b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java @@ -194,13 +194,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.ScalarFunction; - import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.common.regexp.LikePattern; import org.apache.tsfile.enums.TSDataType; @@ -216,8 +214,6 @@ import org.apache.tsfile.read.common.type.TypeEnum; import org.apache.tsfile.utils.Binary; -import javax.annotation.Nullable; - import java.time.ZoneId; import java.util.ArrayList; import java.util.Arrays; @@ -1947,8 +1943,6 @@ public static class Context { private final Metadata metadata; - private final Optional fragmentInstanceContext; - public Context( SessionInfo sessionInfo, List leafList, @@ -1959,8 +1953,7 @@ public Context( List inputDataTypes, int originSize, TypeProvider typeProvider, - Metadata metadata, - @Nullable FragmentInstanceContext fragmentInstanceContext) { + Metadata metadata) { this.sessionInfo = sessionInfo; this.leafList = leafList; this.inputLocations = inputLocations; @@ -1971,7 +1964,6 @@ public Context( this.originSize = originSize; this.typeProvider = typeProvider; this.metadata = metadata; - this.fragmentInstanceContext = Optional.ofNullable(fragmentInstanceContext); } public Type getType(SymbolReference symbolReference) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 62f664c88fb37..0893351a3270b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -236,7 +236,7 @@ import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; /** This Visitor is responsible for transferring Table PlanNode Tree to Table Operator Tree. */ -public class TableOperatorGenerator +public abstract class TableOperatorGenerator implements ICoreQueryPlanVisitor { protected final Metadata metadata; @@ -333,8 +333,8 @@ protected Operator constructFilterAndProjectOperator( ImmutableList.of(), 0, context.getTypeProvider(), - metadata, - fragmentInstanceContext); + metadata + ); return visitor.process(p, filterColumnTransformerContext); }) @@ -361,8 +361,8 @@ protected Operator constructFilterAndProjectOperator( filterOutputDataTypes, inputLocations.size(), context.getTypeProvider(), - metadata, - fragmentInstanceContext); + metadata + ); for (Expression expression : projectExpressions) { projectOutputTransformerList.add( @@ -855,7 +855,7 @@ public Operator visitSort(SortNode node, LocalExecutionPlanContext context) { context.getTypeProvider()); String filePrefix = - IoTDBDescriptor.getInstance().getConfig().getSortTmpDir() + getSortTmpDir() + File.separator + operatorContext.getDriverContext().getFragmentInstanceContext().getId().getFullId() + File.separator @@ -876,6 +876,8 @@ public Operator visitSort(SortNode node, LocalExecutionPlanContext context) { node.getOrderingScheme().getOrderingList(), sortItemIndexList, sortItemDataTypeList)); } + protected abstract String getSortTmpDir(); + @Override public Operator visitTopK(TopKNode node, LocalExecutionPlanContext context) { OperatorContext operatorContext = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 22a25c948f2af..5cd788833f3aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -14,6 +14,8 @@ package org.apache.iotdb.db.queryengine.plan.planner; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; @@ -34,6 +36,7 @@ import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; @@ -126,9 +129,6 @@ import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; import org.apache.iotdb.db.utils.TimestampPrecisionUtils; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import org.apache.tsfile.common.conf.TSFileDescriptor; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.IDeviceID; @@ -151,7 +151,6 @@ import org.apache.tsfile.write.schema.MeasurementSchema; import javax.validation.constraints.NotNull; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -203,6 +202,11 @@ public DataNodeTableOperatorGenerator(Metadata metadata) { super(metadata); } + @Override + protected String getSortTmpDir() { + return IoTDBDescriptor.getInstance().getConfig().getSortTmpDir(); + } + @Override public Operator visitCteScan(CteScanNode node, LocalExecutionPlanContext context) { OperatorContext operatorContext = @@ -1260,8 +1264,8 @@ public Operator visitTableDeviceQueryCount( ImmutableList.of(), 0, context.getTypeProvider(), - metadata, - fragmentInstanceContext)), + metadata + )), columnSchemaList, database, table) 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 87657581d704c..a942571f66bb3 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 @@ -233,8 +233,8 @@ public static DeviceBlackListConstructor constructDevicePredicateUpdater( ImmutableList.of(), 0, mockTypeProvider, - metadata, - null)) + metadata + )) : null; return new DeviceBlackListConstructor( 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 25d65f513a535..63b81714271e1 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 @@ -1573,8 +1573,8 @@ private DeviceAttributeUpdater constructDevicePredicateUpdater( ImmutableList.of(), 0, mockTypeProvider, - metadata, - null)) + metadata + )) : null; final List filterOutputDataTypes = @@ -1601,8 +1601,8 @@ private DeviceAttributeUpdater constructDevicePredicateUpdater( filterOutputDataTypes, inputLocations.size(), mockTypeProvider, - metadata, - null); + metadata + ); final List attributeNames = updateNode.getAssignments().stream() diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java index aded96866ca5a..57fa76fb2d275 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java @@ -22,7 +22,6 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -33,6 +32,7 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.queryengine.plan.planner.DataNodeTableOperatorGenerator; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; @@ -40,7 +40,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.mpp.rpc.thrift.TFragmentInstanceId; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -97,7 +96,7 @@ public void testSingleDownStreamNodeIdInTable() throws Exception { LocalExecutionPlanContext context = createLocalExecutionPlanContext( new TypeProvider(), "query_name_sink_operator_downstream_id_1", 10001); - TableOperatorGenerator tableOperatorGenerator = new TableOperatorGenerator(metadata); + DataNodeTableOperatorGenerator tableOperatorGenerator = new DataNodeTableOperatorGenerator(metadata); Mockito.when(mockedPlanNode.accept(tableOperatorGenerator, context)) .thenReturn(Mockito.mock(Operator.class)); From bd3b343636bd3b7128b35487af2702d80877e151 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Fri, 17 Apr 2026 10:25:21 +0800 Subject: [PATCH 29/45] add abstract methods --- .../relational/ColumnTransformerBuilder.java | 1 + .../plan/planner/TableOperatorGenerator.java | 47 +++++-------------- .../DataNodeTableOperatorGenerator.java | 42 +++++++++-------- .../plan/relational/sql/ast/DeleteDevice.java | 3 +- .../impl/SchemaRegionMemoryImpl.java | 6 +-- .../SinkOperatorDownStreamNodeIdTest.java | 4 +- 6 files changed, 41 insertions(+), 62 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java index 3349bffd332b4..55d115c66c18e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java @@ -199,6 +199,7 @@ import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.ScalarFunction; + import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.common.regexp.LikePattern; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 0893351a3270b..87e4266c04ed8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -103,8 +103,8 @@ import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToTimestampLiteralVisitor; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -160,7 +160,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; @@ -185,7 +184,6 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import java.io.File; import java.util.AbstractMap; import java.util.ArrayList; import java.util.Collections; @@ -316,15 +314,14 @@ protected Operator constructFilterAndProjectOperator( ColumnTransformerBuilder visitor = new ColumnTransformerBuilder(); - FragmentInstanceContext fragmentInstanceContext = - context.getDriverContext().getFragmentInstanceContext(); + SessionInfo sessionInfo = getSessionInfo(context); ColumnTransformer filterOutputTransformer = predicate .map( p -> { ColumnTransformerBuilder.Context filterColumnTransformerContext = new ColumnTransformerBuilder.Context( - fragmentInstanceContext.getSessionInfo(), + sessionInfo, filterLeafColumnTransformerList, inputLocations, filterExpressionColumnTransformerMap, @@ -333,8 +330,7 @@ protected Operator constructFilterAndProjectOperator( ImmutableList.of(), 0, context.getTypeProvider(), - metadata - ); + metadata); return visitor.process(p, filterColumnTransformerContext); }) @@ -352,7 +348,7 @@ protected Operator constructFilterAndProjectOperator( ColumnTransformerBuilder.Context projectColumnTransformerContext = new ColumnTransformerBuilder.Context( - fragmentInstanceContext.getSessionInfo(), + sessionInfo, projectLeafColumnTransformerList, inputLocations, projectExpressionColumnTransformerMap, @@ -361,8 +357,7 @@ protected Operator constructFilterAndProjectOperator( filterOutputDataTypes, inputLocations.size(), context.getTypeProvider(), - metadata - ); + metadata); for (Expression expression : projectExpressions) { projectOutputTransformerList.add( @@ -854,29 +849,18 @@ public Operator visitSort(SortNode node, LocalExecutionPlanContext context) { sortItemDataTypeList, context.getTypeProvider()); - String filePrefix = - getSortTmpDir() - + File.separator - + operatorContext.getDriverContext().getFragmentInstanceContext().getId().getFullId() - + File.separator - + operatorContext.getDriverContext().getPipelineId() - + File.separator; - - context.getDriverContext().setHaveTmpFile(true); - context.getDriverContext().getFragmentInstanceContext().setMayHaveTmpFile(true); - Operator child = node.getChild().accept(this, context); return new TableSortOperator( operatorContext, child, dataTypes, - filePrefix, + getSortTmpDir(operatorContext), getComparatorForTable( node.getOrderingScheme().getOrderingList(), sortItemIndexList, sortItemDataTypeList)); } - protected abstract String getSortTmpDir(); + protected abstract String getSortTmpDir(OperatorContext operatorContext); @Override public Operator visitTopK(TopKNode node, LocalExecutionPlanContext context) { @@ -965,24 +949,13 @@ public Operator visitStreamSort(StreamSortNode node, LocalExecutionPlanContext c sortItemDataTypeList, context.getTypeProvider()); - String filePrefix = - IoTDBDescriptor.getInstance().getConfig().getSortTmpDir() - + File.separator - + operatorContext.getDriverContext().getFragmentInstanceContext().getId().getFullId() - + File.separator - + operatorContext.getDriverContext().getPipelineId() - + File.separator; - - context.getDriverContext().setHaveTmpFile(true); - context.getDriverContext().getFragmentInstanceContext().setMayHaveTmpFile(true); - Operator child = node.getChild().accept(this, context); return new TableStreamSortOperator( operatorContext, child, dataTypes, - filePrefix, + getSortTmpDir(operatorContext), getComparatorForTable( node.getOrderingScheme().getOrderingList(), sortItemIndexList, sortItemDataTypeList), getComparatorForTable( @@ -2464,4 +2437,6 @@ public Operator visitTopKRanking(TopKRankingNode node, LocalExecutionPlanContext 1000, Optional.empty()); } + + protected abstract SessionInfo getSessionInfo(LocalExecutionPlanContext context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 5cd788833f3aa..5d33c25483827 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -14,8 +14,6 @@ package org.apache.iotdb.db.queryengine.plan.planner; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; @@ -38,6 +36,7 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -58,7 +57,6 @@ import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ShuffleSinkHandle; import org.apache.iotdb.db.queryengine.execution.exchange.source.ISourceHandle; -import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.queryengine.execution.operator.EmptyDataOperator; import org.apache.iotdb.db.queryengine.execution.operator.ExplainAnalyzeOperator; @@ -129,6 +127,9 @@ import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; import org.apache.iotdb.db.utils.TimestampPrecisionUtils; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import org.apache.tsfile.common.conf.TSFileDescriptor; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.IDeviceID; @@ -151,6 +152,8 @@ import org.apache.tsfile.write.schema.MeasurementSchema; import javax.validation.constraints.NotNull; + +import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -203,8 +206,15 @@ public DataNodeTableOperatorGenerator(Metadata metadata) { } @Override - protected String getSortTmpDir() { - return IoTDBDescriptor.getInstance().getConfig().getSortTmpDir(); + protected String getSortTmpDir(OperatorContext operatorContext) { + operatorContext.getDriverContext().setHaveTmpFile(true); + operatorContext.getDriverContext().getFragmentInstanceContext().setMayHaveTmpFile(true); + return IoTDBDescriptor.getInstance().getConfig().getSortTmpDir() + + File.separator + + operatorContext.getDriverContext().getFragmentInstanceContext().getId().getFullId() + + File.separator + + operatorContext.getDriverContext().getPipelineId() + + File.separator; } @Override @@ -1143,15 +1153,7 @@ public Operator visitInformationSchemaTableScan( return new InformationSchemaTableScanOperator( operatorContext, node.getPlanNodeId(), - getSupplier( - operatorContext, - dataTypes, - context - .getDriverContext() - .getFragmentInstanceContext() - .getSessionInfo() - .getUserEntity(), - node)); + getSupplier(operatorContext, dataTypes, getSessionInfo(context).getUserEntity(), node)); } @Override @@ -1232,8 +1234,6 @@ public Operator visitTableDeviceQueryCount( // In "count" we have to reuse filter operator per "next" final List filterLeafColumnTransformerList = new ArrayList<>(); - FragmentInstanceContext fragmentInstanceContext = - context.getDriverContext().getFragmentInstanceContext(); return new SchemaCountOperator<>( node.getPlanNodeId(), context @@ -1255,7 +1255,7 @@ public Operator visitTableDeviceQueryCount( .process( node.getTagFuzzyPredicate(), new ColumnTransformerBuilder.Context( - fragmentInstanceContext.getSessionInfo(), + getSessionInfo(context), filterLeafColumnTransformerList, makeLayout(Collections.singletonList(node)), new HashMap<>(), @@ -1264,8 +1264,7 @@ public Operator visitTableDeviceQueryCount( ImmutableList.of(), 0, context.getTypeProvider(), - metadata - )), + metadata)), columnSchemaList, database, table) @@ -2122,4 +2121,9 @@ private OptimizeType canUseLastCacheOptimize( return OptimizeType.NOOP; } + + @Override + protected SessionInfo getSessionInfo(LocalExecutionPlanContext context) { + return context.getDriverContext().getFragmentInstanceContext().getSessionInfo(); + } } 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 a942571f66bb3..1707f4d7acc97 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 @@ -233,8 +233,7 @@ public static DeviceBlackListConstructor constructDevicePredicateUpdater( ImmutableList.of(), 0, mockTypeProvider, - metadata - )) + metadata)) : null; return new DeviceBlackListConstructor( 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 63b81714271e1..3c081f21903ed 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 @@ -1573,8 +1573,7 @@ private DeviceAttributeUpdater constructDevicePredicateUpdater( ImmutableList.of(), 0, mockTypeProvider, - metadata - )) + metadata)) : null; final List filterOutputDataTypes = @@ -1601,8 +1600,7 @@ private DeviceAttributeUpdater constructDevicePredicateUpdater( filterOutputDataTypes, inputLocations.size(), mockTypeProvider, - metadata - ); + metadata); final List attributeNames = updateNode.getAssignments().stream() diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java index 57fa76fb2d275..81ec8fa58fb0b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java @@ -40,6 +40,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.mpp.rpc.thrift.TFragmentInstanceId; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -96,7 +97,8 @@ public void testSingleDownStreamNodeIdInTable() throws Exception { LocalExecutionPlanContext context = createLocalExecutionPlanContext( new TypeProvider(), "query_name_sink_operator_downstream_id_1", 10001); - DataNodeTableOperatorGenerator tableOperatorGenerator = new DataNodeTableOperatorGenerator(metadata); + DataNodeTableOperatorGenerator tableOperatorGenerator = + new DataNodeTableOperatorGenerator(metadata); Mockito.when(mockedPlanNode.accept(tableOperatorGenerator, context)) .thenReturn(Mockito.mock(Operator.class)); From e78fb691dc7acb56330740a32ad2e721e18508ee Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Fri, 17 Apr 2026 10:46:38 +0800 Subject: [PATCH 30/45] add ITableOperatorGeneratorContext --- .../ITableOperatorGeneratorContext.java | 30 ++ .../plan/planner/TableOperatorGenerator.java | 401 ++++++------------ .../DataNodeTableOperatorGenerator.java | 128 ++---- .../planner/LocalExecutionPlanContext.java | 3 +- 4 files changed, 188 insertions(+), 374 deletions(-) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java new file mode 100644 index 0000000000000..0948e39cb6ad8 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java @@ -0,0 +1,30 @@ +/* + * 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.calc_commons.plan.planner; + +import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; + +import java.time.ZoneId; + +public interface ITableOperatorGeneratorContext { + TypeProvider getTypeProvider(); + + ZoneId getZoneId(); +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 87e4266c04ed8..59da75bfe1bab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -161,7 +161,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; -import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.relational.TableFunction; @@ -234,8 +233,8 @@ import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; /** This Visitor is responsible for transferring Table PlanNode Tree to Table Operator Tree. */ -public abstract class TableOperatorGenerator - implements ICoreQueryPlanVisitor { +public abstract class TableOperatorGenerator + implements ICoreQueryPlanVisitor { protected final Metadata metadata; @@ -244,7 +243,7 @@ public TableOperatorGenerator(Metadata metadata) { } @Override - public Operator visitPlan(PlanNode node, LocalExecutionPlanContext context) { + public Operator visitPlan(PlanNode node, C context) { throw new UnsupportedOperationException("should call the concrete visitXX() method"); } @@ -278,7 +277,7 @@ protected ImmutableMap makeLayoutFromOutputSymbols(List } @Override - public Operator visitFilter(FilterNode node, LocalExecutionPlanContext context) { + public Operator visitFilter(FilterNode node, C context) { TypeProvider typeProvider = context.getTypeProvider(); Optional predicate = Optional.of(node.getPredicate()); Operator inputOperator = node.getChild().accept(this, context); @@ -302,7 +301,7 @@ protected Operator constructFilterAndProjectOperator( List inputDataTypes, Map> inputLocations, PlanNodeId planNodeId, - LocalExecutionPlanContext context) { + C context) { final List filterOutputDataTypes = new ArrayList<>(inputDataTypes); @@ -365,12 +364,7 @@ protected Operator constructFilterAndProjectOperator( } final OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - planNodeId, - FilterAndProjectOperator.class.getSimpleName()); + addOperatorContext(context, planNodeId, FilterAndProjectOperator.class.getSimpleName()); // Project expressions don't contain Non-Mappable UDF, TransformOperator is not needed return new FilterAndProjectOperator( @@ -387,7 +381,7 @@ protected Operator constructFilterAndProjectOperator( } @Override - public Operator visitProject(ProjectNode node, LocalExecutionPlanContext context) { + public Operator visitProject(ProjectNode node, C context) { TypeProvider typeProvider = context.getTypeProvider(); Optional predicate; Operator inputOperator; @@ -426,7 +420,7 @@ private List getInputColumnTypes(PlanNode node, TypeProvider typePro } @Override - public Operator visitGapFill(GapFillNode node, LocalExecutionPlanContext context) { + public Operator visitGapFill(GapFillNode node, C context) { Operator child = node.getChild().accept(this, context); List inputDataTypes = getOutputColumnTypes(node.getChild(), context.getTypeProvider()); @@ -434,12 +428,8 @@ public Operator visitGapFill(GapFillNode node, LocalExecutionPlanContext context if (node.getGapFillGroupingKeys().isEmpty()) { // without group keys if (node.getMonthDuration() == 0) { // without month interval OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - GapFillWoGroupWoMoOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), GapFillWoGroupWoMoOperator.class.getSimpleName()); return new GapFillWoGroupWoMoOperator( operatorContext, child, @@ -450,12 +440,8 @@ public Operator visitGapFill(GapFillNode node, LocalExecutionPlanContext context node.getNonMonthDuration()); } else { // with month interval OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - GapFillWoGroupWMoOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), GapFillWoGroupWMoOperator.class.getSimpleName()); return new GapFillWoGroupWMoOperator( operatorContext, child, @@ -474,12 +460,8 @@ public Operator visitGapFill(GapFillNode node, LocalExecutionPlanContext context node.getGapFillGroupingKeys(), node, inputDataTypes, groupingKeysIndexSet); if (node.getMonthDuration() == 0) { // without month interval OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - GapFillWGroupWoMoOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), GapFillWGroupWoMoOperator.class.getSimpleName()); return new GapFillWGroupWoMoOperator( operatorContext, child, @@ -492,12 +474,8 @@ public Operator visitGapFill(GapFillNode node, LocalExecutionPlanContext context node.getNonMonthDuration()); } else { // with month interval OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - GapFillWGroupWMoOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), GapFillWGroupWMoOperator.class.getSimpleName()); return new GapFillWGroupWMoOperator( operatorContext, child, @@ -514,7 +492,7 @@ public Operator visitGapFill(GapFillNode node, LocalExecutionPlanContext context } @Override - public Operator visitPreviousFill(PreviousFillNode node, LocalExecutionPlanContext context) { + public Operator visitPreviousFill(PreviousFillNode node, C context) { Operator child = node.getChild().accept(this, context); List inputDataTypes = @@ -533,12 +511,8 @@ public Operator visitPreviousFill(PreviousFillNode node, LocalExecutionPlanConte if (node.getGroupingKeys().isPresent()) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - PreviousFillWithGroupOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), PreviousFillWithGroupOperator.class.getSimpleName()); return new PreviousFillWithGroupOperator( operatorContext, fillArray, @@ -549,12 +523,8 @@ public Operator visitPreviousFill(PreviousFillNode node, LocalExecutionPlanConte inputDataTypes); } else { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableFillOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), TableFillOperator.class.getSimpleName()); return new TableFillOperator(operatorContext, fillArray, child, helperColumnIndex); } } @@ -598,7 +568,7 @@ private int getColumnIndex(Symbol symbol, PlanNode node) { } @Override - public Operator visitLinearFill(LinearFillNode node, LocalExecutionPlanContext context) { + public Operator visitLinearFill(LinearFillNode node, C context) { Operator child = node.getChild().accept(this, context); List inputDataTypes = @@ -609,12 +579,10 @@ public Operator visitLinearFill(LinearFillNode node, LocalExecutionPlanContext c if (node.getGroupingKeys().isPresent()) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableLinearFillWithGroupOperator.class.getSimpleName()); + addOperatorContext( + context, + node.getPlanNodeId(), + TableLinearFillWithGroupOperator.class.getSimpleName()); return new TableLinearFillWithGroupOperator( operatorContext, fillArray, @@ -625,26 +593,17 @@ public Operator visitLinearFill(LinearFillNode node, LocalExecutionPlanContext c inputDataTypes); } else { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableLinearFillOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), TableLinearFillOperator.class.getSimpleName()); return new TableLinearFillOperator(operatorContext, fillArray, child, helperColumnIndex); } } @Override - public Operator visitValueFill(ValueFillNode node, LocalExecutionPlanContext context) { + public Operator visitValueFill(ValueFillNode node, C context) { Operator child = node.getChild().accept(this, context); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableFillOperator.class.getSimpleName()); + addOperatorContext(context, node.getPlanNodeId(), TableFillOperator.class.getSimpleName()); List inputDataTypes = getOutputColumnTypes(node.getChild(), context.getTypeProvider()); int inputColumnCount = inputDataTypes.size(); @@ -657,10 +616,7 @@ public Operator visitValueFill(ValueFillNode node, LocalExecutionPlanContext con } private IFill[] getValueFill( - int inputColumnCount, - List inputDataTypes, - Literal filledValue, - LocalExecutionPlanContext context) { + int inputColumnCount, List inputDataTypes, Literal filledValue, C context) { IFill[] constantFill = new IFill[inputColumnCount]; for (int i = 0; i < inputColumnCount; i++) { switch (inputDataTypes.get(i)) { @@ -747,47 +703,32 @@ private IFill[] getValueFill( } @Override - public Operator visitLimit(LimitNode node, LocalExecutionPlanContext context) { + public Operator visitLimit(LimitNode node, C context) { Operator child = node.getChild().accept(this, context); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - LimitOperator.class.getSimpleName()); + addOperatorContext(context, node.getPlanNodeId(), LimitOperator.class.getSimpleName()); return new LimitOperator(operatorContext, node.getCount(), child); } @Override - public Operator visitOffset(OffsetNode node, LocalExecutionPlanContext context) { + public Operator visitOffset(OffsetNode node, C context) { Operator child = node.getChild().accept(this, context); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - OffsetOperator.class.getSimpleName()); + addOperatorContext(context, node.getPlanNodeId(), OffsetOperator.class.getSimpleName()); return new OffsetOperator(operatorContext, node.getCount(), child); } @Override - public Operator visitOutput(OutputNode node, LocalExecutionPlanContext context) { + public Operator visitOutput(OutputNode node, C context) { return node.getChild().accept(this, context); } @Override - public Operator visitCollect(CollectNode node, LocalExecutionPlanContext context) { + public Operator visitCollect(CollectNode node, C context) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - CollectOperator.class.getSimpleName()); + addOperatorContext(context, node.getPlanNodeId(), CollectOperator.class.getSimpleName()); List children = new ArrayList<>(node.getChildren().size()); for (PlanNode child : node.getChildren()) { children.add(this.process(child, context)); @@ -796,14 +737,10 @@ public Operator visitCollect(CollectNode node, LocalExecutionPlanContext context } @Override - public Operator visitMergeSort(MergeSortNode node, LocalExecutionPlanContext context) { + public Operator visitMergeSort(MergeSortNode node, C context) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableMergeSortOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), TableMergeSortOperator.class.getSimpleName()); List children = new ArrayList<>(node.getChildren().size()); for (PlanNode child : node.getChildren()) { children.add(this.process(child, context)); @@ -829,14 +766,9 @@ public Operator visitMergeSort(MergeSortNode node, LocalExecutionPlanContext con } @Override - public Operator visitSort(SortNode node, LocalExecutionPlanContext context) { + public Operator visitSort(SortNode node, C context) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableSortOperator.class.getSimpleName()); + addOperatorContext(context, node.getPlanNodeId(), TableSortOperator.class.getSimpleName()); List dataTypes = getOutputColumnTypes(node, context.getTypeProvider()); int sortItemsCount = node.getOrderingScheme().getOrderBy().size(); @@ -862,15 +794,13 @@ public Operator visitSort(SortNode node, LocalExecutionPlanContext context) { protected abstract String getSortTmpDir(OperatorContext operatorContext); + protected abstract OperatorContext addOperatorContext( + C context, PlanNodeId planNodeId, String operatorType); + @Override - public Operator visitTopK(TopKNode node, LocalExecutionPlanContext context) { + public Operator visitTopK(TopKNode node, C context) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableTopKOperator.class.getSimpleName()); + addOperatorContext(context, node.getPlanNodeId(), TableTopKOperator.class.getSimpleName()); List children = new ArrayList<>(node.getChildren().size()); for (PlanNode child : node.getChildren()) { children.add(this.process(child, context)); @@ -929,14 +859,10 @@ protected void genSortInformation( } @Override - public Operator visitStreamSort(StreamSortNode node, LocalExecutionPlanContext context) { + public Operator visitStreamSort(StreamSortNode node, C context) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableStreamSortOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), TableStreamSortOperator.class.getSimpleName()); List dataTypes = getOutputColumnTypes(node, context.getTypeProvider()); int sortItemsCount = node.getOrderingScheme().getOrderBy().size(); @@ -968,7 +894,7 @@ public Operator visitStreamSort(StreamSortNode node, LocalExecutionPlanContext c } @Override - public Operator visitGroup(GroupNode node, LocalExecutionPlanContext context) { + public Operator visitGroup(GroupNode node, C context) { if (node.getPartitionKeyCount() == 0) { SortNode sortNode = new SortNode( @@ -988,7 +914,7 @@ public Operator visitGroup(GroupNode node, LocalExecutionPlanContext context) { } @Override - public Operator visitJoin(JoinNode node, LocalExecutionPlanContext context) { + public Operator visitJoin(JoinNode node, C context) { List dataTypes = getOutputColumnTypes(node, context.getTypeProvider()); Operator leftChild = node.getLeftChild().accept(this, context); @@ -1023,12 +949,10 @@ public Operator visitJoin(JoinNode node, LocalExecutionPlanContext context) { // cross join does not need time column if (node.isCrossJoin()) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - SimpleNestedLoopCrossJoinOperator.class.getSimpleName()); + addOperatorContext( + context, + node.getPlanNodeId(), + SimpleNestedLoopCrossJoinOperator.class.getSimpleName()); return new SimpleNestedLoopCrossJoinOperator( operatorContext, leftChild, @@ -1094,12 +1018,10 @@ public Operator visitJoin(JoinNode node, LocalExecutionPlanContext context) { if (requireNonNull(node.getJoinType()) == JoinNode.JoinType.INNER) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - AsofMergeSortInnerJoinOperator.class.getSimpleName()); + addOperatorContext( + context, + node.getPlanNodeId(), + AsofMergeSortInnerJoinOperator.class.getSimpleName()); return new AsofMergeSortInnerJoinOperator( operatorContext, leftChild, @@ -1116,12 +1038,8 @@ public Operator visitJoin(JoinNode node, LocalExecutionPlanContext context) { dataTypes); } else if (requireNonNull(node.getJoinType()) == JoinNode.JoinType.LEFT) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - AsofMergeSortLeftJoinOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), AsofMergeSortLeftJoinOperator.class.getSimpleName()); return new AsofMergeSortLeftJoinOperator( operatorContext, leftChild, @@ -1143,12 +1061,8 @@ public Operator visitJoin(JoinNode node, LocalExecutionPlanContext context) { if (requireNonNull(node.getJoinType()) == JoinNode.JoinType.INNER) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - MergeSortInnerJoinOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), MergeSortInnerJoinOperator.class.getSimpleName()); return new MergeSortInnerJoinOperator( operatorContext, leftChild, @@ -1161,12 +1075,8 @@ public Operator visitJoin(JoinNode node, LocalExecutionPlanContext context) { dataTypes); } else if (requireNonNull(node.getJoinType()) == JoinNode.JoinType.FULL) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - MergeSortFullOuterJoinOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), MergeSortFullOuterJoinOperator.class.getSimpleName()); return new MergeSortFullOuterJoinOperator( operatorContext, leftChild, @@ -1180,12 +1090,8 @@ public Operator visitJoin(JoinNode node, LocalExecutionPlanContext context) { joinKeyTypes.stream().map(this::buildUpdateLastRowFunction).collect(Collectors.toList())); } else if (requireNonNull(node.getJoinType()) == JoinNode.JoinType.LEFT) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - MergeSortLeftJoinOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), MergeSortLeftJoinOperator.class.getSimpleName()); return new MergeSortLeftJoinOperator( operatorContext, leftChild, @@ -1251,7 +1157,7 @@ protected BiFunction buildUpdateLastRowFunction(Type jo } @Override - public Operator visitSemiJoin(SemiJoinNode node, LocalExecutionPlanContext context) { + public Operator visitSemiJoin(SemiJoinNode node, C context) { List dataTypes = getOutputColumnTypes(node, context.getTypeProvider()); Operator leftChild = node.getLeftChild().accept(this, context); @@ -1287,12 +1193,8 @@ public Operator visitSemiJoin(SemiJoinNode node, LocalExecutionPlanContext conte context.getTypeProvider().getTableModelType(node.getFilteringSourceJoinSymbol())); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - MergeSortSemiJoinOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), MergeSortSemiJoinOperator.class.getSimpleName()); return new MergeSortSemiJoinOperator( operatorContext, leftChild, @@ -1315,36 +1217,27 @@ protected void checkIfJoinKeyTypeMatches(Type leftJoinKeyType, Type rightJoinKey } @Override - public Operator visitEnforceSingleRow( - EnforceSingleRowNode node, LocalExecutionPlanContext context) { + public Operator visitEnforceSingleRow(EnforceSingleRowNode node, C context) { Operator child = node.getChild().accept(this, context); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - EnforceSingleRowOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), EnforceSingleRowOperator.class.getSimpleName()); return new EnforceSingleRowOperator(operatorContext, child); } @Override - public Operator visitAssignUniqueId(AssignUniqueId node, LocalExecutionPlanContext context) { + public Operator visitAssignUniqueId(AssignUniqueId node, C context) { Operator child = node.getChild().accept(this, context); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - EnforceSingleRowOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), EnforceSingleRowOperator.class.getSimpleName()); return new AssignUniqueIdOperator(operatorContext, child); } @Override - public Operator visitAggregation(AggregationNode node, LocalExecutionPlanContext context) { + public Operator visitAggregation(AggregationNode node, C context) { Operator child = node.getChild().accept(this, context); @@ -1356,17 +1249,10 @@ public Operator visitAggregation(AggregationNode node, LocalExecutionPlanContext } private Operator planGlobalAggregation( - AggregationNode node, - Operator child, - TypeProvider typeProvider, - LocalExecutionPlanContext context) { + AggregationNode node, Operator child, TypeProvider typeProvider, C context) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - AggregationOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), AggregationOperator.class.getSimpleName()); Map aggregationMap = node.getAggregations(); ImmutableList.Builder aggregatorBuilder = new ImmutableList.Builder<>(); Map childLayout = @@ -1438,10 +1324,7 @@ protected TableAggregator buildAggregator( } protected Operator planGroupByAggregation( - AggregationNode node, - Operator child, - TypeProvider typeProvider, - LocalExecutionPlanContext context) { + AggregationNode node, Operator child, TypeProvider typeProvider, C context) { Map childLayout = makeLayoutFromOutputSymbols(node.getChild().getOutputSymbols()); @@ -1470,12 +1353,8 @@ protected Operator planGroupByAggregation( Collections.emptySet()))); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - StreamingAggregationOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), StreamingAggregationOperator.class.getSimpleName()); return new StreamingAggregationOperator( operatorContext, child, @@ -1518,12 +1397,10 @@ protected Operator planGroupByAggregation( List preGroupedChannels = preGroupedChannelsBuilder.build(); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - StreamingHashAggregationOperator.class.getSimpleName()); + addOperatorContext( + context, + node.getPlanNodeId(), + StreamingHashAggregationOperator.class.getSimpleName()); return new StreamingHashAggregationOperator( operatorContext, child, @@ -1548,12 +1425,8 @@ protected Operator planGroupByAggregation( aggregatorBuilder.add( buildGroupByAggregator(childLayout, k, v, node.getStep(), typeProvider))); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - HashAggregationOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), HashAggregationOperator.class.getSimpleName()); return new HashAggregationOperator( operatorContext, @@ -1627,8 +1500,7 @@ protected GroupedAggregator buildGroupByAggregator( } @Override - public Operator visitTableFunctionProcessor( - TableFunctionProcessorNode node, LocalExecutionPlanContext context) { + public Operator visitTableFunctionProcessor(TableFunctionProcessorNode node, C context) { TableFunction tableFunction = metadata.getTableFunction(node.getName()); TableFunctionProcessorProvider processorProvider = tableFunction.getProcessorProvider(node.getTableFunctionHandle()); @@ -1639,22 +1511,14 @@ public Operator visitTableFunctionProcessor( .map(InternalTypeManager::getTSDataType) .collect(Collectors.toList()); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableFunctionLeafOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), TableFunctionLeafOperator.class.getSimpleName()); return new TableFunctionLeafOperator(operatorContext, processorProvider, outputDataTypes); } else { Operator operator = node.getChild().accept(this, context); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableFunctionOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), TableFunctionOperator.class.getSimpleName()); List inputDataTypes = node.getChild().getOutputSymbols().stream() @@ -1732,15 +1596,10 @@ private PatternAggregator buildPatternAggregator( } @Override - public Operator visitPatternRecognition( - PatternRecognitionNode node, LocalExecutionPlanContext context) { + public Operator visitPatternRecognition(PatternRecognitionNode node, C context) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - PatternRecognitionOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), PatternRecognitionOperator.class.getSimpleName()); Operator child = node.getChild().accept(this, context); @@ -2097,15 +1956,11 @@ protected enum OptimizeType { } @Override - public Operator visitMarkDistinct(MarkDistinctNode node, LocalExecutionPlanContext context) { + public Operator visitMarkDistinct(MarkDistinctNode node, C context) { Operator child = node.getChild().accept(this, context); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - MarkDistinctOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), MarkDistinctOperator.class.getSimpleName()); TypeProvider typeProvider = context.getTypeProvider(); Map childLayout = @@ -2122,16 +1977,12 @@ public Operator visitMarkDistinct(MarkDistinctNode node, LocalExecutionPlanConte } @Override - public Operator visitWindowFunction(WindowNode node, LocalExecutionPlanContext context) { + public Operator visitWindowFunction(WindowNode node, C context) { TypeProvider typeProvider = context.getTypeProvider(); Operator child = node.getChild().accept(this, context); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableWindowOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), TableWindowOperator.class.getSimpleName()); Map childLayout = makeLayoutFromOutputSymbols(node.getChild().getOutputSymbols()); @@ -2286,18 +2137,14 @@ private WindowAggregator buildWindowAggregator( } @Override - public Operator visitUnion(UnionNode node, LocalExecutionPlanContext context) { + public Operator visitUnion(UnionNode node, C context) { List children = node.getChildren().stream() .map(child -> child.accept(this, context)) .collect(Collectors.toList()); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - MappingCollectOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), MappingCollectOperator.class.getSimpleName()); int size = children.size(); List> mappings = new ArrayList<>(size); @@ -2316,14 +2163,10 @@ public Operator visitUnion(UnionNode node, LocalExecutionPlanContext context) { } @Override - public Operator visitValuesNode(ValuesNode node, LocalExecutionPlanContext context) { + public Operator visitValuesNode(ValuesNode node, C context) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - MappingCollectOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), MappingCollectOperator.class.getSimpleName()); // Currently we only support empty values operator assert node.getRowCount() == 0; @@ -2331,15 +2174,11 @@ public Operator visitValuesNode(ValuesNode node, LocalExecutionPlanContext conte } @Override - public Operator visitRowNumber(RowNumberNode node, LocalExecutionPlanContext context) { + public Operator visitRowNumber(RowNumberNode node, C context) { Operator child = node.getChild().accept(this, context); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - MappingCollectOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), MappingCollectOperator.class.getSimpleName()); List partitionBySymbols = node.getPartitionBy(); Map childLayout = @@ -2372,15 +2211,11 @@ public Operator visitRowNumber(RowNumberNode node, LocalExecutionPlanContext con } @Override - public Operator visitTopKRanking(TopKRankingNode node, LocalExecutionPlanContext context) { + public Operator visitTopKRanking(TopKRankingNode node, C context) { Operator child = node.getChild().accept(this, context); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - MappingCollectOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), MappingCollectOperator.class.getSimpleName()); List partitionBySymbols = node.getSpecification().getPartitionBy(); Map childLayout = @@ -2438,5 +2273,5 @@ public Operator visitTopKRanking(TopKRankingNode node, LocalExecutionPlanContext Optional.empty()); } - protected abstract SessionInfo getSessionInfo(LocalExecutionPlanContext context); + protected abstract SessionInfo getSessionInfo(C context); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 5d33c25483827..48ba79cb92233 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -38,6 +38,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; @@ -195,7 +196,8 @@ import static org.apache.iotdb.db.utils.constant.SqlConstant.SUM; import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; -public class DataNodeTableOperatorGenerator extends TableOperatorGenerator +public class DataNodeTableOperatorGenerator + extends TableOperatorGenerator implements PlanVisitor { private static final MPPDataExchangeManager MPP_DATA_EXCHANGE_MANAGER = @@ -217,15 +219,18 @@ protected String getSortTmpDir(OperatorContext operatorContext) { + File.separator; } + @Override + protected OperatorContext addOperatorContext( + LocalExecutionPlanContext context, PlanNodeId planNodeId, String operatorType) { + return context + .getDriverContext() + .addOperatorContext(context.getNextOperatorId(), planNodeId, operatorType); + } + @Override public Operator visitCteScan(CteScanNode node, LocalExecutionPlanContext context) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - CteScanOperator.class.getSimpleName()); + addOperatorContext(context, node.getPlanNodeId(), CteScanOperator.class.getSimpleName()); return new CteScanOperator( operatorContext, node.getPlanNodeId(), @@ -237,12 +242,8 @@ public Operator visitCteScan(CteScanNode node, LocalExecutionPlanContext context public Operator visitIdentitySink(IdentitySinkNode node, LocalExecutionPlanContext context) { context.addExchangeSumNum(1); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - IdentitySinkOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), IdentitySinkOperator.class.getSimpleName()); String downStreamPlanNodeId = node.getDownStreamChannelLocationList().stream() .map(DownStreamChannelLocation::getRemotePlanNodeId) @@ -280,12 +281,7 @@ public Operator visitIdentitySink(IdentitySinkNode node, LocalExecutionPlanConte @Override public Operator visitTableExchange(ExchangeNode node, LocalExecutionPlanContext context) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - ExchangeOperator.class.getSimpleName()); + addOperatorContext(context, node.getPlanNodeId(), ExchangeOperator.class.getSimpleName()); FragmentInstanceId localInstanceId = context.getInstanceContext().getId(); FragmentInstanceId remoteInstanceId = node.getUpstreamInstanceId(); @@ -377,12 +373,8 @@ public Operator visitTreeNonAlignedDeviceViewScan( // can be obtained, so an empty result set is returned. if (!containsFieldColumn || node.getDeviceEntries().isEmpty()) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - EmptyDataOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), EmptyDataOperator.class.getSimpleName()); return new EmptyDataOperator(operatorContext); } String treePrefixPath = DataNodeTreeViewSchemaUtils.getPrefixPath(tsTable); @@ -447,10 +439,7 @@ public Operator visitTreeNonAlignedDeviceViewScan( boolean isSingleColumn = measurementSchemas.size() == 1; - OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext(context.getNextOperatorId(), node.getPlanNodeId(), className); + OperatorContext operatorContext = addOperatorContext(context, node.getPlanNodeId(), className); Set allSensors = new HashSet<>(measurementColumnNames); @@ -1037,10 +1026,7 @@ private void addSource( seriesScanOptions.setTTLForTableView(viewTTL); seriesScanOptions.setIsTableViewForTreeModel(node instanceof TreeDeviceViewScanNode); - OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext(context.getNextOperatorId(), node.getPlanNodeId(), className); + OperatorContext operatorContext = addOperatorContext(context, node.getPlanNodeId(), className); int maxTsBlockLineNum = TSFileDescriptor.getInstance().getConfig().getMaxTsBlockLineNumber(); if (context.getTypeProvider().getTemplatedInfo() != null) { @@ -1085,12 +1071,8 @@ public Operator visitTreeDeviceViewScan( TreeDeviceViewScanNode node, LocalExecutionPlanContext context) { if (node.getDeviceEntries().isEmpty() || node.getTreeDBName() == null) { OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - EmptyDataOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), EmptyDataOperator.class.getSimpleName()); return new EmptyDataOperator(operatorContext); } throw new IllegalArgumentException("Valid TreeDeviceViewScanNode is not expected here."); @@ -1138,12 +1120,10 @@ private SeriesScanOptions.Builder getSeriesScanOptionsBuilder( public Operator visitInformationSchemaTableScan( final InformationSchemaTableScanNode node, final LocalExecutionPlanContext context) { final OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - InformationSchemaTableScanOperator.class.getSimpleName()); + addOperatorContext( + context, + node.getPlanNodeId(), + InformationSchemaTableScanOperator.class.getSimpleName()); final List dataTypes = node.getOutputSymbols().stream() @@ -1160,12 +1140,7 @@ public Operator visitInformationSchemaTableScan( public Operator visitCountMerge( final CountSchemaMergeNode node, final LocalExecutionPlanContext context) { final OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - CountMergeOperator.class.getSimpleName()); + addOperatorContext(context, node.getPlanNodeId(), CountMergeOperator.class.getSimpleName()); final List children = new ArrayList<>(node.getChildren().size()); for (final PlanNode child : node.getChildren()) { children.add(this.process(child, context)); @@ -1177,12 +1152,8 @@ public Operator visitCountMerge( public Operator visitTableDeviceFetch( final TableDeviceFetchNode node, final LocalExecutionPlanContext context) { final OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - SchemaQueryScanOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), SchemaQueryScanOperator.class.getSimpleName()); return new SchemaQueryScanOperator<>( node.getPlanNodeId(), operatorContext, @@ -1202,12 +1173,8 @@ public Operator visitTableDeviceQueryScan( final SchemaQueryScanOperator operator = new SchemaQueryScanOperator<>( node.getPlanNodeId(), - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - SchemaQueryScanOperator.class.getSimpleName()), + addOperatorContext( + context, node.getPlanNodeId(), SchemaQueryScanOperator.class.getSimpleName()), SchemaSourceFactory.getTableDeviceQuerySource( node.getDatabase(), table, @@ -1236,12 +1203,8 @@ public Operator visitTableDeviceQueryCount( final List filterLeafColumnTransformerList = new ArrayList<>(); return new SchemaCountOperator<>( node.getPlanNodeId(), - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - SchemaCountOperator.class.getSimpleName()), + addOperatorContext( + context, node.getPlanNodeId(), SchemaCountOperator.class.getSimpleName()), SchemaSourceFactory.getTableDeviceQuerySource( database, table, @@ -1532,9 +1495,7 @@ public Operator visitNonAlignedAggregationTreeDeviceViewScan( } final OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext(context.getNextOperatorId(), node.getPlanNodeId(), className); + addOperatorContext(context, node.getPlanNodeId(), className); SeriesScanOptions seriesScanOptions = buildSeriesScanOptions( context, @@ -1883,12 +1844,8 @@ private SeriesScanOptions buildSeriesScanOptions( public Operator visitExplainAnalyze(ExplainAnalyzeNode node, LocalExecutionPlanContext context) { Operator operator = node.getChild().accept(this, context); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - ExplainAnalyzeOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), ExplainAnalyzeOperator.class.getSimpleName()); return new ExplainAnalyzeOperator( operatorContext, operator, node.getQueryId(), node.isVerbose(), node.getTimeout()); } @@ -1912,12 +1869,8 @@ public Operator visitCopyTo(CopyToNode node, LocalExecutionPlanContext context) Operator operator = childNode.accept(this, context); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableCopyToOperator.class.getSimpleName()); + addOperatorContext( + context, node.getPlanNodeId(), TableCopyToOperator.class.getSimpleName()); return new TableCopyToOperator( operatorContext, operator, @@ -1931,12 +1884,7 @@ public Operator visitCopyTo(CopyToNode node, LocalExecutionPlanContext context) public Operator visitInto(IntoNode node, LocalExecutionPlanContext context) { Operator child = node.getChild().accept(this, context); OperatorContext operatorContext = - context - .getDriverContext() - .addOperatorContext( - context.getNextOperatorId(), - node.getPlanNodeId(), - TableIntoOperator.class.getSimpleName()); + addOperatorContext(context, node.getPlanNodeId(), TableIntoOperator.class.getSimpleName()); PartialPath targetTable = new PartialPath(node.getTable(), false); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java index 1f930344ca76a..a410817decd63 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.plan.planner.ITableOperatorGeneratorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -64,7 +65,7 @@ import static java.util.Objects.requireNonNull; // Attention: We should use thread-safe data structure for members that are shared by all pipelines -public class LocalExecutionPlanContext { +public class LocalExecutionPlanContext implements ITableOperatorGeneratorContext { private static final Logger LOGGER = LoggerFactory.getLogger(LocalExecutionPlanContext.class); // Save operators in this pipeline, a new one will be created when creating another pipeline From 10eef615d130cbc275b5850ee642be7923873d8e Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Fri, 17 Apr 2026 14:11:36 +0800 Subject: [PATCH 31/45] add ITableTypeProvider --- .../relational/ColumnTransformerBuilder.java | 6 +- .../ITableOperatorGeneratorContext.java | 4 +- .../plan/planner/TableOperatorGenerator.java | 93 ++++++++++--------- .../plan/analyze/ITableTypeProvider.java | 36 +++++++ .../plan/node/CommonPlanNodeDeserializer.java | 8 +- .../plan/node/IPlanNodeDeserializer.java | 4 - .../node/IPlanNodeDeserializerProvider.java | 19 ++++ .../plan/planner/plan/node/PlanNodeType.java | 29 +++--- .../plan/analyze/TypeProvider.java | 3 +- .../planner/LocalExecutionPlanContext.java | 6 ++ .../plan/planner/plan/PlanFragment.java | 4 +- .../node/DataNodePlanNodeDeserializer.java | 2 +- .../DataNodePlanNodeDeserializerProvider.java | 25 +++++ ...r.plan.node.IPlanNodeDeserializerProvider} | 2 +- 14 files changed, 161 insertions(+), 80 deletions(-) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/analyze/ITableTypeProvider.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializerProvider.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializerProvider.java rename iotdb-core/datanode/src/main/resources/META-INF/services/{org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializer => org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider} (69%) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java index 55d115c66c18e..8aeb4d80a4ee2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java @@ -148,6 +148,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.plan.analyze.ITableTypeProvider; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.AdditionResolver; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.DivisionResolver; @@ -194,7 +195,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; @@ -1940,7 +1940,7 @@ public static class Context { private final int originSize; - private final TypeProvider typeProvider; + private final ITableTypeProvider typeProvider; private final Metadata metadata; @@ -1953,7 +1953,7 @@ public Context( List commonTransformerList, List inputDataTypes, int originSize, - TypeProvider typeProvider, + ITableTypeProvider typeProvider, Metadata metadata) { this.sessionInfo = sessionInfo; this.leafList = leafList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java index 0948e39cb6ad8..b79be7861b63b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.calc_commons.plan.planner; -import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; +import org.apache.iotdb.db.node_commons.plan.analyze.ITableTypeProvider; import java.time.ZoneId; public interface ITableOperatorGeneratorContext { - TypeProvider getTypeProvider(); + ITableTypeProvider getTableTypeProvider(); ZoneId getZoneId(); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 59da75bfe1bab..eb631cb297a43 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -105,6 +105,7 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.plan.analyze.ITableTypeProvider; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -160,7 +161,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.relational.TableFunction; @@ -278,7 +278,7 @@ protected ImmutableMap makeLayoutFromOutputSymbols(List @Override public Operator visitFilter(FilterNode node, C context) { - TypeProvider typeProvider = context.getTypeProvider(); + ITableTypeProvider typeProvider = context.getTableTypeProvider(); Optional predicate = Optional.of(node.getPredicate()); Operator inputOperator = node.getChild().accept(this, context); List inputDataTypes = getInputColumnTypes(node, typeProvider); @@ -328,7 +328,7 @@ protected Operator constructFilterAndProjectOperator( ImmutableList.of(), ImmutableList.of(), 0, - context.getTypeProvider(), + context.getTableTypeProvider(), metadata); return visitor.process(p, filterColumnTransformerContext); @@ -355,7 +355,7 @@ protected Operator constructFilterAndProjectOperator( commonTransformerList, filterOutputDataTypes, inputLocations.size(), - context.getTypeProvider(), + context.getTableTypeProvider(), metadata); for (Expression expression : projectExpressions) { @@ -382,7 +382,7 @@ protected Operator constructFilterAndProjectOperator( @Override public Operator visitProject(ProjectNode node, C context) { - TypeProvider typeProvider = context.getTypeProvider(); + ITableTypeProvider typeProvider = context.getTableTypeProvider(); Optional predicate; Operator inputOperator; List inputDataTypes; @@ -410,7 +410,7 @@ public Operator visitProject(ProjectNode node, C context) { context); } - private List getInputColumnTypes(PlanNode node, TypeProvider typeProvider) { + private List getInputColumnTypes(PlanNode node, ITableTypeProvider typeProvider) { // ignore "time" column return node.getChildren().stream() .map(PlanNode::getOutputSymbols) @@ -423,7 +423,7 @@ private List getInputColumnTypes(PlanNode node, TypeProvider typePro public Operator visitGapFill(GapFillNode node, C context) { Operator child = node.getChild().accept(this, context); List inputDataTypes = - getOutputColumnTypes(node.getChild(), context.getTypeProvider()); + getOutputColumnTypes(node.getChild(), context.getTableTypeProvider()); int timeColumnIndex = getColumnIndex(node.getGapFillColumn(), node.getChild()); if (node.getGapFillGroupingKeys().isEmpty()) { // without group keys if (node.getMonthDuration() == 0) { // without month interval @@ -496,7 +496,7 @@ public Operator visitPreviousFill(PreviousFillNode node, C context) { Operator child = node.getChild().accept(this, context); List inputDataTypes = - getOutputColumnTypes(node.getChild(), context.getTypeProvider()); + getOutputColumnTypes(node.getChild(), context.getTableTypeProvider()); int inputColumnCount = inputDataTypes.size(); int helperColumnIndex = -1; if (node.getHelperColumn().isPresent()) { @@ -572,7 +572,7 @@ public Operator visitLinearFill(LinearFillNode node, C context) { Operator child = node.getChild().accept(this, context); List inputDataTypes = - getOutputColumnTypes(node.getChild(), context.getTypeProvider()); + getOutputColumnTypes(node.getChild(), context.getTableTypeProvider()); int inputColumnCount = inputDataTypes.size(); int helperColumnIndex = getColumnIndex(node.getHelperColumn(), node.getChild()); ILinearFill[] fillArray = getLinearFill(inputColumnCount, inputDataTypes); @@ -605,7 +605,7 @@ public Operator visitValueFill(ValueFillNode node, C context) { OperatorContext operatorContext = addOperatorContext(context, node.getPlanNodeId(), TableFillOperator.class.getSimpleName()); List inputDataTypes = - getOutputColumnTypes(node.getChild(), context.getTypeProvider()); + getOutputColumnTypes(node.getChild(), context.getTableTypeProvider()); int inputColumnCount = inputDataTypes.size(); Literal filledValue = node.getFilledValue(); return new TableFillOperator( @@ -745,7 +745,7 @@ public Operator visitMergeSort(MergeSortNode node, C context) { for (PlanNode child : node.getChildren()) { children.add(this.process(child, context)); } - List dataTypes = getOutputColumnTypes(node, context.getTypeProvider()); + List dataTypes = getOutputColumnTypes(node, context.getTableTypeProvider()); int sortItemsCount = node.getOrderingScheme().getOrderBy().size(); List sortItemIndexList = new ArrayList<>(sortItemsCount); @@ -755,7 +755,7 @@ public Operator visitMergeSort(MergeSortNode node, C context) { node.getOrderingScheme(), sortItemIndexList, sortItemDataTypeList, - context.getTypeProvider()); + context.getTableTypeProvider()); return new TableMergeSortOperator( operatorContext, @@ -769,7 +769,7 @@ public Operator visitMergeSort(MergeSortNode node, C context) { public Operator visitSort(SortNode node, C context) { OperatorContext operatorContext = addOperatorContext(context, node.getPlanNodeId(), TableSortOperator.class.getSimpleName()); - List dataTypes = getOutputColumnTypes(node, context.getTypeProvider()); + List dataTypes = getOutputColumnTypes(node, context.getTableTypeProvider()); int sortItemsCount = node.getOrderingScheme().getOrderBy().size(); List sortItemIndexList = new ArrayList<>(sortItemsCount); @@ -779,7 +779,7 @@ public Operator visitSort(SortNode node, C context) { node.getOrderingScheme(), sortItemIndexList, sortItemDataTypeList, - context.getTypeProvider()); + context.getTableTypeProvider()); Operator child = node.getChild().accept(this, context); @@ -805,7 +805,7 @@ public Operator visitTopK(TopKNode node, C context) { for (PlanNode child : node.getChildren()) { children.add(this.process(child, context)); } - List dataTypes = getOutputColumnTypes(node, context.getTypeProvider()); + List dataTypes = getOutputColumnTypes(node, context.getTableTypeProvider()); int sortItemsCount = node.getOrderingScheme().getOrderBy().size(); List sortItemIndexList = new ArrayList<>(sortItemsCount); @@ -815,7 +815,7 @@ public Operator visitTopK(TopKNode node, C context) { node.getOrderingScheme(), sortItemIndexList, sortItemDataTypeList, - context.getTypeProvider()); + context.getTableTypeProvider()); return new TableTopKOperator( operatorContext, children, @@ -826,7 +826,7 @@ public Operator visitTopK(TopKNode node, C context) { node.isChildrenDataInOrder()); } - protected List getOutputColumnTypes(PlanNode node, TypeProvider typeProvider) { + protected List getOutputColumnTypes(PlanNode node, ITableTypeProvider typeProvider) { return node.getOutputSymbols().stream() .map(s -> getTSDataType(typeProvider.getTableModelType(s))) .collect(Collectors.toList()); @@ -837,7 +837,7 @@ protected void genSortInformation( OrderingScheme orderingScheme, List sortItemIndexList, List sortItemDataTypeList, - TypeProvider typeProvider) { + ITableTypeProvider typeProvider) { Map columnIndex = new HashMap<>(); int index = 0; for (Symbol symbol : outputSymbols) { @@ -863,7 +863,7 @@ public Operator visitStreamSort(StreamSortNode node, C context) { OperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), TableStreamSortOperator.class.getSimpleName()); - List dataTypes = getOutputColumnTypes(node, context.getTypeProvider()); + List dataTypes = getOutputColumnTypes(node, context.getTableTypeProvider()); int sortItemsCount = node.getOrderingScheme().getOrderBy().size(); List sortItemIndexList = new ArrayList<>(sortItemsCount); @@ -873,7 +873,7 @@ public Operator visitStreamSort(StreamSortNode node, C context) { node.getOrderingScheme(), sortItemIndexList, sortItemDataTypeList, - context.getTypeProvider()); + context.getTableTypeProvider()); Operator child = node.getChild().accept(this, context); @@ -915,7 +915,7 @@ public Operator visitGroup(GroupNode node, C context) { @Override public Operator visitJoin(JoinNode node, C context) { - List dataTypes = getOutputColumnTypes(node, context.getTypeProvider()); + List dataTypes = getOutputColumnTypes(node, context.getTableTypeProvider()); Operator leftChild = node.getLeftChild().accept(this, context); Operator rightChild = node.getRightChild().accept(this, context); @@ -986,10 +986,10 @@ public Operator visitJoin(JoinNode node, C context) { rightJoinKeyPositions[i] = rightJoinKeyPosition; Type leftJoinKeyType = - context.getTypeProvider().getTableModelType(node.getCriteria().get(i).getLeft()); + context.getTableTypeProvider().getTableModelType(node.getCriteria().get(i).getLeft()); checkIfJoinKeyTypeMatches( leftJoinKeyType, - context.getTypeProvider().getTableModelType(node.getCriteria().get(i).getRight())); + context.getTableTypeProvider().getTableModelType(node.getCriteria().get(i).getRight())); joinKeyTypes.add(leftJoinKeyType); } @@ -1007,10 +1007,11 @@ public Operator visitJoin(JoinNode node, C context) { } rightJoinKeyPositions[equiSize] = rightAsofJoinKeyPosition; - if (context.getTypeProvider().getTableModelType(asofJoinClause.getLeft()) != TIMESTAMP) { + if (context.getTableTypeProvider().getTableModelType(asofJoinClause.getLeft()) != TIMESTAMP) { throw new IllegalStateException("Type of left ASOF Join key is not TIMESTAMP"); } - if (context.getTypeProvider().getTableModelType(asofJoinClause.getRight()) != TIMESTAMP) { + if (context.getTableTypeProvider().getTableModelType(asofJoinClause.getRight()) + != TIMESTAMP) { throw new IllegalStateException("Type of right ASOF Join key is not TIMESTAMP"); } @@ -1158,7 +1159,7 @@ protected BiFunction buildUpdateLastRowFunction(Type jo @Override public Operator visitSemiJoin(SemiJoinNode node, C context) { - List dataTypes = getOutputColumnTypes(node, context.getTypeProvider()); + List dataTypes = getOutputColumnTypes(node, context.getTableTypeProvider()); Operator leftChild = node.getLeftChild().accept(this, context); Operator rightChild = node.getRightChild().accept(this, context); @@ -1186,11 +1187,11 @@ public Operator visitSemiJoin(SemiJoinNode node, C context) { "FilteringSource of SemiJoinNode doesn't contain filteringSourceJoinSymbol."); Type sourceJoinKeyType = - context.getTypeProvider().getTableModelType(node.getSourceJoinSymbol()); + context.getTableTypeProvider().getTableModelType(node.getSourceJoinSymbol()); checkIfJoinKeyTypeMatches( sourceJoinKeyType, - context.getTypeProvider().getTableModelType(node.getFilteringSourceJoinSymbol())); + context.getTableTypeProvider().getTableModelType(node.getFilteringSourceJoinSymbol())); OperatorContext operatorContext = addOperatorContext( @@ -1242,14 +1243,14 @@ public Operator visitAggregation(AggregationNode node, C context) { Operator child = node.getChild().accept(this, context); if (node.getGroupingKeys().isEmpty()) { - return planGlobalAggregation(node, child, context.getTypeProvider(), context); + return planGlobalAggregation(node, child, context.getTableTypeProvider(), context); } - return planGroupByAggregation(node, child, context.getTypeProvider(), context); + return planGroupByAggregation(node, child, context.getTableTypeProvider(), context); } private Operator planGlobalAggregation( - AggregationNode node, Operator child, TypeProvider typeProvider, C context) { + AggregationNode node, Operator child, ITableTypeProvider typeProvider, C context) { OperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), AggregationOperator.class.getSimpleName()); @@ -1281,7 +1282,7 @@ protected TableAggregator buildAggregator( Symbol symbol, AggregationNode.Aggregation aggregation, AggregationNode.Step step, - TypeProvider typeProvider, + ITableTypeProvider typeProvider, boolean scanAscending, boolean isAggTableScan, String timeColumnName, @@ -1324,7 +1325,7 @@ protected TableAggregator buildAggregator( } protected Operator planGroupByAggregation( - AggregationNode node, Operator child, TypeProvider typeProvider, C context) { + AggregationNode node, Operator child, ITableTypeProvider typeProvider, C context) { Map childLayout = makeLayoutFromOutputSymbols(node.getChild().getOutputSymbols()); @@ -1464,7 +1465,7 @@ protected GroupedAggregator buildGroupByAggregator( Symbol symbol, AggregationNode.Aggregation aggregation, AggregationNode.Step step, - TypeProvider typeProvider) { + ITableTypeProvider typeProvider) { List argumentChannels = new ArrayList<>(); for (Expression argument : aggregation.getArguments()) { Symbol argumentSymbol = Symbol.from(argument); @@ -1507,7 +1508,7 @@ public Operator visitTableFunctionProcessor(TableFunctionProcessorNode node, C c if (node.getChildren().isEmpty()) { List outputDataTypes = node.getOutputSymbols().stream() - .map(context.getTypeProvider()::getTableModelType) + .map(context.getTableTypeProvider()::getTableModelType) .map(InternalTypeManager::getTSDataType) .collect(Collectors.toList()); OperatorContext operatorContext = @@ -1522,13 +1523,13 @@ public Operator visitTableFunctionProcessor(TableFunctionProcessorNode node, C c List inputDataTypes = node.getChild().getOutputSymbols().stream() - .map(context.getTypeProvider()::getTableModelType) + .map(context.getTableTypeProvider()::getTableModelType) .map(InternalTypeManager::getTSDataType) .collect(Collectors.toList()); List outputDataTypes = node.getOutputSymbols().stream() - .map(context.getTypeProvider()::getTableModelType) + .map(context.getTableTypeProvider()::getTableModelType) .map(InternalTypeManager::getTSDataType) .collect(Collectors.toList()); @@ -1626,7 +1627,7 @@ public Operator visitPatternRecognition(PatternRecognitionNode node, C context) // all output column types of the input table List inputDataTypes = - getOutputColumnTypes(node.getChild(), context.getTypeProvider()); + getOutputColumnTypes(node.getChild(), context.getTableTypeProvider()); // input channels to be passed directly to output, excluding MEASURES columns ImmutableList.Builder outputChannels = ImmutableList.builder(); @@ -1716,7 +1717,7 @@ public Operator visitPatternRecognition(PatternRecognitionNode node, C context) getOnlyElement( getChannelsForSymbols( ImmutableList.of(scalarPointer.getInputSymbol()), childLayout)), - context.getTypeProvider().getTableModelType(scalarPointer.getInputSymbol()), + context.getTableTypeProvider().getTableModelType(scalarPointer.getInputSymbol()), scalarPointer.getLogicalIndexPointer().toLogicalIndexNavigation(mapping))); } else if (pointer instanceof AggregationValuePointer) { AggregationValuePointer aggregationPointer = (AggregationValuePointer) pointer; @@ -1807,7 +1808,7 @@ public Operator visitPatternRecognition(PatternRecognitionNode node, C context) getOnlyElement( getChannelsForSymbols( ImmutableList.of(scalarPointer.getInputSymbol()), childLayout)), - context.getTypeProvider().getTableModelType(scalarPointer.getInputSymbol()), + context.getTableTypeProvider().getTableModelType(scalarPointer.getInputSymbol()), scalarPointer.getLogicalIndexPointer().toLogicalIndexNavigation(mapping))); } else if (pointer instanceof AggregationValuePointer) { AggregationValuePointer aggregationPointer = (AggregationValuePointer) pointer; @@ -1962,7 +1963,7 @@ public Operator visitMarkDistinct(MarkDistinctNode node, C context) { addOperatorContext( context, node.getPlanNodeId(), MarkDistinctOperator.class.getSimpleName()); - TypeProvider typeProvider = context.getTypeProvider(); + ITableTypeProvider typeProvider = context.getTableTypeProvider(); Map childLayout = makeLayoutFromOutputSymbols(node.getChild().getOutputSymbols()); @@ -1978,7 +1979,7 @@ public Operator visitMarkDistinct(MarkDistinctNode node, C context) { @Override public Operator visitWindowFunction(WindowNode node, C context) { - TypeProvider typeProvider = context.getTypeProvider(); + ITableTypeProvider typeProvider = context.getTableTypeProvider(); Operator child = node.getChild().accept(this, context); OperatorContext operatorContext = addOperatorContext( @@ -2005,7 +2006,7 @@ public Operator visitWindowFunction(WindowNode node, C context) { ImmutableList.Builder outputChannels = ImmutableList.builder(); List outputDataTypes = new ArrayList<>(); List inputDataTypes = - getOutputColumnTypes(node.getChild(), context.getTypeProvider()); + getOutputColumnTypes(node.getChild(), context.getTableTypeProvider()); for (int i = 0; i < inputDataTypes.size(); i++) { outputChannels.add(i); outputDataTypes.add(inputDataTypes.get(i)); @@ -2120,7 +2121,7 @@ public Operator visitWindowFunction(WindowNode node, C context) { private WindowAggregator buildWindowAggregator( Symbol symbol, WindowNode.Function function, - TypeProvider typeProvider, + ITableTypeProvider typeProvider, List argumentChannels) { // Create accumulator first String functionName = function.getResolvedFunction().getSignature().getName(); @@ -2185,7 +2186,7 @@ public Operator visitRowNumber(RowNumberNode node, C context) { makeLayoutFromOutputSymbols(node.getChild().getOutputSymbols()); List partitionChannels = getChannelsForSymbols(partitionBySymbols, childLayout); List inputDataTypes = - getOutputColumnTypes(node.getChild(), context.getTypeProvider()); + getOutputColumnTypes(node.getChild(), context.getTableTypeProvider()); ImmutableList.Builder outputChannels = ImmutableList.builder(); for (int i = 0; i < inputDataTypes.size(); i++) { @@ -2222,7 +2223,7 @@ public Operator visitTopKRanking(TopKRankingNode node, C context) { makeLayoutFromOutputSymbols(node.getChild().getOutputSymbols()); List partitionChannels = getChannelsForSymbols(partitionBySymbols, childLayout); List inputDataTypes = - getOutputColumnTypes(node.getChild(), context.getTypeProvider()); + getOutputColumnTypes(node.getChild(), context.getTableTypeProvider()); List partitionTypes = partitionChannels.stream().map(inputDataTypes::get).collect(toImmutableList()); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/analyze/ITableTypeProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/analyze/ITableTypeProvider.java new file mode 100644 index 0000000000000..b30a3edbebdab --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/analyze/ITableTypeProvider.java @@ -0,0 +1,36 @@ +/* + * 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.node_commons.plan.analyze; + +import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; + +import org.apache.tsfile.read.common.type.Type; + +import java.util.Map; + +public interface ITableTypeProvider { + Type getTableModelType(Symbol symbol); + + boolean isSymbolExist(Symbol symbol); + + void putTableModelType(Symbol symbol, Type type); + + Map allTableModelTypes(); +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java index 3b5081678513e..392001e1989ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java @@ -37,13 +37,14 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import java.io.DataInputStream; import java.io.IOException; import java.nio.ByteBuffer; public class CommonPlanNodeDeserializer implements IPlanNodeDeserializer { + public static final CommonPlanNodeDeserializer INSTANCE = new CommonPlanNodeDeserializer(); + @Override public PlanNode deserializeFromWAL(DataInputStream stream) throws IOException { throw new UnsupportedOperationException("Not supported for CommonPlanNodeDeserializer"); @@ -137,9 +138,4 @@ public PlanNode deserialize(ByteBuffer buffer, short nodeType) { throw new IllegalArgumentException("Invalid node type: " + nodeType); } } - - @Override - public PlanNode deserializeWithTemplate(ByteBuffer buffer, TypeProvider typeProvider) { - throw new UnsupportedOperationException("Not supported for CommonPlanNodeDeserializer"); - } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java index 9b90244b496be..f918eec671a1e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java @@ -14,8 +14,6 @@ package org.apache.iotdb.db.node_commons.plan.planner.plan.node; -import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; - import java.io.DataInputStream; import java.io.IOException; import java.nio.ByteBuffer; @@ -28,6 +26,4 @@ public interface IPlanNodeDeserializer { PlanNode deserialize(ByteBuffer buffer); PlanNode deserialize(ByteBuffer buffer, short nodeType); - - PlanNode deserializeWithTemplate(ByteBuffer buffer, TypeProvider typeProvider); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializerProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializerProvider.java new file mode 100644 index 0000000000000..72db2e50019ce --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializerProvider.java @@ -0,0 +1,19 @@ +/* + * 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.node_commons.plan.planner.plan.node; + +public interface IPlanNodeDeserializerProvider { + IPlanNodeDeserializer getDeserializer(); +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeType.java index 02291197f4c93..328ed4c42bfec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeType.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.planner.plan.node; -import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; - import org.apache.tsfile.utils.ReadWriteIOUtils; import java.io.DataInputStream; @@ -208,14 +206,19 @@ public enum PlanNodeType { OBJECT_FILE_NODE((short) 2004), ; - private static IPlanNodeDeserializer deserializer; + private static final IPlanNodeDeserializer DESERIALIZER; static { - ServiceLoader loader = ServiceLoader.load(IPlanNodeDeserializer.class); - for (IPlanNodeDeserializer element : loader) { - deserializer = element; + IPlanNodeDeserializer deserializer = null; + ServiceLoader loader = + ServiceLoader.load(IPlanNodeDeserializerProvider.class); + for (IPlanNodeDeserializerProvider provider : loader) { + if (deserializer != null) { + throw new IllegalStateException("Multiple IPlanNodeDeserializerProvider found"); + } + deserializer = provider.getDeserializer(); } - deserializer = deserializer == null ? new CommonPlanNodeDeserializer() : deserializer; + DESERIALIZER = deserializer == null ? CommonPlanNodeDeserializer.INSTANCE : deserializer; } public static final int BYTES = Short.BYTES; @@ -239,22 +242,18 @@ public void serialize(DataOutputStream stream) throws IOException { } public static PlanNode deserializeFromWAL(DataInputStream stream) throws IOException { - return deserializer.deserializeFromWAL(stream); + return DESERIALIZER.deserializeFromWAL(stream); } public static PlanNode deserializeFromWAL(ByteBuffer buffer) { - return deserializer.deserializeFromWAL(buffer); + return DESERIALIZER.deserializeFromWAL(buffer); } public static PlanNode deserialize(ByteBuffer buffer) { - return deserializer.deserialize(buffer); + return DESERIALIZER.deserialize(buffer); } public static PlanNode deserialize(ByteBuffer buffer, short nodeType) { - return deserializer.deserialize(buffer, nodeType); - } - - public static PlanNode deserializeWithTemplate(ByteBuffer buffer, TypeProvider typeProvider) { - return deserializer.deserializeWithTemplate(buffer, typeProvider); + return DESERIALIZER.deserialize(buffer, nodeType); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java index e5a6b8458ccbf..cd19b38a74d4a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze; +import org.apache.iotdb.db.node_commons.plan.analyze.ITableTypeProvider; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; @@ -40,7 +41,7 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand.TIMESTAMP_EXPRESSION_STRING; -public class TypeProvider { +public class TypeProvider implements ITableTypeProvider { private final Map treeModelTypeMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java index a410817decd63..9a37072fb20c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.plan.planner.ITableOperatorGeneratorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.node_commons.plan.analyze.ITableTypeProvider; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -308,6 +309,11 @@ public TypeProvider getTypeProvider() { return typeProvider; } + @Override + public ITableTypeProvider getTableTypeProvider() { + return typeProvider; + } + public FragmentInstanceContext getInstanceContext() { return driverContext.getFragmentInstanceContext(); } 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 48a251050ee31..d65524ac61d17 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 @@ -30,6 +30,7 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.SubPlanTypeExtractor; import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; +import org.apache.iotdb.db.queryengine.plan.planner.plan.node.DataNodePlanNodeDeserializer; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesAggregationScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.VirtualSourceNode; @@ -224,7 +225,8 @@ public static PlanFragment deserialize(ByteBuffer byteBuffer) { public static PlanNode deserializeHelper(ByteBuffer byteBuffer, TypeProvider typeProvider) { PlanNode root; if (typeProvider != null && typeProvider.getTemplatedInfo() != null) { - root = PlanNodeType.deserializeWithTemplate(byteBuffer, typeProvider); + root = + DataNodePlanNodeDeserializer.INSTANCE.deserializeWithTemplate(byteBuffer, typeProvider); if (root instanceof AlignedSeriesScanNode || root instanceof AlignedSeriesAggregationScanNode) { return root; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializer.java index 35be4b564804e..ebd8ae8d2477c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializer.java @@ -140,6 +140,7 @@ import java.nio.ByteBuffer; public class DataNodePlanNodeDeserializer extends CommonPlanNodeDeserializer { + public static final DataNodePlanNodeDeserializer INSTANCE = new DataNodePlanNodeDeserializer(); @Override public PlanNode deserializeFromWAL(DataInputStream stream) throws IOException { @@ -474,7 +475,6 @@ public PlanNode deserialize(ByteBuffer buffer, short nodeType) { } } - @Override public PlanNode deserializeWithTemplate(ByteBuffer buffer, TypeProvider typeProvider) { short nodeType = buffer.getShort(); switch (nodeType) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializerProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializerProvider.java new file mode 100644 index 0000000000000..f712056471fa6 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializerProvider.java @@ -0,0 +1,25 @@ +/* + * 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.planner.plan.node; + +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializer; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider; + +public class DataNodePlanNodeDeserializerProvider implements IPlanNodeDeserializerProvider { + @Override + public IPlanNodeDeserializer getDeserializer() { + return DataNodePlanNodeDeserializer.INSTANCE; + } +} diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializer b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider similarity index 69% rename from iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializer rename to iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider index 7c0108023311f..bec380fc80195 100644 --- a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializer +++ b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider @@ -1 +1 @@ -org.apache.iotdb.db.queryengine.plan.planner.plan.node.DataNodePlanNodeDeserializer \ No newline at end of file +org.apache.iotdb.db.queryengine.plan.planner.plan.node.DataNodePlanNodeDeserializerProvider From c48b443a53d7cfa7ed6cd81c5f89af2b5f6138c1 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Fri, 17 Apr 2026 14:34:48 +0800 Subject: [PATCH 32/45] modify serializeUseTemplate --- .../db/node_commons/plan/planner/plan/node/PlanNode.java | 6 ++---- .../db/queryengine/plan/planner/plan/PlanFragment.java | 2 +- .../plan/planner/plan/node/process/DeviceViewNode.java | 5 ++--- .../plan/planner/plan/node/process/FilterNode.java | 5 ++--- .../plan/planner/plan/node/process/ProjectNode.java | 5 ++--- .../planner/plan/node/process/SingleDeviceViewNode.java | 5 ++--- .../plan/node/source/AlignedSeriesAggregationScanNode.java | 3 +-- .../planner/plan/node/source/AlignedSeriesScanNode.java | 3 +-- 8 files changed, 13 insertions(+), 21 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java index caa22a9848a39..51a8f42b0705b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java @@ -22,7 +22,6 @@ import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.tsfile.utils.PublicBAOS; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -158,8 +157,7 @@ public void serialize(DataOutputStream stream) throws IOException { } } - public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvider) - throws IOException { + public void serializeUseTemplate(DataOutputStream stream) throws IOException { serializeAttributes(stream); id.serialize(stream); List planNodes = getChildren(); @@ -168,7 +166,7 @@ public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvi } else { ReadWriteIOUtils.write(planNodes.size(), stream); for (PlanNode planNode : planNodes) { - planNode.serializeUseTemplate(stream, typeProvider); + planNode.serializeUseTemplate(stream); } } } 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 d65524ac61d17..56c8b957e41e7 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 @@ -199,7 +199,7 @@ public void serialize(DataOutputStream stream) throws IOException { // so there is no need to serialize all the SeriesScanNode repeated if (typeProvider.getTemplatedInfo() != null) { typeProvider.serialize(stream); - planNodeTree.serializeUseTemplate(stream, typeProvider); + planNodeTree.serializeUseTemplate(stream); return; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java index 464b8cc89b5a1..66ee6cff4bd37 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java @@ -215,8 +215,7 @@ public static DeviceViewNode deserialize(ByteBuffer byteBuffer) { } @Override - public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvider) - throws IOException { + public void serializeUseTemplate(DataOutputStream stream) throws IOException { PlanNodeType.DEVICE_VIEW.serialize(stream); id.serialize(stream); mergeOrderParameter.serializeAttributes(stream); @@ -227,7 +226,7 @@ public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvi ReadWriteIOUtils.write(getChildren().size(), stream); for (PlanNode planNode : getChildren()) { - planNode.serializeUseTemplate(stream, typeProvider); + planNode.serializeUseTemplate(stream); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java index 996cd48fd0f7d..11b4c402d4b3f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java @@ -123,8 +123,7 @@ public static FilterNode deserialize(ByteBuffer byteBuffer) { } @Override - public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvider) - throws IOException { + public void serializeUseTemplate(DataOutputStream stream) throws IOException { PlanNodeType.FILTER.serialize(stream); id.serialize(stream); ReadWriteIOUtils.write(fromWhere, stream); @@ -140,7 +139,7 @@ public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvi } ReadWriteIOUtils.write(getChildren().size(), stream); for (PlanNode planNode : getChildren()) { - planNode.serializeUseTemplate(stream, typeProvider); + planNode.serializeUseTemplate(stream); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java index 7e00d7564261c..6972c0f0f6374 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java @@ -104,13 +104,12 @@ public static ProjectNode deserialize(ByteBuffer byteBuffer) { } @Override - public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvider) - throws IOException { + public void serializeUseTemplate(DataOutputStream stream) throws IOException { PlanNodeType.PROJECT.serialize(stream); id.serialize(stream); ReadWriteIOUtils.write(getChildren().size(), stream); for (PlanNode planNode : getChildren()) { - planNode.serializeUseTemplate(stream, typeProvider); + planNode.serializeUseTemplate(stream); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java index 40149d06bb23f..afce68715fac2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java @@ -176,15 +176,14 @@ public static SingleDeviceViewNode deserialize(ByteBuffer byteBuffer) { } @Override - public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvider) - throws IOException { + public void serializeUseTemplate(DataOutputStream stream) throws IOException { PlanNodeType.SINGLE_DEVICE_VIEW.serialize(stream); id.serialize(stream); device.serialize(stream); ReadWriteIOUtils.write(cacheOutputColumnNames, stream); ReadWriteIOUtils.write(getChildren().size(), stream); for (PlanNode planNode : getChildren()) { - planNode.serializeUseTemplate(stream, typeProvider); + planNode.serializeUseTemplate(stream); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java index 0251dbdaa8085..ba1454f9ad185 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java @@ -279,8 +279,7 @@ public static AlignedSeriesAggregationScanNode deserialize(ByteBuffer byteBuffer } @Override - public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvider) - throws IOException { + public void serializeUseTemplate(DataOutputStream stream) throws IOException { PlanNodeType.ALIGNED_SERIES_AGGREGATE_SCAN.serialize(stream); id.serialize(stream); ReadWriteIOUtils.write(alignedPath.getNodes().length, stream); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java index 88be2ddd980b7..ece77b530bf82 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java @@ -200,8 +200,7 @@ public static AlignedSeriesScanNode deserialize(ByteBuffer byteBuffer) { } @Override - public void serializeUseTemplate(DataOutputStream stream, TypeProvider typeProvider) - throws IOException { + public void serializeUseTemplate(DataOutputStream stream) throws IOException { PlanNodeType.ALIGNED_SERIES_SCAN.serialize(stream); id.serialize(stream); ReadWriteIOUtils.write(alignedPath.getNodes().length, stream); From 0839a5d26758212fe148103f68f072385241a1f6 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Fri, 17 Apr 2026 17:03:58 +0800 Subject: [PATCH 33/45] refactor Metadata --- .../relational/ColumnTransformerBuilder.java | 6 +-- .../plan/planner/TableOperatorGenerator.java | 10 +++-- .../relational/metadata/ITypeMetadata.java | 29 ++++++++++++++ .../function/ITableFunctionFactory.java | 28 +++++++++++++ .../function/TableFunctionFactory.java | 39 +++++++++++++++++++ .../planner/node/AggregationNode.java | 34 ---------------- .../planner/node/TableFunctionNode.java | 4 +- .../node/TableFunctionProcessorNode.java | 4 +- .../DataNodeTableOperatorGenerator.java | 2 +- .../plan/relational/metadata/Metadata.java | 10 ++--- .../metadata/TableMetadataImpl.java | 18 --------- .../relational/analyzer/TSBSMetadata.java | 5 --- .../relational/analyzer/TestMetadata.java | 5 --- 13 files changed, 113 insertions(+), 81 deletions(-) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/ITypeMetadata.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionFactory.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableFunctionFactory.java diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java index 8aeb4d80a4ee2..0f287136560d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; +import org.apache.iotdb.db.calc_commons.plan.relational.metadata.ITypeMetadata; import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; @@ -195,7 +196,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.ScalarFunction; @@ -1942,7 +1942,7 @@ public static class Context { private final ITableTypeProvider typeProvider; - private final Metadata metadata; + private final ITypeMetadata metadata; public Context( SessionInfo sessionInfo, @@ -1954,7 +1954,7 @@ public Context( List inputDataTypes, int originSize, ITableTypeProvider typeProvider, - Metadata metadata) { + ITypeMetadata metadata) { this.sessionInfo = sessionInfo; this.leafList = leafList; this.inputLocations = inputLocations; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index eb631cb297a43..0d23e34705d2d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -92,6 +92,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingAggregationOperator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; import org.apache.iotdb.db.calc_commons.execution.relational.ColumnTransformerBuilder; +import org.apache.iotdb.db.calc_commons.plan.relational.metadata.ITypeMetadata; import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToBlobLiteralVisitor; import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToBooleanLiteralVisitor; import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToDateLiteralVisitor; @@ -113,6 +114,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind; +import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionFactory; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; @@ -161,7 +163,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; @@ -233,12 +234,13 @@ import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; /** This Visitor is responsible for transferring Table PlanNode Tree to Table Operator Tree. */ -public abstract class TableOperatorGenerator +public abstract class TableOperatorGenerator< + C extends ITableOperatorGeneratorContext, M extends ITypeMetadata & ITableFunctionFactory> implements ICoreQueryPlanVisitor { - protected final Metadata metadata; + protected final M metadata; - public TableOperatorGenerator(Metadata metadata) { + public TableOperatorGenerator(M metadata) { this.metadata = metadata; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/ITypeMetadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/ITypeMetadata.java new file mode 100644 index 0000000000000..251a343c8ed95 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/ITypeMetadata.java @@ -0,0 +1,29 @@ +/* + * 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.calc_commons.plan.relational.metadata; + +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; + +import org.apache.tsfile.read.common.type.Type; + +public interface ITypeMetadata { + Type getType(TypeSignature signature) throws TypeNotFoundException; +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionFactory.java new file mode 100644 index 0000000000000..9553ddc9fbb81 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionFactory.java @@ -0,0 +1,28 @@ +/* + * 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.node_commons.plan.relational.function; + +import org.apache.iotdb.udf.api.relational.TableFunction; + +public interface ITableFunctionFactory { + default TableFunction getTableFunction(String functionName) { + return TableFunctionFactory.getTableFunction(functionName); + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableFunctionFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableFunctionFactory.java new file mode 100644 index 0000000000000..75d34ec46e281 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableFunctionFactory.java @@ -0,0 +1,39 @@ +/* + * 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.node_commons.plan.relational.function; + +import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; +import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.udf.api.relational.TableFunction; + +public class TableFunctionFactory { + + private TableFunctionFactory() {} + + public static TableFunction getTableFunction(String functionName) { + if (TableBuiltinTableFunction.isBuiltInTableFunction(functionName)) { + return TableBuiltinTableFunction.getBuiltinTableFunction(functionName); + } else if (TableUDFUtils.isTableFunction(functionName)) { + return TableUDFUtils.getTableFunction(functionName); + } else { + throw new SemanticException("Unknown function: " + functionName); + } + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java index 05900d8425c5f..9c1a57dac5e4e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.expression.multi.FunctionType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; @@ -32,7 +31,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -342,38 +340,6 @@ public boolean producesDistinctRows() { && outputs.containsAll(new HashSet<>(groupingSets.getGroupingKeys())); } - public boolean isDecomposable(SessionInfo session, Metadata metadata) { - boolean hasOrderBy = - getAggregations().values().stream() - .map(Aggregation::getOrderingScheme) - .anyMatch(Optional::isPresent); - - boolean hasDistinct = getAggregations().values().stream().anyMatch(Aggregation::isDistinct); - - /*boolean decomposableFunctions = getAggregations().values().stream() - .map(Aggregation::getResolvedFunction) - .map(resolvedFunction -> metadata.getAggregationFunctionMetadata(session, resolvedFunction)) - .allMatch(AggregationFunctionMetadata::isDecomposable);*/ - - return !hasOrderBy && !hasDistinct; - } - - public boolean hasSingleNodeExecutionPreference(SessionInfo session, Metadata metadata) { - // There are two kinds of aggregations the have single node execution preference: - // - // 1. aggregations with only empty grouping sets like - // - // SELECT count(*) FROM lineitem; - // - // there is no need for distributed aggregation. Single node FINAL aggregation will suffice, - // since all input have to be aggregated into one line output. - // - // 2. aggregations that must produce default output and are not decomposable, we cannot - // distribute them. - return (hasEmptyGroupingSet() && !hasNonEmptyGroupingSet()) - || (hasDefaultOutput() && !isDecomposable(session, metadata)); - } - public boolean isStreamable() { return !preGroupedSymbols.isEmpty() && groupingSets.getGroupingSetCount() == 1 diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java index f8f79f56c846b..3b673ea87380e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java @@ -25,9 +25,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.function.TableFunctionFactory; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; import com.google.common.collect.ImmutableList; @@ -198,7 +198,7 @@ public static TableFunctionNode deserialize(ByteBuffer byteBuffer) { int size = ReadWriteIOUtils.readInt(byteBuffer); byte[] bytes = ReadWriteIOUtils.readBytes(byteBuffer, size); TableFunctionHandle tableFunctionHandle = - new TableMetadataImpl().getTableFunction(name).createTableFunctionHandle(); + TableFunctionFactory.getTableFunction(name).createTableFunctionHandle(); tableFunctionHandle.deserialize(bytes); size = ReadWriteIOUtils.readInt(byteBuffer); ImmutableList.Builder properOutputs = ImmutableList.builder(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java index 2f6c2009d5122..677e2da553ab4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java @@ -25,9 +25,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.function.TableFunctionFactory; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; import com.google.common.collect.ImmutableList; @@ -260,7 +260,7 @@ public static TableFunctionProcessorNode deserialize(ByteBuffer byteBuffer) { size = ReadWriteIOUtils.readInt(byteBuffer); byte[] bytes = ReadWriteIOUtils.readBytes(byteBuffer, size); TableFunctionHandle tableFunctionHandle = - new TableMetadataImpl().getTableFunction(name).createTableFunctionHandle(); + TableFunctionFactory.getTableFunction(name).createTableFunctionHandle(); tableFunctionHandle.deserialize(bytes); boolean requireRecordSnapshot = ReadWriteIOUtils.readBoolean(byteBuffer); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 48ba79cb92233..6aa266ff74333 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -197,7 +197,7 @@ import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; public class DataNodeTableOperatorGenerator - extends TableOperatorGenerator + extends TableOperatorGenerator implements PlanVisitor { private static final MPPDataExchangeManager MPP_DATA_EXCHANGE_MANAGER = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java index 873c31b53937b..0a5cabbd0d387 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java @@ -24,18 +24,18 @@ import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinWindowFunction; +import org.apache.iotdb.db.calc_commons.plan.relational.metadata.ITypeMetadata; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionFactory; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.read.common.type.Type; @@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicBoolean; // All the input databases shall not contain "root" -public interface Metadata { +public interface Metadata extends ITypeMetadata, ITableFunctionFactory { boolean tableExists(final QualifiedObjectName name); @@ -76,8 +76,6 @@ default boolean isWindowFunction( boolean canCoerce(final Type from, final Type to); - IPartitionFetcher getPartitionFetcher(); - /** * Get all device ids and corresponding attributes from schema region * @@ -212,6 +210,4 @@ DataPartition getDataPartition( */ DataPartition getDataPartitionWithUnclosedTimeRange( final String database, final List sgNameToQueryParamsMap); - - TableFunction getTableFunction(final String functionName); } 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 c63519343484a..bef1ea1b48411 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 @@ -34,7 +34,6 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.AdditionResolver; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.DivisionResolver; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.ModulusResolver; @@ -59,7 +58,6 @@ import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.AggregateFunction; import org.apache.iotdb.udf.api.relational.ScalarFunction; -import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.read.common.type.ObjectType; @@ -1417,11 +1415,6 @@ public boolean canCoerce(final Type from, final Type to) { return true; } - @Override - public IPartitionFetcher getPartitionFetcher() { - return ClusterPartitionFetcher.getInstance(); - } - @Override public Map> indexScan( final QualifiedObjectName tableName, @@ -1516,15 +1509,4 @@ public DataPartition getDataPartitionWithUnclosedTimeRange( return partitionFetcher.getDataPartitionWithUnclosedTimeRange( Collections.singletonMap(database, sgNameToQueryParamsMap)); } - - @Override - public TableFunction getTableFunction(String functionName) { - if (TableBuiltinTableFunction.isBuiltInTableFunction(functionName)) { - return TableBuiltinTableFunction.getBuiltinTableFunction(functionName); - } else if (TableUDFUtils.isTableFunction(functionName)) { - return TableUDFUtils.getTableFunction(functionName); - } else { - throw new SemanticException("Unknown function: " + functionName); - } - } } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java index 2d4f50c3ee282..2eedf5c62e450 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java @@ -278,11 +278,6 @@ public boolean canCoerce(Type from, Type to) { return true; } - @Override - public IPartitionFetcher getPartitionFetcher() { - return getFakePartitionFetcher(); - } - @Override public Map> indexScan( QualifiedObjectName tableName, diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index f152a9edff2e0..83ce87c2fe1d2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -318,11 +318,6 @@ public boolean canCoerce(final Type from, final Type to) { return true; } - @Override - public IPartitionFetcher getPartitionFetcher() { - return getFakePartitionFetcher(); - } - @Override public Map> indexScan( final QualifiedObjectName tableName, From 3a1aa55aaf3681e02f6518eecb3eb324c153dcb0 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Fri, 17 Apr 2026 18:53:57 +0800 Subject: [PATCH 34/45] move some configs --- .../execution/operator/OperatorContext.java | 4 +- .../process/AbstractSortOperator.java | 4 +- .../process/function/PartitionRecognizer.java | 2 +- .../function/TableFunctionOperator.java | 1 - .../process/window/TableWindowOperator.java | 2 +- .../plan/udf/BuiltinAggregationFunction.java | 2 +- .../plan/udf/BuiltinScalarFunction.java | 2 +- .../BuiltinTimeSeriesGeneratingFunction.java | 2 +- .../calc_commons/plan/udf/TableUDFUtils.java | 1 - .../plan/udf/UDFManagementService.java | 2 +- .../plan/udf/UDTFForecast.java | 2 +- .../dag/adapter/PointCollectorAdaptor.java | 2 +- .../multi/MappableUDFColumnTransformer.java | 2 +- .../dag/udf/UDFParametersFactory.java | 2 +- .../transformation/dag/udf/UDTFExecutor.java | 10 ++--- .../dag/util/InputRowUtils.java | 10 ++--- .../transformation/datastructure/Cache.java | 2 +- .../datastructure/SerializableList.java | 6 +-- .../iterator/ListForwardIterator.java | 2 +- .../iterator/RowListForwardIterator.java | 6 +-- .../iterator/TVListForwardIterator.java | 6 +-- .../row/ElasticSerializableRowList.java | 8 ++-- .../row/SerializableRowList.java | 8 ++-- .../tv/ElasticSerializableBinaryTVList.java | 8 ++-- .../tv/ElasticSerializableTVList.java | 6 +-- .../datastructure/tv/SerializableTVList.java | 8 ++-- .../datastructure/util/BinaryUtils.java | 2 +- .../org/apache/iotdb/db/conf/IoTDBConfig.java | 37 ------------------- .../apache/iotdb/db/conf/IoTDBDescriptor.java | 23 +++++++++--- .../aggregate/AggregateProcessor.java | 2 +- .../impl/DataNodeInternalRPCServiceImpl.java | 2 +- .../aggregation/UDAFAccumulator.java | 4 +- .../fragment/FragmentInstanceContext.java | 9 +++-- .../execution/operator/AggregationUtil.java | 2 +- .../operator/process/TransformOperator.java | 2 +- .../execution/schedule/DriverTaskThread.java | 4 +- .../plan/analyze/ExpressionAnalyzer.java | 4 +- .../executor/ClusterConfigTaskExecutor.java | 2 +- .../config/metadata/ShowFunctionsTask.java | 6 +-- .../plan/expression/Expression.java | 2 +- .../plan/expression/ExpressionFactory.java | 2 +- .../expression/binary/BinaryExpression.java | 2 +- .../plan/expression/leaf/LeafOperand.java | 2 +- .../expression/multi/FunctionExpression.java | 6 +-- .../other/CaseWhenThenExpression.java | 2 +- .../other/GroupByTimeExpression.java | 2 +- .../expression/ternary/TernaryExpression.java | 2 +- .../expression/unary/UnaryExpression.java | 2 +- .../visitor/ColumnTransformerVisitor.java | 2 +- .../visitor/IntermediateLayerVisitor.java | 2 +- .../optimization/AggregationPushDown.java | 2 +- .../db/queryengine/plan/udf/TreeUDFUtils.java | 1 + ...eRowRecordListBackedMultiColumnWindow.java | 2 +- ...rdListBackedMultiColumnWindowIterator.java | 2 +- ...rializableTVListBackedSingleColumnRow.java | 2 +- ...lizableTVListBackedSingleColumnWindow.java | 2 +- ...VListBackedSingleColumnWindowIterator.java | 2 +- .../dag/input/QueryDataSetInputLayer.java | 4 +- .../dag/intermediate/MultiInputLayer.java | 4 +- .../SingleInputMultiReferenceLayer.java | 4 +- .../SingleInputSingleReferenceLayer.java | 4 +- .../transformation/dag/memory/SafetyLine.java | 2 +- .../multi/MappableUDFQueryRowTransformer.java | 2 +- .../multi/UDFQueryRowTransformer.java | 2 +- .../multi/UDFQueryRowWindowTransformer.java | 2 +- .../multi/UDFQueryTransformer.java | 2 +- .../multi/UniversalUDFQueryTransformer.java | 6 +-- .../dag/udf/UDAFInformationInferrer.java | 3 +- .../transformation/dag/udf/UDTFContext.java | 1 + .../dag/udf/UDTFInformationInferrer.java | 3 +- .../dag/util/LayerCacheUtils.java | 4 +- .../org/apache/iotdb/db/service/DataNode.java | 2 +- .../TemporaryQueryDataFileService.java | 2 +- .../queryengine/execution/DataDriverTest.java | 6 +-- .../operator/OperatorMemoryTest.java | 6 +-- .../operator/SortOperatorSortBranchTest.java | 7 ++-- .../operator/TreeSortOperatorTest.java | 7 ++-- .../process/TableStreamSortOperatorTest.java | 14 +++---- .../tvf/TableFunctionOperatorTest.java | 2 +- .../relational/analyzer/TSBSMetadata.java | 2 +- .../relational/analyzer/TestMetadata.java | 2 +- .../ElasticSerializableRowListTest.java | 5 ++- .../ElasticSerializableTVListTest.java | 5 ++- .../datastructure/LRUCache.java | 2 + .../SerializableRowListTest.java | 2 +- .../datastructure/SerializableTVListTest.java | 2 +- .../iotdb/db/utils/EnvironmentUtils.java | 2 +- .../iotdb/db/utils/sort/SortUtilTest.java | 4 +- .../iotdb/commons/conf/CommonConfig.java | 37 +++++++++++++++++++ 89 files changed, 211 insertions(+), 189 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/execution/operator/process/function/PartitionRecognizer.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/udf/BuiltinAggregationFunction.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/udf/BuiltinScalarFunction.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/udf/BuiltinTimeSeriesGeneratingFunction.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/udf/UDFManagementService.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/plan/udf/UDTFForecast.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/adapter/PointCollectorAdaptor.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/udf/UDFParametersFactory.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/udf/UDTFExecutor.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/dag/util/InputRowUtils.java (82%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/datastructure/Cache.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/datastructure/SerializableList.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/datastructure/iterator/ListForwardIterator.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/datastructure/iterator/RowListForwardIterator.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/datastructure/iterator/TVListForwardIterator.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/datastructure/row/ElasticSerializableRowList.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/datastructure/row/SerializableRowList.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/datastructure/tv/ElasticSerializableTVList.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/datastructure/tv/SerializableTVList.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/transformation/datastructure/util/BinaryUtils.java (96%) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/OperatorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/OperatorContext.java index c754c053414db..a635a58aed82e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/OperatorContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/OperatorContext.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -46,7 +46,7 @@ public class OperatorContext implements Accountable { private static Duration maxRunTime = new Duration( - IoTDBDescriptor.getInstance().getConfig().getDriverTaskExecutionTimeSliceInMs(), + CommonDescriptor.getInstance().getConfig().getDriverTaskExecutionTimeSliceInMs(), TimeUnit.MILLISECONDS); private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java index 416899ab7480e..0c51fa0704c3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; -import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -95,7 +95,7 @@ public abstract class AbstractSortOperator implements ProcessOperator { this.sortBufferManager = new SortBufferManager( TSFileDescriptor.getInstance().getConfig().getMaxTsBlockSizeInBytes(), - IoTDBDescriptor.getInstance().getConfig().getSortBufferSize()); + CommonDescriptor.getInstance().getConfig().getSortBufferSize()); } protected void buildResult() throws IoTDBException { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/PartitionRecognizer.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/PartitionRecognizer.java index 55eb324b92fbb..985192d5d29c5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/function/PartitionRecognizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/PartitionRecognizer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.execution.operator.process.function; +package org.apache.iotdb.db.calc_commons.execution.operator.process.function; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java index 0b353a40d41ff..2a3c8e050c949 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java @@ -28,7 +28,6 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.PartitionRecognizer; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; import org.apache.iotdb.udf.api.relational.table.processor.TableFunctionDataProcessor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java index 79ae9ff129b8f..2ed8af01a068d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.PartitionRecognizer; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionCache; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.PartitionRecognizer; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/BuiltinAggregationFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinAggregationFunction.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/BuiltinAggregationFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinAggregationFunction.java index 2913ddf86db4e..8274e32bd30ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/BuiltinAggregationFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinAggregationFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.udf; +package org.apache.iotdb.db.calc_commons.plan.udf; import java.util.Arrays; import java.util.HashSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/BuiltinScalarFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinScalarFunction.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/BuiltinScalarFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinScalarFunction.java index f47b738cc89d1..8db1027bd39b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/BuiltinScalarFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinScalarFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.udf; +package org.apache.iotdb.db.calc_commons.plan.udf; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/BuiltinTimeSeriesGeneratingFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/BuiltinTimeSeriesGeneratingFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java index 533ab2d97ecc8..f085a3a17f626 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/BuiltinTimeSeriesGeneratingFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.udf; +package org.apache.iotdb.db.calc_commons.plan.udf; import org.apache.iotdb.commons.udf.builtin.String.UDTFConcat; import org.apache.iotdb.commons.udf.builtin.String.UDTFEndsWith; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/TableUDFUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/TableUDFUtils.java index a1e2a69ab7684..bf907cd049b06 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/TableUDFUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/TableUDFUtils.java @@ -22,7 +22,6 @@ import org.apache.iotdb.common.rpc.thrift.FunctionType; import org.apache.iotdb.common.rpc.thrift.Model; import org.apache.iotdb.commons.udf.UDFInformation; -import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.relational.AggregateFunction; import org.apache.iotdb.udf.api.relational.ScalarFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/UDFManagementService.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/UDFManagementService.java index f47ff93cf5ed2..a3534b8c9c818 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDFManagementService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/UDFManagementService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.udf; +package org.apache.iotdb.db.calc_commons.plan.udf; import org.apache.iotdb.common.rpc.thrift.Model; import org.apache.iotdb.commons.udf.UDFInformation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDTFForecast.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/UDTFForecast.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDTFForecast.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/UDTFForecast.java index efcc4c82eaa33..0b550d1573283 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/UDTFForecast.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/UDTFForecast.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.udf; +package org.apache.iotdb.db.calc_commons.plan.udf; import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/PointCollectorAdaptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/PointCollectorAdaptor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java index 8ffb0a5bf346c..ca13b14bc43b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/PointCollectorAdaptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.adapter; +package org.apache.iotdb.db.calc_commons.transformation.dag.adapter; import org.apache.iotdb.commons.udf.utils.UDFBinaryTransformer; import org.apache.iotdb.udf.api.collector.PointCollector; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java index d4254f6614ed2..4f4a4aa7df421 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDFParametersFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDFParametersFactory.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDFParametersFactory.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDFParametersFactory.java index 23dca86368272..71bc769d7c38c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDFParametersFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDFParametersFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.udf; +package org.apache.iotdb.db.calc_commons.transformation.dag.udf; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDTFExecutor.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFExecutor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDTFExecutor.java index f7a31fc00f190..f887e186e6b5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDTFExecutor.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.udf; +package org.apache.iotdb.db.calc_commons.transformation.dag.udf; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; -import org.apache.iotdb.db.queryengine.transformation.dag.adapter.PointCollectorAdaptor; -import org.apache.iotdb.db.queryengine.transformation.dag.util.InputRowUtils; -import org.apache.iotdb.db.queryengine.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.db.calc_commons.transformation.dag.adapter.PointCollectorAdaptor; +import org.apache.iotdb.db.calc_commons.transformation.dag.util.InputRowUtils; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.udf.api.UDTF; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowWindow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/InputRowUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/InputRowUtils.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/InputRowUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/InputRowUtils.java index 18682b17143d5..8d2ffde821829 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/InputRowUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/InputRowUtils.java @@ -17,9 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.dag.util; - -import org.apache.iotdb.db.queryengine.transformation.dag.input.IUDFInputDataSet; +package org.apache.iotdb.db.calc_commons.transformation.dag.util; public class InputRowUtils { @@ -31,7 +29,8 @@ private InputRowUtils() { * this method checks whether the row returned by IUDFInputDataSet.nextRowInObjects() has all null * fields except the timestamp * - * @param row the returned row by calling {@link IUDFInputDataSet#nextRowInObjects()} + * @param row the returned row by calling {@link + * org.apache.iotdb.db.queryengine.transformation.dag.input.IUDFInputDataSet#nextRowInObjects()} * @return true if all row fields are null. */ public static boolean isAllNull(Object[] row) { @@ -50,7 +49,8 @@ public static boolean isAllNull(Object[] row) { * this method checks whether the row returned by IUDFInputDataSet.nextRowInObjects() has any null * fields except the timestamp * - * @param row the returned row by calling {@link IUDFInputDataSet#nextRowInObjects()} + * @param row the returned row by calling {@link + * org.apache.iotdb.db.queryengine.transformation.dag.input.IUDFInputDataSet#nextRowInObjects()} * @return true if any row field is null. */ public static boolean hasNullField(Object[] row) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/Cache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/Cache.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/Cache.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/Cache.java index e9864fd21d647..264208dc2a328 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/Cache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/Cache.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.datastructure; +package org.apache.iotdb.db.calc_commons.transformation.datastructure; import java.util.LinkedHashMap; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableList.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/SerializableList.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableList.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/SerializableList.java index c6b7cee0f3afb..f957d9a0c533e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableList.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/SerializableList.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.datastructure; +package org.apache.iotdb.db.calc_commons.transformation.datastructure; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.service.TemporaryQueryDataFileService; import org.apache.tsfile.utils.PublicBAOS; @@ -33,7 +33,7 @@ public interface SerializableList { int INITIAL_BYTE_ARRAY_LENGTH_FOR_MEMORY_CONTROL = - IoTDBDescriptor.getInstance().getConfig().getUdfInitialByteArrayLengthForMemoryControl(); + CommonDescriptor.getInstance().getConfig().getUdfInitialByteArrayLengthForMemoryControl(); default void serialize() throws IOException { SerializationRecorder recorder = getSerializationRecorder(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/iterator/ListForwardIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/iterator/ListForwardIterator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java index 1a1bf942be9c4..d9fbf6551cb21 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/iterator/ListForwardIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.datastructure.iterator; +package org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/iterator/RowListForwardIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/iterator/RowListForwardIterator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java index ee9cf6aaeeffd..28a3421efd1a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/iterator/RowListForwardIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.datastructure.iterator; +package org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator; -import org.apache.iotdb.db.queryengine.transformation.datastructure.row.ElasticSerializableRowList; -import org.apache.iotdb.db.queryengine.transformation.datastructure.row.SerializableRowList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.SerializableRowList; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/iterator/TVListForwardIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/iterator/TVListForwardIterator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java index cd36f417ba759..d96262dd38ea9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/iterator/TVListForwardIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.datastructure.iterator; +package org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator; -import org.apache.iotdb.db.queryengine.transformation.datastructure.tv.ElasticSerializableTVList; -import org.apache.iotdb.db.queryengine.transformation.datastructure.tv.SerializableTVList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.SerializableTVList; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/row/ElasticSerializableRowList.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/row/ElasticSerializableRowList.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java index d3e2cecb7f5ac..34c5863cfe21f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/row/ElasticSerializableRowList.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.datastructure.row; +package org.apache.iotdb.db.calc_commons.transformation.datastructure.row; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.Cache; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.transformation.datastructure.Cache; -import org.apache.iotdb.db.queryengine.transformation.datastructure.SerializableList; -import org.apache.iotdb.db.queryengine.transformation.datastructure.iterator.RowListForwardIterator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/row/SerializableRowList.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/row/SerializableRowList.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/row/SerializableRowList.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/row/SerializableRowList.java index 3bacd1ac5e79a..b3f63ceb69bb0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/row/SerializableRowList.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/row/SerializableRowList.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.datastructure.row; +package org.apache.iotdb.db.calc_commons.transformation.datastructure.row; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.transformation.datastructure.SerializableList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; @@ -36,8 +36,8 @@ import java.util.List; import static org.apache.iotdb.commons.conf.IoTDBConstant.MB; -import static org.apache.iotdb.db.queryengine.transformation.datastructure.util.BinaryUtils.MIN_ARRAY_HEADER_SIZE; -import static org.apache.iotdb.db.queryengine.transformation.datastructure.util.BinaryUtils.MIN_OBJECT_HEADER_SIZE; +import static org.apache.iotdb.db.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_ARRAY_HEADER_SIZE; +import static org.apache.iotdb.db.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_OBJECT_HEADER_SIZE; public class SerializableRowList implements SerializableList { private final SerializationRecorder serializationRecorder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java index 098997fe0e77a..43fc2b06dc5c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.datastructure.tv; +package org.apache.iotdb.db.calc_commons.transformation.datastructure.tv; -import org.apache.iotdb.db.queryengine.transformation.datastructure.SerializableList; -import org.apache.iotdb.db.queryengine.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.db.queryengine.transformation.datastructure.util.BinaryUtils; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.util.BinaryUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/tv/ElasticSerializableTVList.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/tv/ElasticSerializableTVList.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java index f0d4e3dd174eb..c79c2936e5f32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/tv/ElasticSerializableTVList.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.datastructure.tv; +package org.apache.iotdb.db.calc_commons.transformation.datastructure.tv; -import org.apache.iotdb.db.queryengine.transformation.datastructure.Cache; -import org.apache.iotdb.db.queryengine.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.Cache; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/tv/SerializableTVList.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/SerializableTVList.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/tv/SerializableTVList.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/SerializableTVList.java index 57ac89f073a2f..758bd48c339f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/tv/SerializableTVList.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/SerializableTVList.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.datastructure.tv; +package org.apache.iotdb.db.calc_commons.transformation.datastructure.tv; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.queryengine.transformation.datastructure.SerializableList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; @@ -38,8 +38,8 @@ import static com.google.common.base.Preconditions.checkState; import static org.apache.iotdb.commons.conf.IoTDBConstant.MB; -import static org.apache.iotdb.db.queryengine.transformation.datastructure.util.BinaryUtils.MIN_ARRAY_HEADER_SIZE; -import static org.apache.iotdb.db.queryengine.transformation.datastructure.util.BinaryUtils.MIN_OBJECT_HEADER_SIZE; +import static org.apache.iotdb.db.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_ARRAY_HEADER_SIZE; +import static org.apache.iotdb.db.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_OBJECT_HEADER_SIZE; public class SerializableTVList implements SerializableList { protected final SerializationRecorder serializationRecorder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/util/BinaryUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/util/BinaryUtils.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/util/BinaryUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/util/BinaryUtils.java index 38092efef8e34..f0263b20db544 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/datastructure/util/BinaryUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/util/BinaryUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.transformation.datastructure.util; +package org.apache.iotdb.db.calc_commons.transformation.datastructure.util; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java index 31f446df27031..6d6556987bedd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java @@ -441,9 +441,6 @@ public class IoTDBConfig { /** Enable auto repair compaction */ private volatile boolean enableAutoRepairCompaction = true; - /** The buffer for sort operation */ - private long sortBufferSize = 32 * 1024 * 1024L; - /** The buffer for cte scan operation */ private long cteBufferSize = 128 * 1024L; @@ -813,12 +810,6 @@ public class IoTDBConfig { private boolean enable13DataInsertAdapt = false; - /** - * Used to estimate the memory usage of text fields in a UDF query. It is recommended to set this - * value to be slightly larger than the average length of all text records. - */ - private int udfInitialByteArrayLengthForMemoryControl = 48; - /** * How much memory may be used in ONE UDF query (in MB). * @@ -1031,9 +1022,6 @@ public class IoTDBConfig { private ReadConsistencyLevel readConsistencyLevel = ReadConsistencyLevel.STRONG; - /** Maximum execution time of a DriverTask */ - private int driverTaskExecutionTimeSliceInMs = 200; - /** Maximum size of wal buffer used in IoTConsensus. Unit: byte */ private long throttleThreshold = 200 * 1024 * 1024 * 1024L; @@ -1344,15 +1332,6 @@ public void setUdfCollectorMemoryBudgetInMB(float udfCollectorMemoryBudgetInMB) this.udfCollectorMemoryBudgetInMB = udfCollectorMemoryBudgetInMB; } - public int getUdfInitialByteArrayLengthForMemoryControl() { - return udfInitialByteArrayLengthForMemoryControl; - } - - public void setUdfInitialByteArrayLengthForMemoryControl( - int udfInitialByteArrayLengthForMemoryControl) { - this.udfInitialByteArrayLengthForMemoryControl = udfInitialByteArrayLengthForMemoryControl; - } - public int getDefaultFillInterval() { return defaultFillInterval; } @@ -3483,14 +3462,6 @@ public void setReadConsistencyLevel(String readConsistencyLevel) { } } - public int getDriverTaskExecutionTimeSliceInMs() { - return driverTaskExecutionTimeSliceInMs; - } - - public void setDriverTaskExecutionTimeSliceInMs(int driverTaskExecutionTimeSliceInMs) { - this.driverTaskExecutionTimeSliceInMs = driverTaskExecutionTimeSliceInMs; - } - public static String getEnvironmentVariables() { return "\n\t" + IoTDBConstant.IOTDB_HOME @@ -4255,14 +4226,6 @@ public void setRateLimiterType(String rateLimiterType) { RateLimiterType = rateLimiterType; } - public void setSortBufferSize(long sortBufferSize) { - this.sortBufferSize = sortBufferSize; - } - - public long getSortBufferSize() { - return sortBufferSize; - } - public void setCteBufferSize(long cteBufferSize) { this.cteBufferSize = cteBufferSize; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java index 5fad7697b9317..966a5bc99343a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java @@ -101,6 +101,7 @@ public class IoTDBDescriptor { private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBDescriptor.class); private static final CommonDescriptor commonDescriptor = CommonDescriptor.getInstance(); + private static final CommonConfig commonConfig = commonDescriptor.getConfig(); private static final IoTDBConfig conf = new IoTDBConfig(); private static final DataNodeMemoryConfig memoryConfig = new DataNodeMemoryConfig(); @@ -1050,7 +1051,12 @@ public void loadProperties(TrimProperties properties) throws BadNodeUrlException properties.getProperty("quota_enable", String.valueOf(conf.isQuotaEnable())))); // The buffer for sort operator to calculate - loadFixedSizeLimitForQuery(properties, "sort_buffer_size_in_bytes", conf::setSortBufferSize); + loadFixedSizeLimitForQuery( + properties, + "sort_buffer_size_in_bytes", + (v) -> { + commonDescriptor.getConfig().setSortBufferSize(v); + }); // The buffer for cte materialization. long cteBufferSizeInBytes = @@ -2246,7 +2252,10 @@ public synchronized void loadHotModifiedProps(TrimProperties properties) ConfigurationFileUtils.getConfigurationDefaultValue("tvlist_sort_threshold")))); // sort_buffer_size_in_bytes - loadFixedSizeLimitForQuery(properties, "sort_buffer_size_in_bytes", conf::setSortBufferSize); + loadFixedSizeLimitForQuery( + properties, + "sort_buffer_size_in_bytes", + v -> commonDescriptor.getConfig().setSortBufferSize(v)); loadFixedSizeLimitForQuery( properties, "mods_cache_size_limit_per_fi_in_bytes", conf::setModsCacheSizeLimitPerFI); @@ -2610,8 +2619,10 @@ private void loadUDFProps(TrimProperties properties) { String initialByteArrayLengthForMemoryControl = properties.getProperty("udf_initial_byte_array_length_for_memory_control"); if (initialByteArrayLengthForMemoryControl != null) { - conf.setUdfInitialByteArrayLengthForMemoryControl( - Integer.parseInt(initialByteArrayLengthForMemoryControl.trim())); + commonDescriptor + .getConfig() + .setUdfInitialByteArrayLengthForMemoryControl( + Integer.parseInt(initialByteArrayLengthForMemoryControl.trim())); } conf.setUdfDir(properties.getProperty("udf_lib_dir", conf.getUdfDir())); @@ -2820,11 +2831,11 @@ public void loadShuffleProps(TrimProperties properties) { properties.getProperty( "partition_cache_size", Integer.toString(conf.getPartitionCacheSize())))); - conf.setDriverTaskExecutionTimeSliceInMs( + commonConfig.setDriverTaskExecutionTimeSliceInMs( Integer.parseInt( properties.getProperty( "driver_task_execution_time_slice_in_ms", - Integer.toString(conf.getDriverTaskExecutionTimeSliceInMs())))); + Integer.toString(commonConfig.getDriverTaskExecutionTimeSliceInMs())))); } /** Get default encode algorithm by data type */ diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java index 43b099407805b..459dec3333191 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java @@ -29,6 +29,7 @@ import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskProcessorRuntimeEnvironment; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.utils.PathUtils; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.agent.plugin.dataregion.PipeDataRegionPluginAgent; import org.apache.iotdb.db.pipe.event.common.row.PipeResetTabletRow; @@ -42,7 +43,6 @@ import org.apache.iotdb.db.pipe.processor.aggregate.operator.processor.AbstractOperatorProcessor; import org.apache.iotdb.db.pipe.processor.aggregate.window.datastructure.WindowOutput; import org.apache.iotdb.db.pipe.processor.aggregate.window.processor.AbstractWindowingProcessor; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.pipe.api.PipeProcessor; import org.apache.iotdb.pipe.api.access.Row; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java index 299a3b7594e4d..40f168aeee9f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -100,6 +100,7 @@ import org.apache.iotdb.consensus.exception.ConsensusGroupNotExistException; import org.apache.iotdb.db.audit.DNAuditLogger; import org.apache.iotdb.db.auth.AuthorityChecker; +import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.DataRegionConsensusImpl; import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; @@ -183,7 +184,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.component.WhereCondition; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; -import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.db.schemaengine.SchemaEngine; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; 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/aggregation/UDAFAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java index d0f6dfa5ff90f..1a287b2e12dfb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.udf.api.State; import org.apache.iotdb.udf.api.UDAF; import org.apache.iotdb.udf.api.customizer.config.UDAFConfigurations; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java index c50c1720b23fb..41f23b6bbe9c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java @@ -21,6 +21,8 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.audit.UserEntity; +import org.apache.iotdb.commons.conf.CommonConfig; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.path.AlignedFullPath; @@ -91,6 +93,7 @@ public class FragmentInstanceContext extends QueryContext { private static final Logger LOGGER = LoggerFactory.getLogger(FragmentInstanceContext.class); private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig(); + private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig(); private static final long END_TIME_INITIAL_VALUE = -1L; // wait over 5s for driver to close is abnormal private static final long LONG_WAIT_DURATION = 5_000_000_000L; @@ -641,7 +644,7 @@ public boolean initQueryDataSource(List sourcePaths) throws QueryProc } } - long waitForLockTime = CONFIG.getDriverTaskExecutionTimeSliceInMs(); + long waitForLockTime = COMMON_CONFIG.getDriverTaskExecutionTimeSliceInMs(); long startAcquireLockTime = System.nanoTime(); if (dataRegion.tryReadLock(waitForLockTime)) { try { @@ -694,7 +697,7 @@ public boolean initRegionScanQueryDataSource(Map devic return true; } - long waitForLockTime = CONFIG.getDriverTaskExecutionTimeSliceInMs(); + long waitForLockTime = COMMON_CONFIG.getDriverTaskExecutionTimeSliceInMs(); if (dataRegion.tryReadLock(waitForLockTime)) { try { // minus already consumed time @@ -736,7 +739,7 @@ public boolean initRegionScanQueryDataSource(List pathList) { if (pathList == null) { return true; } - long waitForLockTime = CONFIG.getDriverTaskExecutionTimeSliceInMs(); + long waitForLockTime = COMMON_CONFIG.getDriverTaskExecutionTimeSliceInMs(); if (dataRegion.tryReadLock(waitForLockTime)) { // minus already consumed time waitForLockTime -= (System.nanoTime() - startTime) / 1_000_000; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java index 2df0be4c3394b..f40693cea6e5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.SingleTimeWindowIterator; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; -import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.statistics.StatisticsManager; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java index 60b92e9c76995..d6694a056e4d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java @@ -24,13 +24,13 @@ import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.builder.EvaluationDAGBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverTaskThread.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverTaskThread.java index 132c11dadc176..976d096c1ca18 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverTaskThread.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverTaskThread.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.concurrent.ThreadName; -import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.db.queryengine.execution.driver.IDriver; import org.apache.iotdb.db.queryengine.execution.schedule.queue.IndexedBlockingQueue; import org.apache.iotdb.db.queryengine.execution.schedule.queue.multilevelqueue.MultilevelPriorityQueue; @@ -40,7 +40,7 @@ public class DriverTaskThread extends AbstractDriverThread { private static final double DRIVER_TASK_EXECUTION_TIME_SLICE_IN_MS = - IoTDBDescriptor.getInstance().getConfig().getDriverTaskExecutionTimeSliceInMs(); + CommonDescriptor.getInstance().getConfig().getDriverTaskExecutionTimeSliceInMs(); /** * In multi-level feedback queue, levels with lower priority have longer time slices. Currently, 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 9a847a9ebd132..fb2aa51a3a602 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 @@ -24,6 +24,8 @@ 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.db.calc_commons.plan.udf.BuiltinScalarFunction; +import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; @@ -54,8 +56,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForPredicateVisitor; import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatExpressionWithSuffixPathsVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; -import org.apache.iotdb.db.queryengine.plan.udf.BuiltinScalarFunction; -import org.apache.iotdb.db.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.common.constant.TsFileConstant; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java index b67aff59b9cf2..bd3300019663a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java @@ -173,6 +173,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TStopPipeReq; import org.apache.iotdb.confignode.rpc.thrift.TThrottleQuotaResp; import org.apache.iotdb.confignode.rpc.thrift.TUnsetSchemaTemplateReq; +import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.BatchProcessException; import org.apache.iotdb.db.exception.StorageEngineException; @@ -312,7 +313,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.sys.quota.SetThrottleQuotaStatement; import org.apache.iotdb.db.queryengine.plan.statement.sys.quota.ShowSpaceQuotaStatement; import org.apache.iotdb.db.queryengine.plan.statement.sys.quota.ShowThrottleQuotaStatement; -import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.db.schemaengine.SchemaEngine; import org.apache.iotdb.db.schemaengine.rescon.DataNodeSchemaQuotaManager; import org.apache.iotdb.db.schemaengine.table.InformationSchemaUtils; 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 0feb6cda37a75..72bf03d56cb3f 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 @@ -26,6 +26,9 @@ import org.apache.iotdb.commons.udf.UDFType; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinScalarFunction; +import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; @@ -33,9 +36,6 @@ 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.udf.BuiltinAggregationFunction; -import org.apache.iotdb.db.queryengine.plan.udf.BuiltinScalarFunction; -import org.apache.iotdb.db.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.iotdb.db.queryengine.plan.udf.TreeUDFUtils; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java index cb0483d75d33a..fd18cd98ed398 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.expression; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; @@ -53,7 +54,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java index b45a90c5b8026..2d362fdbb1c1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java @@ -23,6 +23,7 @@ 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.db.calc_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; @@ -45,7 +46,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; -import org.apache.iotdb.db.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.TimeDuration; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java index 31a75b2825edb..2dd1188b91e90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.expression.binary; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java index f01051a5c388a..cda2fe0153d61 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.leaf; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java index 638bdc79a89af..9b847c46dbeb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java @@ -21,6 +21,9 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinScalarFunction; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.expression.multi.FunctionType; @@ -30,11 +33,8 @@ import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; -import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; -import org.apache.iotdb.db.queryengine.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.db.queryengine.plan.udf.TreeUDFUtils; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFInformationInferrer; import org.apache.iotdb.udf.api.customizer.strategy.AccessStrategy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java index 07023786cf0f0..d9bc16189495b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.other; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.leaf.NullOperand; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.external.commons.lang3.Validate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java index 4a68d7f01db25..d18eb56952b6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.expression.other; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java index 4db828bc4f1b1..921d873399caf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java @@ -21,12 +21,12 @@ package org.apache.iotdb.db.queryengine.plan.expression.ternary; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java index 50d673a564dcb..0f39aeb0e3014 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java index 02cc6f5882206..74e0a6ced9dda 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java @@ -49,6 +49,7 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LikeColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.RegularColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; @@ -70,7 +71,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; import org.apache.tsfile.common.regexp.LikePattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java index a7b11f2cfd293..6e4600cd8e50d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; @@ -72,7 +73,6 @@ import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.RegularTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.TransparentTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFContext; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.udf.api.customizer.strategy.AccessStrategy; import org.apache.tsfile.common.regexp.LikePattern; 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 6dac919560cc1..60818163d12cd 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 @@ -25,6 +25,7 @@ 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.db.calc_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -56,7 +57,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; -import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.schemaengine.schemaregion.utils.MetaUtils; import org.apache.iotdb.db.utils.SchemaUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java index f04cfe08a0aa1..c3bd93a215e79 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.udf; +import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.udf.api.UDAF; import org.apache.iotdb.udf.api.UDTF; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java index caf44ad66dd26..b5da95c395059 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.queryengine.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowIterator; import org.apache.iotdb.udf.api.access.RowWindow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindowIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindowIterator.java index 396b34f3f4008..cd73bd63b6fb1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindowIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindowIterator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; -import org.apache.iotdb.db.queryengine.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java index a6ab722245725..bc90f1fe91a0f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.udf.utils.UDFBinaryTransformer; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.queryengine.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.type.Binary; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java index 2aa00e1c8bbf5..bcb504eb1564e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.queryengine.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowIterator; import org.apache.iotdb.udf.api.access.RowWindow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindowIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindowIterator.java index 007f23499c68a..dc463600dd3a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindowIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindowIterator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; -import org.apache.iotdb.db.queryengine.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java index c42f3c8480b57..635515f620f30 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.transformation.dag.input; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.memory.SafetyLine; import org.apache.iotdb.db.queryengine.transformation.dag.memory.SafetyLine.SafetyPile; -import org.apache.iotdb.db.queryengine.transformation.datastructure.iterator.RowListForwardIterator; -import org.apache.iotdb.db.queryengine.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java index 78e0c7451b7c6..107b4bb200563 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; @@ -28,8 +30,6 @@ import org.apache.iotdb.db.queryengine.transformation.dag.input.IUDFInputDataSet; import org.apache.iotdb.db.queryengine.transformation.dag.util.LayerCacheUtils; import org.apache.iotdb.db.queryengine.transformation.datastructure.TVColumns; -import org.apache.iotdb.db.queryengine.transformation.datastructure.iterator.RowListForwardIterator; -import org.apache.iotdb.db.queryengine.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.db.utils.datastructure.TimeSelector; import org.apache.iotdb.udf.api.access.RowWindow; import org.apache.iotdb.udf.api.customizer.strategy.SessionTimeWindowAccessStrategy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java index 2bf5f2b3eb84d..8ee52ab1b6915 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; @@ -28,8 +30,6 @@ import org.apache.iotdb.db.queryengine.transformation.dag.memory.SafetyLine.SafetyPile; import org.apache.iotdb.db.queryengine.transformation.dag.util.LayerCacheUtils; import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; -import org.apache.iotdb.db.queryengine.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.db.queryengine.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.db.queryengine.transformation.datastructure.util.ValueRecorder; import org.apache.iotdb.udf.api.access.RowWindow; import org.apache.iotdb.udf.api.customizer.strategy.SessionTimeWindowAccessStrategy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java index e7d67c36349ce..5100a6de259cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; @@ -26,8 +28,6 @@ import org.apache.iotdb.db.queryengine.transformation.dag.adapter.ElasticSerializableTVListBackedSingleColumnWindow; import org.apache.iotdb.db.queryengine.transformation.dag.util.LayerCacheUtils; import org.apache.iotdb.db.queryengine.transformation.dag.util.TransformUtils; -import org.apache.iotdb.db.queryengine.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.db.queryengine.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.db.queryengine.transformation.datastructure.util.ValueRecorder; import org.apache.iotdb.udf.api.access.RowWindow; import org.apache.iotdb.udf.api.customizer.strategy.SessionTimeWindowAccessStrategy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/SafetyLine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/SafetyLine.java index e29038f061d54..5cca5d18bfddc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/SafetyLine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/SafetyLine.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.memory; -import org.apache.iotdb.db.queryengine.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; /** Tells the {@link ElasticSerializableTVList} if it is safe to remove a cache block. */ public class SafetyLine { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java index 43d04643a2013..af87afb441226 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.util.TypeUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowTransformer.java index d219332d0ad32..a7c25fcf57502 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.util.TypeUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java index b0b9a438c7765..117bf88654642 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.util.TypeUtils; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java index 7ba137fe356f2..1cb8a4d498555 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.util.TypeUtils; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java index 69e879656ddc2..b600df63a6b4a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; -import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.db.queryengine.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.db.queryengine.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java index 9df49931bc8bd..f31e9dbdc355f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java @@ -20,8 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; +import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.udf.api.UDAF; import org.apache.iotdb.udf.api.customizer.config.UDAFConfigurations; import org.apache.iotdb.udf.api.customizer.parameter.UDFParameterValidator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java index 771ecbd9b96ad..8c37045c1246d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.service.TemporaryQueryDataFileService; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java index 08b1e11c653ae..b8d75f6ed6563 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java @@ -20,8 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; +import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.udf.api.UDTF; import org.apache.iotdb.udf.api.customizer.config.UDTFConfigurations; import org.apache.iotdb.udf.api.customizer.parameter.UDFParameterValidator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java index e63b01403c255..6eec37adc3777 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.input.IUDFInputDataSet; -import org.apache.iotdb.db.queryengine.transformation.datastructure.row.ElasticSerializableRowList; -import org.apache.iotdb.db.queryengine.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java index 7004d09872db5..f042e56f45ba5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java @@ -70,6 +70,7 @@ import org.apache.iotdb.consensus.common.Peer; import org.apache.iotdb.db.audit.DNAuditLogger; import org.apache.iotdb.db.auth.AuthorityChecker; +import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.conf.DataNodeStartupCheck; import org.apache.iotdb.db.conf.DataNodeSystemPropertiesHandler; import org.apache.iotdb.db.conf.IoTDBConfig; @@ -95,7 +96,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.distribution.DistributionPlanContext; import org.apache.iotdb.db.queryengine.plan.planner.distribution.SourceRewriter; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; -import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.db.schemaengine.SchemaEngine; import org.apache.iotdb.db.schemaengine.schemaregion.attribute.update.GeneralRegionAttributeSecurityService; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java index c8150ea929588..1f789468ad7da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.file.SystemFileFactory; import org.apache.iotdb.commons.service.IService; import org.apache.iotdb.commons.service.ServiceType; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList.SerializationRecorder; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.queryengine.transformation.datastructure.SerializableList.SerializationRecorder; import org.apache.tsfile.external.commons.io.FileUtils; import org.slf4j.Logger; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java index 9f05490296cdf..1968a2436e5ca 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; @@ -91,12 +91,12 @@ public class DataDriverTest { private static final Duration EXECUTION_TIME_SLICE = new Duration( - IoTDBDescriptor.getInstance().getConfig().getDriverTaskExecutionTimeSliceInMs(), + CommonDescriptor.getInstance().getConfig().getDriverTaskExecutionTimeSliceInMs(), TimeUnit.MILLISECONDS); @Before public void setUp() throws MetadataException, IOException, WriteProcessException { - IoTDBDescriptor.getInstance().getConfig().setDriverTaskExecutionTimeSliceInMs(10000); + CommonDescriptor.getInstance().getConfig().setDriverTaskExecutionTimeSliceInMs(10000); SeriesReaderTestUtil.setUp( measurementSchemas, deviceIds, seqResources, unSeqResources, DATA_DRIVER_TEST_SG); } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index 8ae12c07ef5be..20e66401667c7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -20,6 +20,7 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.IFullPath; @@ -37,7 +38,6 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; -import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -530,13 +530,13 @@ public void sortOperatorTest() { null); assertEquals( - 2048 + 512 + IoTDBDescriptor.getInstance().getConfig().getSortBufferSize(), + 2048 + 512 + CommonDescriptor.getInstance().getConfig().getSortBufferSize(), treeSortOperator.calculateMaxPeekMemory()); assertEquals( TSFileDescriptor.getInstance().getConfig().getMaxTsBlockSizeInBytes(), treeSortOperator.calculateMaxReturnSize()); assertEquals( - 512 + IoTDBDescriptor.getInstance().getConfig().getSortBufferSize(), + 512 + CommonDescriptor.getInstance().getConfig().getSortBufferSize(), treeSortOperator.calculateRetainedSizeAfterCallingNext()); } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java index 62bdfe1cbf2fe..0b36fb00c44c9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; @@ -75,10 +76,10 @@ public class SortOperatorSortBranchTest { public void setUp() throws MetadataException, IOException, WriteProcessException { dataNodeId = IoTDBDescriptor.getInstance().getConfig().getDataNodeId(); maxTsBlockSizeInBytes = TSFileDescriptor.getInstance().getConfig().getMaxTsBlockSizeInBytes(); - sortBufferSize = IoTDBDescriptor.getInstance().getConfig().getSortBufferSize(); + sortBufferSize = CommonDescriptor.getInstance().getConfig().getSortBufferSize(); IoTDBDescriptor.getInstance().getConfig().setDataNodeId(0); TSFileDescriptor.getInstance().getConfig().setMaxTsBlockSizeInBytes(15); - IoTDBDescriptor.getInstance().getConfig().setSortBufferSize(150); + CommonDescriptor.getInstance().getConfig().setSortBufferSize(150); } @After @@ -86,7 +87,7 @@ public void tearDown() throws IOException { cleanDir(sortDir); IoTDBDescriptor.getInstance().getConfig().setDataNodeId(dataNodeId); TSFileDescriptor.getInstance().getConfig().setMaxTsBlockSizeInBytes(maxTsBlockSizeInBytes); - IoTDBDescriptor.getInstance().getConfig().setSortBufferSize(sortBufferSize); + CommonDescriptor.getInstance().getConfig().setSortBufferSize(sortBufferSize); } private SortOperator genSortOperator() { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java index 27ac251273238..11e35fdd0cc9a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; @@ -237,8 +238,8 @@ long getValue(long expectedTime) { // with data spilling @Test public void sortOperatorSpillingTest() throws Exception { - IoTDBDescriptor.getInstance().getConfig().setSortBufferSize(5000); - long sortBufferSize = IoTDBDescriptor.getInstance().getConfig().getSortBufferSize(); + CommonDescriptor.getInstance().getConfig().setSortBufferSize(5000); + long sortBufferSize = CommonDescriptor.getInstance().getConfig().getSortBufferSize(); try (TreeSortOperator root = (TreeSortOperator) genSortOperator(Ordering.ASC, true)) { int lastValue = -1; int count = 0; @@ -258,7 +259,7 @@ public void sortOperatorSpillingTest() throws Exception { } assertEquals(500, count); } finally { - IoTDBDescriptor.getInstance().getConfig().setSortBufferSize(sortBufferSize); + CommonDescriptor.getInstance().getConfig().setSortBufferSize(sortBufferSize); } } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java index d5ec53397ecda..238fa37c94d65 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.TableStreamSortOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -241,10 +241,10 @@ public void allInMemoryTes2() { @Test public void someInDiskTest() { - long sortBufferSize = IoTDBDescriptor.getInstance().getConfig().getSortBufferSize(); + long sortBufferSize = CommonDescriptor.getInstance().getConfig().getSortBufferSize(); int maxTsBlockSizeInBytes = TSFileDescriptor.getInstance().getConfig().getMaxTsBlockSizeInBytes(); - IoTDBDescriptor.getInstance().getConfig().setSortBufferSize(510); + CommonDescriptor.getInstance().getConfig().setSortBufferSize(510); TSFileDescriptor.getInstance().getConfig().setMaxTsBlockSizeInBytes(50); try (TableStreamSortOperator tableStreamSortOperator = genStreamSortOperator(1000)) { int count = 0; @@ -282,18 +282,18 @@ public void someInDiskTest() { e.printStackTrace(); fail(e.getMessage()); } finally { - IoTDBDescriptor.getInstance().getConfig().setSortBufferSize(sortBufferSize); + CommonDescriptor.getInstance().getConfig().setSortBufferSize(sortBufferSize); TSFileDescriptor.getInstance().getConfig().setMaxTsBlockSizeInBytes(maxTsBlockSizeInBytes); } } @Test public void someInDiskTest2() { - long sortBufferSize = IoTDBDescriptor.getInstance().getConfig().getSortBufferSize(); + long sortBufferSize = CommonDescriptor.getInstance().getConfig().getSortBufferSize(); int maxTsBlockSizeInBytes = TSFileDescriptor.getInstance().getConfig().getMaxTsBlockSizeInBytes(); int maxTsBlockLineNumber = TSFileDescriptor.getInstance().getConfig().getMaxTsBlockLineNumber(); - IoTDBDescriptor.getInstance().getConfig().setSortBufferSize(1000); + CommonDescriptor.getInstance().getConfig().setSortBufferSize(1000); TSFileDescriptor.getInstance().getConfig().setMaxTsBlockSizeInBytes(100); TSFileDescriptor.getInstance().getConfig().setMaxTsBlockLineNumber(2); try (TableStreamSortOperator tableStreamSortOperator = genStreamSortOperator(2)) { @@ -333,7 +333,7 @@ public void someInDiskTest2() { e.printStackTrace(); fail(e.getMessage()); } finally { - IoTDBDescriptor.getInstance().getConfig().setSortBufferSize(sortBufferSize); + CommonDescriptor.getInstance().getConfig().setSortBufferSize(sortBufferSize); TSFileDescriptor.getInstance().getConfig().setMaxTsBlockSizeInBytes(maxTsBlockSizeInBytes); TSFileDescriptor.getInstance().getConfig().setMaxTsBlockLineNumber(maxTsBlockLineNumber); } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java index 035eeb9270e80..ce6ce3d01b26a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.process.function.PartitionRecognizer; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; -import org.apache.iotdb.db.queryengine.execution.operator.process.function.PartitionRecognizer; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java index 2eedf5c62e450..6edb04d7ca85b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; @@ -46,7 +47,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.mpp.rpc.thrift.TRegionRouteReq; import org.apache.iotdb.udf.api.relational.TableFunction; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index 83ce87c2fe1d2..87b84356baf8a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; +import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; @@ -59,7 +60,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.TreeDeviceViewSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; -import org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.schemaengine.table.InformationSchemaUtils; import org.apache.iotdb.mpp.rpc.thrift.TRegionRouteReq; import org.apache.iotdb.udf.api.relational.TableFunction; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java index 0544f18d4b6f5..8d3f6a10fc800 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java @@ -19,9 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.queryengine.transformation.datastructure.iterator.RowListForwardIterator; -import org.apache.iotdb.db.queryengine.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableTVListTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableTVListTest.java index 148d34f54d679..c09b656a7895a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableTVListTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableTVListTest.java @@ -19,8 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; -import org.apache.iotdb.db.queryengine.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.db.queryengine.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/LRUCache.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/LRUCache.java index 8db52008a41c6..6d20e2c6ba8ec 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/LRUCache.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/LRUCache.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.Cache; + import java.util.Arrays; public class LRUCache extends Cache { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableRowListTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableRowListTest.java index 266623373e3dc..7a453b1f67f6d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableRowListTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableRowListTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; -import org.apache.iotdb.db.queryengine.transformation.datastructure.row.SerializableRowList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.SerializableRowList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableTVListTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableTVListTest.java index bf3f566be7db8..5b354833d0bf3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableTVListTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableTVListTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; -import org.apache.iotdb.db.queryengine.transformation.datastructure.tv.SerializableTVList; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.SerializableTVList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java index 16cb7bd732721..a55017a14858d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java @@ -22,13 +22,13 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.StartupException; +import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; -import org.apache.iotdb.db.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.db.schemaengine.SchemaEngine; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.db.storageengine.buffer.BloomFilterCache; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java index dbe51988245c6..c3475eaa03f63 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.utils.sort; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.utils.FileUtils; -import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -98,7 +98,7 @@ public void diskSortTest() { SortBufferManager sortBufferManager = new SortBufferManager( TSFileDescriptor.getInstance().getConfig().getMaxTsBlockSizeInBytes(), - IoTDBDescriptor.getInstance().getConfig().getSortBufferSize()); + CommonDescriptor.getInstance().getConfig().getSortBufferSize()); try { sortBufferManager.allocateOneSortBranch(); diskSpiller.spillSortedData(sortKeyList); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java index dcf5e36ea58e7..222dd1fce59db 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java @@ -489,6 +489,18 @@ public class CommonConfig { private int pathLogMaxSize = 100; private boolean restrictObjectLimit = false; + /** + * Used to estimate the memory usage of text fields in a UDF query. It is recommended to set this + * value to be slightly larger than the average length of all text records. + */ + private int udfInitialByteArrayLengthForMemoryControl = 48; + + /** The buffer for sort operation */ + private long sortBufferSize = 32 * 1024 * 1024L; + + /** Maximum execution time of a DriverTask */ + private int driverTaskExecutionTimeSliceInMs = 200; + CommonConfig() { // Empty constructor } @@ -2856,4 +2868,29 @@ public boolean isRestrictObjectLimit() { public void setRestrictObjectLimit(boolean restrictObjectLimit) { this.restrictObjectLimit = restrictObjectLimit; } + + public int getUdfInitialByteArrayLengthForMemoryControl() { + return udfInitialByteArrayLengthForMemoryControl; + } + + public void setUdfInitialByteArrayLengthForMemoryControl( + int udfInitialByteArrayLengthForMemoryControl) { + this.udfInitialByteArrayLengthForMemoryControl = udfInitialByteArrayLengthForMemoryControl; + } + + public void setSortBufferSize(long sortBufferSize) { + this.sortBufferSize = sortBufferSize; + } + + public long getSortBufferSize() { + return sortBufferSize; + } + + public int getDriverTaskExecutionTimeSliceInMs() { + return driverTaskExecutionTimeSliceInMs; + } + + public void setDriverTaskExecutionTimeSliceInMs(int driverTaskExecutionTimeSliceInMs) { + this.driverTaskExecutionTimeSliceInMs = driverTaskExecutionTimeSliceInMs; + } } From 02bc3f281612eca75ed5bbf5cfac6918f56ae44f Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 20 Apr 2026 10:09:41 +0800 Subject: [PATCH 35/45] move TemporaryQueryDataFileService --- .../confignode/conf/ConfigNodeConfig.java | 2 + .../aggregation/TableModeAccumulator.java | 4 +- .../grouped/GroupedModeAccumulator.java | 4 +- .../relational/ColumnTransformerBuilder.java | 6 +- .../datastructure/SerializableList.java | 4 +- .../org/apache/iotdb/db/conf/IoTDBConfig.java | 11 +- .../apache/iotdb/db/conf/IoTDBDescriptor.java | 9 +- ...AbstractTemporaryQueryDataFileService.java | 149 ++++++++++++++++++ ...TemporaryQueryDataFileServiceProvider.java | 25 +++ .../transformation/dag/udf/UDTFContext.java | 4 +- .../org/apache/iotdb/db/service/DataNode.java | 3 +- ...TemporaryQueryDataFileServiceProvider.java | 32 ++++ .../TemporaryQueryDataFileService.java | 105 +----------- ...ice.ITemporaryQueryDataFileServiceProvider | 1 + .../iotdb/commons/conf/CommonConfig.java | 20 +++ 15 files changed, 252 insertions(+), 127 deletions(-) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/service/AbstractTemporaryQueryDataFileService.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/service/ITemporaryQueryDataFileServiceProvider.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java create mode 100644 iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.service.ITemporaryQueryDataFileServiceProvider diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java index 59b318a4b11e9..3f92340d43160 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java @@ -24,6 +24,7 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.client.property.ClientPoolProperty.DefaultProperty; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.confignode.manager.load.balancer.RegionBalancer; import org.apache.iotdb.confignode.manager.load.balancer.router.leader.AbstractLeaderBalancer; @@ -377,6 +378,7 @@ public int getConfigNodeId() { public void setConfigNodeId(int configNodeId) { this.configNodeId = configNodeId; + CommonDescriptor.getInstance().getConfig().setNodeId(configNodeId); } public String getInternalAddress() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java index 01c3609d1580f..59e240c9bfea3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -44,7 +44,7 @@ public class TableModeAccumulator implements TableAccumulator { private final int MAP_SIZE_THRESHOLD = - IoTDBDescriptor.getInstance().getConfig().getModeMapSizeThreshold(); + CommonDescriptor.getInstance().getConfig().getModeMapSizeThreshold(); private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(TableModeAccumulator.class); private final TSDataType seriesDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java index 6697117e3bcc1..0bdc0755dbf39 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.MapBigArray; -import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -48,7 +48,7 @@ public class GroupedModeAccumulator implements GroupedAccumulator { private final int MAP_SIZE_THRESHOLD = - IoTDBDescriptor.getInstance().getConfig().getModeMapSizeThreshold(); + CommonDescriptor.getInstance().getConfig().getModeMapSizeThreshold(); private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(GroupedModeAccumulator.class); private final TSDataType seriesDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java index 0f287136560d7..5dfba31844956 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.calc_commons.execution.relational; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.plan.relational.metadata.ITypeMetadata; @@ -146,7 +147,6 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.UpperColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; -import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.analyze.ITableTypeProvider; @@ -1493,8 +1493,8 @@ private ColumnTransformer getFunctionColumnTransformer( } throw new IllegalArgumentException( String.format( - "Unknown function %s on DataNode: %d.", - functionName, IoTDBDescriptor.getInstance().getConfig().getDataNodeId())); + "Unknown function %s on Node: %d.", + functionName, CommonDescriptor.getInstance().getConfig().getNodeId())); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/SerializableList.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/SerializableList.java index f957d9a0c533e..7f43cdf29cec5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/SerializableList.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/SerializableList.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.db.service.TemporaryQueryDataFileService; +import org.apache.iotdb.db.node_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.tsfile.utils.PublicBAOS; @@ -129,7 +129,7 @@ public int getSerializedElementSize() { public RandomAccessFile getFile() throws IOException { if (file == null) { if (fileName == null) { - fileName = TemporaryQueryDataFileService.getInstance().register(this); + fileName = AbstractTemporaryQueryDataFileService.getInstance().register(this); } file = new RandomAccessFile(SystemFileFactory.INSTANCE.getFile(fileName), "rw"); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java index 6d6556987bedd..d147e39c65948 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java @@ -340,8 +340,6 @@ public class IoTDBConfig { private int mergeThresholdOfExplainAnalyze = 10; - private int modeMapSizeThreshold = 10000; - /** How many queries can be concurrently executed. When <= 0, use 1000. */ private int maxAllowedConcurrentQueries = 1000; @@ -3241,6 +3239,7 @@ public int getDataNodeId() { public void setDataNodeId(int dataNodeId) { this.dataNodeId = dataNodeId; + CommonDescriptor.getInstance().getConfig().setNodeId(dataNodeId); } public int getPartitionCacheSize() { @@ -3864,14 +3863,6 @@ public void setCandidateCompactionTaskQueueSize(int candidateCompactionTaskQueue this.candidateCompactionTaskQueueSize = candidateCompactionTaskQueueSize; } - public void setModeMapSizeThreshold(int modeMapSizeThreshold) { - this.modeMapSizeThreshold = modeMapSizeThreshold; - } - - public int getModeMapSizeThreshold() { - return modeMapSizeThreshold; - } - public double getMaxAllocateMemoryRatioForLoad() { return maxAllocateMemoryRatioForLoad; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java index 966a5bc99343a..e65b96d29ee01 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java @@ -538,13 +538,14 @@ public void loadProperties(TrimProperties properties) throws BadNodeUrlException "merge_threshold_of_explain_analyze", Integer.toString(conf.getMergeThresholdOfExplainAnalyze())))); - conf.setModeMapSizeThreshold( + commonConfig.setModeMapSizeThreshold( Integer.parseInt( properties.getProperty( - "mode_map_size_threshold", Integer.toString(conf.getModeMapSizeThreshold())))); + "mode_map_size_threshold", + Integer.toString(commonConfig.getModeMapSizeThreshold())))); - if (conf.getModeMapSizeThreshold() <= 0) { - conf.setModeMapSizeThreshold(10000); + if (commonConfig.getModeMapSizeThreshold() <= 0) { + commonConfig.setModeMapSizeThreshold(10000); } conf.setMaxAllowedConcurrentQueries( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/service/AbstractTemporaryQueryDataFileService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/service/AbstractTemporaryQueryDataFileService.java new file mode 100644 index 0000000000000..9776a5bdeeae6 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/service/AbstractTemporaryQueryDataFileService.java @@ -0,0 +1,149 @@ +/* + * 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.node_commons.service; + +import org.apache.iotdb.commons.exception.StartupException; +import org.apache.iotdb.commons.file.SystemFileFactory; +import org.apache.iotdb.commons.service.IService; +import org.apache.iotdb.commons.service.ServiceType; +import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList.SerializationRecorder; + +import org.apache.tsfile.external.commons.io.FileUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.ServiceLoader; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicLong; + +public abstract class AbstractTemporaryQueryDataFileService implements IService { + + private static final Logger logger = + LoggerFactory.getLogger(AbstractTemporaryQueryDataFileService.class); + private static final AbstractTemporaryQueryDataFileService INSTANCE = loadService(); + + private final AtomicLong uniqueDataId = new AtomicLong(0); + private final Map> recorders = new ConcurrentHashMap<>(); + + public static AbstractTemporaryQueryDataFileService getInstance() { + return INSTANCE; + } + + private static AbstractTemporaryQueryDataFileService loadService() { + AbstractTemporaryQueryDataFileService service = null; + ServiceLoader loader = + ServiceLoader.load(ITemporaryQueryDataFileServiceProvider.class); + for (ITemporaryQueryDataFileServiceProvider provider : loader) { + if (service != null) { + throw new IllegalStateException("Multiple ITemporaryQueryDataFileServiceProvider found"); + } + service = provider.getService(); + } + if (service == null) { + throw new IllegalStateException("No ITemporaryQueryDataFileServiceProvider found"); + } + return service; + } + + protected abstract String getTemporaryFileDir(); + + public String register(SerializationRecorder recorder) throws IOException { + String queryId = recorder.getQueryId(); + recorders + .computeIfAbsent(queryId, k -> Collections.synchronizedList(new ArrayList<>())) + .add(recorder); + + String dirName = getDirName(queryId); + makeDirIfNecessary(dirName); + return getFileName(dirName, uniqueDataId.getAndIncrement()); + } + + public void deregister(String queryId) { + List recorderList = recorders.remove(queryId); + if (recorderList == null) { + return; + } + for (SerializationRecorder recorder : recorderList) { + try { + recorder.closeFile(); + } catch (IOException e) { + logger.warn( + String.format("Failed to close file in method deregister(%s), because %s", queryId, e)); + } + } + try { + FileUtils.deleteDirectory(SystemFileFactory.INSTANCE.getFile(getDirName(queryId))); + } catch (IOException e) { + logger.warn( + String.format("Failed to clean dir in method deregister(%s), because %s", queryId, e)); + } + } + + private void makeDirIfNecessary(String dir) throws IOException { + File file = SystemFileFactory.INSTANCE.getFile(dir); + if (file.exists() && file.isDirectory()) { + return; + } + FileUtils.forceMkdir(file); + } + + private String getDirName(String queryId) { + return getTemporaryFileDir() + File.separator + queryId + File.separator; + } + + private String getFileName(String dir, long index) { + return dir + index; + } + + @Override + public void start() throws StartupException { + try { + // Clean up stale temp directories left from previous runs (e.g., after a crash) + File tmpDir = SystemFileFactory.INSTANCE.getFile(getTemporaryFileDir()); + if (tmpDir.exists()) { + FileUtils.deleteDirectory(tmpDir); + } + makeDirIfNecessary(getTemporaryFileDir()); + } catch (IOException e) { + throw new StartupException(e); + } + } + + @Override + public void stop() { + recorders.clear(); + try { + FileUtils.deleteDirectory(SystemFileFactory.INSTANCE.getFile(getTemporaryFileDir())); + } catch (IOException e) { + logger.warn("Failed to delete temp dir {}.", getTemporaryFileDir(), e); + } + } + + @Override + public ServiceType getID() { + return ServiceType.TEMPORARY_QUERY_DATA_FILE_SERVICE; + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/service/ITemporaryQueryDataFileServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/service/ITemporaryQueryDataFileServiceProvider.java new file mode 100644 index 0000000000000..204825a557346 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/service/ITemporaryQueryDataFileServiceProvider.java @@ -0,0 +1,25 @@ +/* + * 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.node_commons.service; + +public interface ITemporaryQueryDataFileServiceProvider { + + AbstractTemporaryQueryDataFileService getService(); +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java index 8c37045c1246d..5cd7c56a8b306 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.db.node_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.service.TemporaryQueryDataFileService; import java.time.ZoneId; import java.util.HashMap; @@ -53,7 +53,7 @@ public void finalizeUDFExecutors(String queryId) { } finally { UDFClassLoaderManager.getInstance().finalizeUDFQuery(queryId); // close and delete UDF temp files - TemporaryQueryDataFileService.getInstance().deregister(queryId); + AbstractTemporaryQueryDataFileService.getInstance().deregister(queryId); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java index f042e56f45ba5..ae506274aca99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java @@ -78,6 +78,7 @@ import org.apache.iotdb.db.conf.IoTDBStartCheck; import org.apache.iotdb.db.consensus.DataRegionConsensusImpl; import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; +import org.apache.iotdb.db.node_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; @@ -995,7 +996,7 @@ private boolean isUsingIoTConsensusV2() { } private void registerUdfServices() throws StartupException { - registerManager.register(TemporaryQueryDataFileService.getInstance()); + registerManager.register(AbstractTemporaryQueryDataFileService.getInstance()); registerManager.register(UDFClassLoaderManager.setupAndGetInstance(config.getUdfDir())); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java new file mode 100644 index 0000000000000..ce4f49be03a21 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java @@ -0,0 +1,32 @@ +/* + * 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.service; + +import org.apache.iotdb.db.node_commons.service.AbstractTemporaryQueryDataFileService; +import org.apache.iotdb.db.node_commons.service.ITemporaryQueryDataFileServiceProvider; + +public class DataNodeTemporaryQueryDataFileServiceProvider + implements ITemporaryQueryDataFileServiceProvider { + + @Override + public AbstractTemporaryQueryDataFileService getService() { + return TemporaryQueryDataFileService.getInstance(); + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java index 1f789468ad7da..d9e05143a89aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java @@ -19,29 +19,12 @@ package org.apache.iotdb.db.service; -import org.apache.iotdb.commons.exception.StartupException; -import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.commons.service.IService; -import org.apache.iotdb.commons.service.ServiceType; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList.SerializationRecorder; import org.apache.iotdb.db.conf.IoTDBDescriptor; - -import org.apache.tsfile.external.commons.io.FileUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.iotdb.db.node_commons.service.AbstractTemporaryQueryDataFileService; import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicLong; - -public class TemporaryQueryDataFileService implements IService { - private static final Logger logger = LoggerFactory.getLogger(TemporaryQueryDataFileService.class); +public class TemporaryQueryDataFileService extends AbstractTemporaryQueryDataFileService { private static final String TEMPORARY_FILE_DIR = IoTDBDescriptor.getInstance().getConfig().getSystemDir() @@ -50,89 +33,9 @@ public class TemporaryQueryDataFileService implements IService { + File.separator + "tmp"; - private final AtomicLong uniqueDataId; - private final Map> recorders; - - private TemporaryQueryDataFileService() { - uniqueDataId = new AtomicLong(0); - recorders = new ConcurrentHashMap<>(); - } - - public String register(SerializationRecorder recorder) throws IOException { - String queryId = recorder.getQueryId(); - recorders - .computeIfAbsent(queryId, k -> Collections.synchronizedList(new ArrayList<>())) - .add(recorder); - - String dirName = getDirName(queryId); - makeDirIfNecessary(dirName); - return getFileName(dirName, uniqueDataId.getAndIncrement()); - } - - public void deregister(String queryId) { - List recorderList = recorders.remove(queryId); - if (recorderList == null) { - return; - } - for (SerializationRecorder recorder : recorderList) { - try { - recorder.closeFile(); - } catch (IOException e) { - logger.warn( - String.format("Failed to close file in method deregister(%s), because %s", queryId, e)); - } - } - try { - FileUtils.deleteDirectory(SystemFileFactory.INSTANCE.getFile(getDirName(queryId))); - } catch (IOException e) { - logger.warn( - String.format("Failed to clean dir in method deregister(%s), because %s", queryId, e)); - } - } - - private void makeDirIfNecessary(String dir) throws IOException { - File file = SystemFileFactory.INSTANCE.getFile(dir); - if (file.exists() && file.isDirectory()) { - return; - } - FileUtils.forceMkdir(file); - } - - private String getDirName(String queryId) { - return TEMPORARY_FILE_DIR + File.separator + queryId + File.separator; - } - - private String getFileName(String dir, long index) { - return dir + index; - } - - @Override - public void start() throws StartupException { - try { - // Clean up stale temp directories left from previous runs (e.g., after a crash) - File tmpDir = SystemFileFactory.INSTANCE.getFile(TEMPORARY_FILE_DIR); - if (tmpDir.exists()) { - FileUtils.deleteDirectory(tmpDir); - } - makeDirIfNecessary(TEMPORARY_FILE_DIR); - } catch (IOException e) { - throw new StartupException(e); - } - } - - @Override - public void stop() { - recorders.clear(); - try { - FileUtils.deleteDirectory(SystemFileFactory.INSTANCE.getFile(TEMPORARY_FILE_DIR)); - } catch (IOException e) { - logger.warn("Failed to delete temp dir {}.", TEMPORARY_FILE_DIR, e); - } - } - @Override - public ServiceType getID() { - return ServiceType.TEMPORARY_QUERY_DATA_FILE_SERVICE; + protected String getTemporaryFileDir() { + return TEMPORARY_FILE_DIR; } public static TemporaryQueryDataFileService getInstance() { diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.service.ITemporaryQueryDataFileServiceProvider b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.service.ITemporaryQueryDataFileServiceProvider new file mode 100644 index 0000000000000..dbe0c7ff4d8d5 --- /dev/null +++ b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.service.ITemporaryQueryDataFileServiceProvider @@ -0,0 +1 @@ +org.apache.iotdb.db.service.DataNodeTemporaryQueryDataFileServiceProvider diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java index 222dd1fce59db..7af2e2738e0fc 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java @@ -501,6 +501,10 @@ public class CommonConfig { /** Maximum execution time of a DriverTask */ private int driverTaskExecutionTimeSliceInMs = 200; + private int modeMapSizeThreshold = 10000; + + private int nodeId = -1; + CommonConfig() { // Empty constructor } @@ -2893,4 +2897,20 @@ public int getDriverTaskExecutionTimeSliceInMs() { public void setDriverTaskExecutionTimeSliceInMs(int driverTaskExecutionTimeSliceInMs) { this.driverTaskExecutionTimeSliceInMs = driverTaskExecutionTimeSliceInMs; } + + public void setModeMapSizeThreshold(int modeMapSizeThreshold) { + this.modeMapSizeThreshold = modeMapSizeThreshold; + } + + public int getModeMapSizeThreshold() { + return modeMapSizeThreshold; + } + + public void setNodeId(int nodeId) { + this.nodeId = nodeId; + } + + public int getNodeId() { + return nodeId; + } } From 6bedeaf179b06801c600b255a61ca27484ded44e Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 20 Apr 2026 10:20:40 +0800 Subject: [PATCH 36/45] fix --- .../itbase/constant/BuiltinAggregationFunctionEnum.java | 6 ++++-- .../datanode/src/main/codegen/templates/ModeAccumulator.ftl | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java b/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java index 85721cfb7a154..e24cbfbeea206 100644 --- a/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java @@ -19,6 +19,8 @@ package org.apache.iotdb.itbase.constant; +import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinAggregationFunction; + import java.util.Arrays; import java.util.HashSet; import java.util.Set; @@ -57,9 +59,9 @@ public String getFunctionName() { private static final Set NATIVE_FUNCTION_NAMES = new HashSet<>( Arrays.stream( - org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction.values()) + BuiltinAggregationFunction.values()) .map( - org.apache.iotdb.db.queryengine.plan.udf.BuiltinAggregationFunction + BuiltinAggregationFunction ::getFunctionName) .collect(Collectors.toList())); diff --git a/iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl b/iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl index 4b1097dfd1dc0..7a3f154f002fb 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl @@ -26,8 +26,8 @@ package org.apache.iotdb.db.calc_commons.execution.aggregation; import com.google.common.collect.ImmutableList; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.tsfile.external.commons.collections4.comparators.ComparatorChain; -import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.statistics.Statistics; import org.apache.tsfile.block.column.Column; @@ -56,7 +56,7 @@ public class ${className} implements Accumulator { private final Map<${type.javaBoxName}, Pair> countMap = new HashMap<>(); <#if type.dataType != "boolean"> - private final int MAP_SIZE_THRESHOLD = IoTDBDescriptor.getInstance().getConfig().getModeMapSizeThreshold(); + private final int MAP_SIZE_THRESHOLD = CommonDescriptor.getInstance().getConfig().getModeMapSizeThreshold(); @Override From 6eb454a3f0f649197c8f609a9713e4f76ee2ce25 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 20 Apr 2026 12:27:11 +0800 Subject: [PATCH 37/45] refactor operator context --- .../execution/operator/AbstractOperator.java | 4 +- ...ontext.java => CommonOperatorContext.java} | 100 ++++------------ .../execution/operator/Operator.java | 6 +- .../process/AbstractConsumeAllOperator.java | 5 +- .../process/AbstractFillOperator.java | 8 +- .../process/AbstractLinearFillOperator.java | 8 +- .../process/AbstractSortOperator.java | 8 +- .../process/AggregationMergeSortOperator.java | 4 +- .../process/AssignUniqueIdOperator.java | 13 +- .../operator/process/CollectOperator.java | 8 +- .../process/EnforceSingleRowOperator.java | 8 +- .../process/FilterAndProjectOperator.java | 8 +- .../operator/process/LimitOperator.java | 8 +- .../process/MappingCollectOperator.java | 6 +- .../operator/process/MergeSortOperator.java | 4 +- .../operator/process/OffsetOperator.java | 8 +- .../process/PatternRecognitionOperator.java | 14 +-- .../PreviousFillWithGroupOperator.java | 8 +- .../operator/process/SortOperator.java | 4 +- .../operator/process/TableFillOperator.java | 7 +- .../process/TableLinearFillOperator.java | 4 +- .../TableLinearFillWithGroupOperator.java | 4 +- .../process/TableMergeSortOperator.java | 4 +- .../operator/process/TableSortOperator.java | 4 +- .../process/TableStreamSortOperator.java | 4 +- .../operator/process/TableTopKOperator.java | 4 +- .../operator/process/TopKOperator.java | 8 +- .../operator/process/ValuesOperator.java | 8 +- .../function/TableFunctionLeafOperator.java | 8 +- .../function/TableFunctionOperator.java | 8 +- .../gapfill/AbstractGapFillOperator.java | 8 +- .../AbstractGapFillWGroupOperator.java | 4 +- .../AbstractGapFillWoGroupOperator.java | 4 +- .../gapfill/GapFillWGroupWMoOperator.java | 4 +- .../gapfill/GapFillWGroupWoMoOperator.java | 4 +- .../gapfill/GapFillWoGroupWMoOperator.java | 4 +- .../gapfill/GapFillWoGroupWoMoOperator.java | 4 +- .../SimpleNestedLoopCrossJoinOperator.java | 10 +- .../process/window/RowNumberOperator.java | 8 +- .../process/window/TableWindowOperator.java | 14 +-- .../process/window/TopKRankingOperator.java | 8 +- .../AbstractAsofMergeSortJoinOperator.java | 4 +- .../AbstractMergeSortJoinOperator.java | 10 +- .../AsofMergeSortInnerJoinOperator.java | 4 +- .../AsofMergeSortLeftJoinOperator.java | 4 +- .../relational/MarkDistinctOperator.java | 14 +-- .../MergeSortFullOuterJoinOperator.java | 4 +- .../MergeSortInnerJoinOperator.java | 4 +- .../relational/MergeSortLeftJoinOperator.java | 4 +- .../relational/MergeSortSemiJoinOperator.java | 4 +- .../aggregation/AggregationOperator.java | 14 +-- .../grouped/HashAggregationOperator.java | 12 +- .../grouped/StreamingAggregationOperator.java | 6 +- .../StreamingHashAggregationOperator.java | 12 +- .../InMemoryHashAggregationBuilder.java | 8 +- .../plan/planner/TableOperatorGenerator.java | 84 ++++++------- .../thrift/impl/ClientRPCServiceImpl.java | 2 +- .../queryengine/execution/driver/Driver.java | 2 +- .../execution/driver/DriverContext.java | 2 +- .../fragment/FragmentInstanceExecution.java | 2 +- .../execution/operator/EmptyDataOperator.java | 1 - .../operator/ExplainAnalyzeOperator.java | 1 - .../execution/operator/OperatorContext.java | 112 ++++++++++++++++++ .../process/AbstractIntoOperator.java | 2 +- .../process/AbstractTreeIntoOperator.java | 2 +- .../ActiveRegionScanMergeOperator.java | 2 +- .../operator/process/AggregationOperator.java | 2 +- .../process/ColumnInjectOperator.java | 2 +- .../process/DeviceViewIntoOperator.java | 2 +- .../operator/process/DeviceViewOperator.java | 2 +- .../operator/process/ProjectOperator.java | 2 +- .../process/RawDataAggregationOperator.java | 2 +- .../process/SingleDeviceViewOperator.java | 2 +- .../SingleInputAggregationOperator.java | 2 +- .../SlidingWindowAggregationOperator.java | 2 +- .../operator/process/TableIntoOperator.java | 2 +- .../process/TagAggregationOperator.java | 2 +- .../operator/process/TransformOperator.java | 2 +- .../operator/process/TreeFillOperator.java | 2 +- .../operator/process/TreeIntoOperator.java | 2 +- .../process/TreeLinearFillOperator.java | 2 +- .../process/TreeMergeSortOperator.java | 2 +- .../operator/process/TreeSortOperator.java | 2 +- .../operator/process/TreeTopKOperator.java | 2 +- .../process/ai/InferenceOperator.java | 2 +- .../process/copyto/TableCopyToOperator.java | 2 +- .../join/FullOuterTimeJoinOperator.java | 2 +- .../join/HorizontallyConcatOperator.java | 2 +- .../process/join/InnerTimeJoinOperator.java | 2 +- .../join/LeftOuterTimeJoinOperator.java | 2 +- .../join/TableLeftOuterTimeJoinOperator.java | 2 +- .../last/AbstractUpdateLastCacheOperator.java | 2 +- .../last/AlignedUpdateLastCacheOperator.java | 2 +- ...lignedUpdateViewPathLastCacheOperator.java | 2 +- .../last/LastQueryCollectOperator.java | 2 +- .../process/last/LastQueryMergeOperator.java | 2 +- .../process/last/LastQueryOperator.java | 2 +- .../process/last/LastQuerySortOperator.java | 2 +- .../last/LastQueryTransformOperator.java | 2 +- .../process/last/UpdateLastCacheOperator.java | 2 +- .../last/UpdateViewPathLastCacheOperator.java | 2 +- .../CountGroupByLevelMergeOperator.java | 2 +- .../schema/CountGroupByLevelScanOperator.java | 2 +- .../operator/schema/CountMergeOperator.java | 2 +- .../schema/NodeManageMemoryMergeOperator.java | 2 +- .../schema/NodePathsConvertOperator.java | 2 +- .../schema/NodePathsCountOperator.java | 2 +- .../operator/schema/SchemaCountOperator.java | 2 +- .../schema/SchemaFetchMergeOperator.java | 2 +- .../schema/SchemaFetchScanOperator.java | 2 +- .../schema/SchemaQueryMergeOperator.java | 2 +- .../SchemaQueryOrderByHeatOperator.java | 2 +- .../schema/SchemaQueryScanOperator.java | 2 +- .../operator/sink/IdentitySinkOperator.java | 2 +- .../operator/sink/ShuffleHelperOperator.java | 2 +- ...AbstractSeriesAggregationScanOperator.java | 2 +- .../ActiveDeviceRegionScanOperator.java | 2 +- .../ActiveTimeSeriesRegionScanOperator.java | 2 +- .../AlignedSeriesAggregationScanOperator.java | 2 +- .../source/AlignedSeriesScanOperator.java | 2 +- .../operator/source/ExchangeOperator.java | 2 +- .../source/LastCacheScanOperator.java | 2 +- .../source/SeriesAggregationScanOperator.java | 2 +- .../operator/source/SeriesScanOperator.java | 2 +- .../source/ShowDiskUsageOperator.java | 2 +- .../operator/source/ShowQueriesOperator.java | 2 +- .../AbstractAggTableScanOperator.java | 4 +- .../relational/AbstractTableScanOperator.java | 4 +- .../source/relational/CteScanOperator.java | 2 +- .../DeviceIteratorScanOperator.java | 2 +- ...formationSchemaContentSupplierFactory.java | 2 +- .../InformationSchemaTableScanOperator.java | 2 +- .../TreeToTableViewAdaptorOperator.java | 2 +- .../DataNodeTableOperatorGenerator.java | 18 ++- .../plan/planner/OperatorTreeGenerator.java | 2 +- .../AggregationMergeSortOperatorTest.java | 1 - .../operator/AggregationOperatorTest.java | 1 - .../operator/CteScanOperatorTest.java | 1 - .../operator/DeviceViewIntoOperatorTest.java | 1 - .../operator/ExchangeOperatorTest.java | 1 - .../execution/operator/FillOperatorTest.java | 1 - .../operator/LastQueryMergeOperatorTest.java | 1 - .../operator/MergeTreeSortOperatorTest.java | 1 - .../operator/OperatorMemoryTest.java | 1 - .../operator/SortOperatorSortBranchTest.java | 1 - .../operator/TransformOperatorTest.java | 1 - .../operator/TreeIntoOperatorTest.java | 1 - .../operator/TreeLinearFillOperatorTest.java | 1 - .../operator/TreeSortOperatorTest.java | 1 - .../operator/TreeTopKOperatorTest.java | 1 - .../process/TableStreamSortOperatorTest.java | 2 +- .../gapfill/GapFillWGroupWMoOperatorTest.java | 2 +- .../GapFillWGroupWoMoOperatorTest.java | 2 +- .../GapFillWoGroupWMoOperatorTest.java | 2 +- .../GapFillWoGroupWoMoOperatorTest.java | 2 +- .../join/InnerTimeJoinOperatorTest.java | 2 +- .../join/LeftOuterTimeJoinOperatorTest.java | 2 +- .../tvf/TableFunctionOperatorTest.java | 2 +- .../process/window/RowNumberOperatorTest.java | 2 +- .../window/TableWindowOperatorTest.java | 2 +- .../window/TopKRankingOperatorTest.java | 2 +- .../CountGroupByLevelMergeOperatorTest.java | 2 +- .../schema/SchemaCountOperatorTest.java | 2 +- .../schema/SchemaQueryScanOperatorTest.java | 2 +- .../relational/TableScanOperatorTest.java | 2 +- .../analyzer/AggregationCornerCaseTest.java | 2 +- .../analyzer/AsofInnerJoinOperatorTest.java | 2 +- .../plan/relational/analyzer/JoinTest.java | 2 +- 168 files changed, 454 insertions(+), 438 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/{OperatorContext.java => CommonOperatorContext.java} (55%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/AbstractOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/AbstractOperator.java index 353331525c228..aa722dd84ec41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/AbstractOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/AbstractOperator.java @@ -27,7 +27,7 @@ public abstract class AbstractOperator implements Operator { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractOperator.class); - protected OperatorContext operatorContext; + protected CommonOperatorContext operatorContext; protected long maxReturnSize = TSFileDescriptor.getInstance().getConfig().getMaxTsBlockSizeInBytes(); @@ -104,7 +104,7 @@ public TsBlock getResultFromRetainedTsBlock() { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/OperatorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorContext.java similarity index 55% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/OperatorContext.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorContext.java index a635a58aed82e..9a874d51c07e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/OperatorContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorContext.java @@ -21,71 +21,47 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; -import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import io.airlift.units.Duration; import org.apache.tsfile.utils.Accountable; -import org.apache.tsfile.utils.RamUsageEstimator; import java.util.Map; -import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; /** - * Contains information about {@link org.apache.iotdb.db.calc_commons.execution.operator.Operator} - * execution. + * Contains common information about {@link Operator} execution. * *

    Not thread-safe. */ -public class OperatorContext implements Accountable { +public abstract class CommonOperatorContext implements Accountable { - private static Duration maxRunTime = + protected static Duration maxRunTime = new Duration( CommonDescriptor.getInstance().getConfig().getDriverTaskExecutionTimeSliceInMs(), TimeUnit.MILLISECONDS); - private static final long INSTANCE_SIZE = - RamUsageEstimator.shallowSizeOfInstance(OperatorContext.class); - - private final int operatorId; + protected final int operatorId; // It seems it's never used. - private final PlanNodeId planNodeId; - private String operatorType; - private DriverContext driverContext; + protected final PlanNodeId planNodeId; + protected String operatorType; - private long totalExecutionTimeInNanos = 0L; - private long nextCalledCount = 0L; - private long hasNextCalledCount = 0L; + protected long totalExecutionTimeInNanos = 0L; + protected long nextCalledCount = 0L; + protected long hasNextCalledCount = 0L; // SpecifiedInfo is used to record some custom information for the operator, // which will be shown in the result of EXPLAIN ANALYZE to analyze the query. - private final Map specifiedInfo = new ConcurrentHashMap<>(); - private long output = 0; - private long estimatedMemorySize; - - public OperatorContext( - int operatorId, PlanNodeId planNodeId, String operatorType, DriverContext driverContext) { - this.operatorId = operatorId; - this.planNodeId = planNodeId; - this.operatorType = operatorType; - this.driverContext = driverContext; - } + protected final Map specifiedInfo = new ConcurrentHashMap<>(); + protected long output = 0; + protected long estimatedMemorySize; - @TestOnly - public OperatorContext( - int operatorId, - PlanNodeId planNodeId, - String operatorType, - FragmentInstanceContext fragmentInstanceContext) { + protected CommonOperatorContext(int operatorId, PlanNodeId planNodeId, String operatorType) { this.operatorId = operatorId; this.planNodeId = planNodeId; this.operatorType = operatorType; - this.driverContext = new DriverContext(fragmentInstanceContext, 0); } public int getOperatorId() { @@ -100,18 +76,6 @@ public void setOperatorType(String operatorType) { this.operatorType = operatorType; } - public DriverContext getDriverContext() { - return driverContext; - } - - public void setDriverContext(DriverContext driverContext) { - this.driverContext = driverContext; - } - - public FragmentInstanceContext getInstanceContext() { - return driverContext.getFragmentInstanceContext(); - } - public static Duration getMaxRunTime() { return maxRunTime; } @@ -122,17 +86,19 @@ public Duration getMaxRunTimeForTest() { } public static void setMaxRunTime(Duration maxRunTime) { - OperatorContext.maxRunTime = maxRunTime; - } - - public SessionInfo getSessionInfo() { - return getInstanceContext().getSessionInfo(); + CommonOperatorContext.maxRunTime = maxRunTime; } public PlanNodeId getPlanNodeId() { return planNodeId; } + public abstract MemoryReservationManager getMemoryReservationContext(); + + public abstract int getFragmentId(); + + public abstract int getPipelineId(); + public void recordExecutionTime(long executionTimeInNanos) { this.totalExecutionTimeInNanos += executionTimeInNanos; } @@ -180,28 +146,4 @@ public void recordSpecifiedInfo(String key, String value) { public Map getSpecifiedInfo() { return specifiedInfo; } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - OperatorContext that = (OperatorContext) o; - return operatorId == that.operatorId; - } - - @Override - public int hashCode() { - return Objects.hash(operatorId); - } - - @Override - public long ramBytesUsed() { - return INSTANCE_SIZE - + RamUsageEstimator.sizeOf(operatorType) - + MemoryEstimationHelper.getEstimatedSizeOfAccountableObject(planNodeId); - } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/Operator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/Operator.java index 8a1377085ea99..55d1c130d20cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/Operator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/Operator.java @@ -29,7 +29,7 @@ public interface Operator extends AutoCloseable, Accountable { ListenableFuture NOT_BLOCKED = immediateVoidFuture(); - OperatorContext getOperatorContext(); + CommonOperatorContext getOperatorContext(); /** * Returns a future that will be completed when the operator becomes unblocked. If the operator is @@ -41,7 +41,7 @@ default ListenableFuture isBlocked() { } default TsBlock nextWithTimer() throws Exception { - OperatorContext context = getOperatorContext(); + CommonOperatorContext context = getOperatorContext(); long startTime = System.nanoTime(); TsBlock output = null; try { @@ -65,7 +65,7 @@ default TsBlock nextWithTimer() throws Exception { TsBlock next() throws Exception; default boolean hasNextWithTimer() throws Exception { - OperatorContext context = getOperatorContext(); + CommonOperatorContext context = getOperatorContext(); long startTime = System.nanoTime(); try { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java index cc66965ebe0d3..3aec037d012df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; @@ -50,7 +50,8 @@ public abstract class AbstractConsumeAllOperator extends AbstractOperator /** Indicate whether we found an empty child input in one loop */ protected boolean hasEmptyChildInput = false; - protected AbstractConsumeAllOperator(OperatorContext operatorContext, List children) { + protected AbstractConsumeAllOperator( + CommonOperatorContext operatorContext, List children) { this.operatorContext = operatorContext; this.children = children; this.inputOperatorsCount = children.size(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractFillOperator.java index 2bce16793c840..d643a8380cc77 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractFillOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; @@ -37,13 +37,13 @@ public abstract class AbstractFillOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(AbstractFillOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final IFill[] fillArray; private final Operator child; private final int outputColumnCount; protected AbstractFillOperator( - OperatorContext operatorContext, IFill[] fillArray, Operator child) { + CommonOperatorContext operatorContext, IFill[] fillArray, Operator child) { this.operatorContext = requireNonNull(operatorContext, "operatorContext is null"); checkArgument( fillArray != null && fillArray.length > 0, "fillArray should not be null or empty"); @@ -53,7 +53,7 @@ protected AbstractFillOperator( } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractLinearFillOperator.java index c369c5c6b5ada..5b9ed65a4aee3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractLinearFillOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; @@ -40,7 +40,7 @@ public abstract class AbstractLinearFillOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(AbstractLinearFillOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; protected final ILinearFill[] fillArray; private final Operator child; protected final int outputColumnCount; @@ -64,7 +64,7 @@ public abstract class AbstractLinearFillOperator implements ProcessOperator { protected boolean noMoreTsBlock; protected AbstractLinearFillOperator( - OperatorContext operatorContext, ILinearFill[] fillArray, Operator child) { + CommonOperatorContext operatorContext, ILinearFill[] fillArray, Operator child) { this.operatorContext = requireNonNull(operatorContext, "operatorContext is null"); checkArgument( fillArray != null && fillArray.length > 0, "fillArray should not be null or empty"); @@ -81,7 +81,7 @@ protected AbstractLinearFillOperator( } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java index 0c51fa0704c3e..e777b960f9345 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -51,7 +51,7 @@ public abstract class AbstractSortOperator implements ProcessOperator { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractSortOperator.class); - protected final OperatorContext operatorContext; + protected final CommonOperatorContext operatorContext; protected final Operator inputOperator; protected final TsBlockBuilder tsBlockBuilder; @@ -80,7 +80,7 @@ public abstract class AbstractSortOperator implements ProcessOperator { private long sortCost = 0; AbstractSortOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator inputOperator, List dataTypes, DiskSpiller diskSpiller, @@ -119,7 +119,7 @@ protected void buildResult() throws IoTDBException { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java index 18fa283410dfb..7f51429af96a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; @@ -69,7 +69,7 @@ public class AggregationMergeSortOperator extends AbstractConsumeAllOperator { private long lastTime; public AggregationMergeSortOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, List children, List dataTypes, List accumulators, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AssignUniqueIdOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AssignUniqueIdOperator.java index 90dd0011f0b17..34f7482363b96 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AssignUniqueIdOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AssignUniqueIdOperator.java @@ -19,10 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.queryengine.execution.schedule.task.DriverTaskId; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; @@ -43,7 +42,7 @@ public class AssignUniqueIdOperator implements ProcessOperator { private static final long ROW_IDS_PER_REQUEST = 1L << 20L; private static final long MAX_ROW_ID = 1L << 40L; - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final Operator child; private final AtomicLong rowIdPool = new AtomicLong(); @@ -52,13 +51,13 @@ public class AssignUniqueIdOperator implements ProcessOperator { private long rowIdCounter; private long maxRowIdCounterValue; - public AssignUniqueIdOperator(OperatorContext operatorContext, Operator child) { + public AssignUniqueIdOperator(CommonOperatorContext operatorContext, Operator child) { this.operatorContext = operatorContext; this.child = child; - DriverTaskId id = operatorContext.getDriverContext().getDriverTaskID(); this.uniqueValueMask = - (((long) id.getFragmentId().getId()) << 54) | (((long) id.getPipelineId()) << 40); + (((long) operatorContext.getFragmentId()) << 54) + | (((long) operatorContext.getPipelineId()) << 40); requestValues(); } @@ -117,7 +116,7 @@ public long ramBytesUsed() { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/CollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/CollectOperator.java index a0b1d9af305f7..9f8627769d677 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/CollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/CollectOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; @@ -34,13 +34,13 @@ public class CollectOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(CollectOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; protected final List children; private boolean inited = false; protected int currentIndex; - public CollectOperator(OperatorContext operatorContext, List children) { + public CollectOperator(CommonOperatorContext operatorContext, List children) { this.operatorContext = operatorContext; this.children = children; this.currentIndex = 0; @@ -87,7 +87,7 @@ public boolean isFinished() throws Exception { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/EnforceSingleRowOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/EnforceSingleRowOperator.java index 8e85beebd6df5..dd491a7a18918 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/EnforceSingleRowOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/EnforceSingleRowOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; @@ -38,12 +38,12 @@ public class EnforceSingleRowOperator implements ProcessOperator { private static final String NO_RESULT_ERROR_MESSAGE = "Scalar sub-query does not have output."; - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final Operator child; private boolean finished = false; - public EnforceSingleRowOperator(OperatorContext operatorContext, Operator child) { + public EnforceSingleRowOperator(CommonOperatorContext operatorContext, Operator child) { this.operatorContext = operatorContext; this.child = child; } @@ -117,7 +117,7 @@ public long ramBytesUsed() { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/FilterAndProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/FilterAndProjectOperator.java index ee66b35f2d28b..174cb9705a2e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/FilterAndProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/FilterAndProjectOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.transformation.dag.column.AbstractCaseWhenThenColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; @@ -70,7 +70,7 @@ public class FilterAndProjectOperator implements ProcessOperator { private final boolean hasNonMappableUDF; - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; // false when we only need to do projection private final boolean hasFilter; @@ -79,7 +79,7 @@ public class FilterAndProjectOperator implements ProcessOperator { @SuppressWarnings("squid:S107") public FilterAndProjectOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator inputOperator, List filterOutputDataTypes, List filterLeafColumnTransformerList, @@ -117,7 +117,7 @@ public FilterAndProjectOperator( } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/LimitOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/LimitOperator.java index 115f5289a293e..b987065e74f8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/LimitOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/LimitOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; @@ -34,11 +34,11 @@ public class LimitOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(LimitOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private long remainingLimit; private final Operator child; - public LimitOperator(OperatorContext operatorContext, long limit, Operator child) { + public LimitOperator(CommonOperatorContext operatorContext, long limit, Operator child) { this.operatorContext = requireNonNull(operatorContext, "operatorContext is null"); checkArgument(limit >= 0, "limit must be at least zero"); this.remainingLimit = limit; @@ -52,7 +52,7 @@ public LimitOperator(LimitOperator limitOperator, Operator child) { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MappingCollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MappingCollectOperator.java index 362e3e564adf0..2384c9b831d0e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MappingCollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MappingCollectOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.tsfile.block.column.Column; @@ -40,7 +40,9 @@ public class MappingCollectOperator extends CollectOperator { private final int outputColumnsCount; public MappingCollectOperator( - OperatorContext operatorContext, List children, List> mappings) { + CommonOperatorContext operatorContext, + List children, + List> mappings) { super(operatorContext, children); this.mappings = mappings; outputColumnsCount = mappings.get(0).size(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java index 4e57a3b34ecc8..17e8759ede6c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; @@ -56,7 +56,7 @@ public abstract class MergeSortOperator extends AbstractConsumeAllOperator { private boolean finished; protected MergeSortOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, List inputOperators, List dataTypes, Comparator comparator) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/OffsetOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/OffsetOperator.java index b4192314b900b..3c161ebafdfca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/OffsetOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/OffsetOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; @@ -34,11 +34,11 @@ public class OffsetOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(OffsetOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private long remainingOffset; private final Operator child; - public OffsetOperator(OperatorContext operatorContext, long offset, Operator child) { + public OffsetOperator(CommonOperatorContext operatorContext, long offset, Operator child) { this.operatorContext = requireNonNull(operatorContext, "operatorContext is null"); checkArgument(offset >= 0, "offset must be at least zero"); this.remainingOffset = offset; @@ -52,7 +52,7 @@ public OffsetOperator(OffsetOperator offsetOperator, Operator child) { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java index 898c7d4edc2c2..bb309d8518341 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregator; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternPartitionExecutor; @@ -58,7 +58,7 @@ public class PatternRecognitionOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(PatternRecognitionOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final Operator child; private final List inputDataTypes; private final List outputChannels; @@ -93,7 +93,7 @@ public class PatternRecognitionOperator implements ProcessOperator { private final long maxRuntime; public PatternRecognitionOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator child, List inputDataTypes, List outputDataTypes, @@ -145,15 +145,11 @@ public PatternRecognitionOperator( this.maxRuntime = this.operatorContext.getMaxRunTime().roundTo(TimeUnit.NANOSECONDS); this.totalMemorySize = 0; this.maxUsedMemory = 0; - this.memoryReservationManager = - operatorContext - .getDriverContext() - .getFragmentInstanceContext() - .getMemoryReservationContext(); + this.memoryReservationManager = operatorContext.getMemoryReservationContext(); } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java index f39198a9e103d..5fa15e6feeea5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -44,7 +44,7 @@ public class PreviousFillWithGroupOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(PreviousFillWithGroupOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final IFill[] fillArray; private final Operator child; private final int outputColumnCount; @@ -59,7 +59,7 @@ public class PreviousFillWithGroupOperator implements ProcessOperator { private SortKey lastRow = null; public PreviousFillWithGroupOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, IFill[] fillArray, Operator child, int helperColumnIndex, @@ -166,7 +166,7 @@ public ListenableFuture isBlocked() { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java index e989e27fbf0fd..4d745e7269494 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.db.utils.sort.DiskSpiller; @@ -40,7 +40,7 @@ public abstract class SortOperator extends AbstractSortOperator { RamUsageEstimator.shallowSizeOfInstance(SortOperator.class); protected SortOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator inputOperator, List dataTypes, DiskSpiller diskSpiller, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableFillOperator.java index 24b7373d17bd1..fd23ce74b85e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableFillOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.tsfile.block.column.Column; @@ -34,7 +34,10 @@ public class TableFillOperator extends AbstractFillOperator { private final int helperColumnIndex; public TableFillOperator( - OperatorContext operatorContext, IFill[] fillArray, Operator child, int helperColumnIndex) { + CommonOperatorContext operatorContext, + IFill[] fillArray, + Operator child, + int helperColumnIndex) { super(operatorContext, fillArray, child); this.helperColumnIndex = helperColumnIndex; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillOperator.java index b7ecdea33bf79..8cc55a8270d93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.tsfile.block.column.Column; @@ -33,7 +33,7 @@ public class TableLinearFillOperator extends AbstractLinearFillOperator { private final int helperColumnIndex; public TableLinearFillOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, ILinearFill[] fillArray, Operator child, int helperColumnIndex) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java index 70df964db90ed..7b6eb6685e1f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -49,7 +49,7 @@ public class TableLinearFillWithGroupOperator extends TableLinearFillOperator { private SortKey lastRow = null; public TableLinearFillWithGroupOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, ILinearFill[] fillArray, Operator child, int helperColumnIndex, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java index bc44b7a4dab10..87f1da491f264 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -35,7 +35,7 @@ public class TableMergeSortOperator extends MergeSortOperator { public TableMergeSortOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, List inputOperators, List dataTypes, Comparator comparator) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java index 2a2930044c2d8..0b74af42ebb3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.db.utils.sort.TableDiskSpiller; @@ -36,7 +36,7 @@ public class TableSortOperator extends SortOperator { public TableSortOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator inputOperator, List dataTypes, String folderPath, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java index effd8157dab55..ef059465d7959 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -60,7 +60,7 @@ public class TableStreamSortOperator extends AbstractSortOperator { private SortKey lastRow = null; public TableStreamSortOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator inputOperator, List dataTypes, String folderPath, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java index b9be44ca14161..199d5a60f29bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.utils.datastructure.SortKey; @@ -34,7 +34,7 @@ public class TableTopKOperator extends TopKOperator { public TableTopKOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, List childrenOperators, List dataTypes, Comparator comparator, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java index bb7f2c3e6dd2b..2e69dd2174859 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.utils.datastructure.MergeSortKey; @@ -55,7 +55,7 @@ public abstract class TopKOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(TopKOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final List childrenOperators; private int childIndex; @@ -87,7 +87,7 @@ public abstract class TopKOperator implements ProcessOperator { public static final int OPERATOR_BATCH_UPPER_BOUND = 100000; protected TopKOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, List childrenOperators, List dataTypes, Comparator comparator, @@ -112,7 +112,7 @@ protected TopKOperator( } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ValuesOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ValuesOperator.java index 480b3ec702524..fb9e574b18d69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ValuesOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ValuesOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.collect.ImmutableList; @@ -37,12 +37,12 @@ public class ValuesOperator implements Operator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(ValuesOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final Iterator tsBlocks; private final long maxTsBlockSize; private long currentRetainedSize; - public ValuesOperator(OperatorContext operatorContext, List tsBlocks) { + public ValuesOperator(CommonOperatorContext operatorContext, List tsBlocks) { this.operatorContext = requireNonNull(operatorContext, "operatorContext is null"); requireNonNull(tsBlocks, "tsBlocks is null"); @@ -61,7 +61,7 @@ public ValuesOperator(OperatorContext operatorContext, List tsBlocks) { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java index b923028cfd322..603a67287627c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.function; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.rpc.TSStatusCode; @@ -43,14 +43,14 @@ public class TableFunctionLeafOperator implements ProcessOperator { private static final Logger LOGGER = LoggerFactory.getLogger(TableFunctionLeafOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final TsBlockBuilder blockBuilder; private final TableFunctionLeafProcessor processor; private volatile boolean init = false; public TableFunctionLeafOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, TableFunctionProcessorProvider processorProvider, List outputDataTypes) { this.operatorContext = operatorContext; @@ -68,7 +68,7 @@ public ListenableFuture isBlocked() { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return this.operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java index 2a3c8e050c949..46c9b8d8a32dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.function; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.AggregationMergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionCache; @@ -62,7 +62,7 @@ public class TableFunctionOperator implements ProcessOperator { private static final int DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES = TSFileDescriptor.getInstance().getConfig().getMaxTsBlockSizeInBytes(); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final Operator inputOperator; private final TableFunctionProcessorProvider processorProvider; private final PartitionRecognizer partitionRecognizer; @@ -81,7 +81,7 @@ public class TableFunctionOperator implements ProcessOperator { private final Queue resultTsBlocks; public TableFunctionOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, TableFunctionProcessorProvider processorProvider, Operator inputOperator, List inputDataTypes, @@ -109,7 +109,7 @@ public TableFunctionOperator( } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return this.operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillOperator.java index 4693f2633a5f4..76ec9e4e18edf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; @@ -44,7 +44,7 @@ abstract class AbstractGapFillOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(AbstractGapFillOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final Operator child; protected final int outputColumnCount; private final int timeColumnIndex; @@ -61,7 +61,7 @@ abstract class AbstractGapFillOperator implements ProcessOperator { private SortKey lastGroupKey = null; AbstractGapFillOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator child, int timeColumnIndex, long startTime, @@ -186,7 +186,7 @@ private void gapFillRow(long time, TsBlock block, int rowIndex) { abstract void nextTime(); @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWGroupOperator.java index dfff820a7d89f..ed003b13c90d6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWGroupOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; @@ -36,7 +36,7 @@ abstract class AbstractGapFillWGroupOperator extends AbstractGapFillOperator { private final Set groupKeyIndexSet; AbstractGapFillWGroupOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator child, int timeColumnIndex, long startTime, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWoGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWoGroupOperator.java index ee7e4f33d894a..788acb69be1fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWoGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWoGroupOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; @@ -31,7 +31,7 @@ abstract class AbstractGapFillWoGroupOperator extends AbstractGapFillOperator { AbstractGapFillWoGroupOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator child, int timeColumnIndex, long startTime, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWMoOperator.java index 9dc413c41724e..652f3d5e2b4b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWMoOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; @@ -41,7 +41,7 @@ public class GapFillWGroupWMoOperator extends AbstractGapFillWGroupOperator { private final ZoneId zoneId; public GapFillWGroupWMoOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator child, int timeColumnIndex, long startTime, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWoMoOperator.java index 63780e995832f..54925b53ab459 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWoMoOperator.java @@ -21,8 +21,8 @@ // without month interval +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; @@ -40,7 +40,7 @@ public class GapFillWGroupWoMoOperator extends AbstractGapFillWGroupOperator { private final long nonMonthDuration; public GapFillWGroupWoMoOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator child, int timeColumnIndex, long startTime, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWMoOperator.java index 7a0fe11d143d2..6cf4dc011fe15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWMoOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.tsfile.enums.TSDataType; @@ -37,7 +37,7 @@ public class GapFillWoGroupWMoOperator extends AbstractGapFillWoGroupOperator { private final ZoneId zoneId; public GapFillWoGroupWMoOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator child, int timeColumnIndex, long startTime, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWoMoOperator.java index 1f13c51c59b66..7cd0fbfbd7a49 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWoMoOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.tsfile.enums.TSDataType; @@ -35,7 +35,7 @@ public class GapFillWoGroupWoMoOperator extends AbstractGapFillWoGroupOperator { private final long nonMonthDuration; public GapFillWoGroupWoMoOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator child, int timeColumnIndex, long startTime, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java index f09a263e51d6b..ce3a65080a90c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; @@ -72,7 +72,7 @@ public class SimpleNestedLoopCrossJoinOperator extends AbstractOperator { private boolean buildFinished = false; public SimpleNestedLoopCrossJoinOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator probeSource, Operator buildSource, int[] leftOutputSymbolIdx, @@ -85,11 +85,7 @@ public SimpleNestedLoopCrossJoinOperator( this.rightOutputSymbolIdx = rightOutputSymbolIdx; this.buildBlocks = new ArrayList<>(); this.resultBuilder = new TsBlockBuilder(dataTypes); - this.memoryReservationManager = - operatorContext - .getDriverContext() - .getFragmentInstanceContext() - .getMemoryReservationContext(); + this.memoryReservationManager = operatorContext.getMemoryReservationContext(); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java index dc5399fc65012..3cb47c8c572d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.calc_commons.execution.operator.process.window; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; @@ -51,7 +51,7 @@ public class RowNumberOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(RowNumberOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final Operator inputOperator; private final List outputChannels; private final List partitionChannels; @@ -62,7 +62,7 @@ public class RowNumberOperator implements ProcessOperator { private final Map partitionRowCounts; public RowNumberOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator inputOperator, List inputDataTypes, List outputChannels, @@ -103,7 +103,7 @@ public RowNumberOperator( } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java index 2ed8af01a068d..7b8944a23ad18 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.window; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.PartitionRecognizer; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionCache; @@ -56,7 +56,7 @@ public class TableWindowOperator implements ProcessOperator { RamUsageEstimator.shallowSizeOfInstance(TableWindowOperator.class); // Common fields - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final Operator inputOperator; private final List inputDataTypes; private final List outputChannels; @@ -84,7 +84,7 @@ public class TableWindowOperator implements ProcessOperator { private boolean noMoreDataSignaled; public TableWindowOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator inputOperator, List inputDataTypes, List outputDataTypes, @@ -119,15 +119,11 @@ public TableWindowOperator( this.totalMemorySize = 0; this.maxUsedMemory = 0; this.noMoreDataSignaled = false; - this.memoryReservationManager = - operatorContext - .getDriverContext() - .getFragmentInstanceContext() - .getMemoryReservationContext(); + this.memoryReservationManager = operatorContext.getMemoryReservationContext(); } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java index 0749d466f2641..e093b8d8c427d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.window; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.GroupedTopNBuilder; import org.apache.iotdb.db.calc_commons.execution.operator.GroupedTopNRowNumberBuilder; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.SimpleTsBlockWithPositionComparator; import org.apache.iotdb.db.calc_commons.execution.operator.TsBlockWithPositionComparator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; @@ -51,7 +51,7 @@ public class TopKRankingOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(TopKRankingOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final Operator inputOperator; private final TopKRankingNode.RankingType rankingType; private final List inputTypes; @@ -78,7 +78,7 @@ public class TopKRankingOperator implements ProcessOperator { private java.util.Iterator outputIterator; public TopKRankingOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator inputOperator, TopKRankingNode.RankingType rankingType, List inputTypes, @@ -169,7 +169,7 @@ private Supplier getGroupedTopNBuilderSupplier() { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java index a0d2ee0acf67d..84cff0ef5aa45 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.tsfile.enums.TSDataType; @@ -34,7 +34,7 @@ public abstract class AbstractAsofMergeSortJoinOperator extends AbstractMergeSor private final int rightAsofJoinKeyIndex; public AbstractAsofMergeSortJoinOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator leftChild, int[] leftJoinKeyPositions, int[] leftOutputSymbolIdx, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java index ca9bb4cff3c13..202f54896fc0e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; @@ -67,7 +67,7 @@ public abstract class AbstractMergeSortJoinOperator extends AbstractOperator { protected long usedMemory; protected AbstractMergeSortJoinOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator leftChild, int[] leftJoinKeyPositions, int[] leftOutputSymbolIdx, @@ -85,11 +85,7 @@ protected AbstractMergeSortJoinOperator( this.rightOutputSymbolIdx = rightOutputSymbolIdx; this.comparators = comparators; - this.memoryReservationManager = - operatorContext - .getDriverContext() - .getFragmentInstanceContext() - .getMemoryReservationContext(); + this.memoryReservationManager = operatorContext.getMemoryReservationContext(); this.resultBuilder = new TsBlockBuilder(dataTypes); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java index 938ef7af9fd6e..8cbbba0026196 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; @@ -34,7 +34,7 @@ public class AsofMergeSortInnerJoinOperator extends AbstractAsofMergeSortJoinOpe RamUsageEstimator.shallowSizeOfInstance(AsofMergeSortInnerJoinOperator.class); public AsofMergeSortInnerJoinOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator leftChild, int[] leftJoinKeyPositions, int[] leftOutputSymbolIdx, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java index 044d244f779cb..dd19fdafd6461 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; @@ -34,7 +34,7 @@ public class AsofMergeSortLeftJoinOperator extends AbstractAsofMergeSortJoinOper RamUsageEstimator.shallowSizeOfInstance(AsofMergeSortLeftJoinOperator.class); public AsofMergeSortLeftJoinOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator leftChild, int[] leftJoinKeyPositions, int[] leftOutputSymbolIdx, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java index 37681173d6a31..8e1c30c7e51a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; @@ -46,7 +46,7 @@ public class MarkDistinctOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(MarkDistinctOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final Operator child; @@ -61,7 +61,7 @@ public class MarkDistinctOperator implements ProcessOperator { TSFileDescriptor.getInstance().getConfig().getMaxTsBlockLineNumber(); public MarkDistinctOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator child, List types, List markDistinctChannels, @@ -88,15 +88,11 @@ public MarkDistinctOperator( this.markDistinctHash = new MarkDistinctHash(distinctTypes.build(), hashChannel.isPresent(), UpdateMemory.NOOP); - this.memoryReservationManager = - operatorContext - .getDriverContext() - .getFragmentInstanceContext() - .getMemoryReservationContext(); + this.memoryReservationManager = operatorContext.getMemoryReservationContext(); } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java index 70b3e8af27fda..9e1f6b629d2c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; @@ -44,7 +44,7 @@ public class MergeSortFullOuterJoinOperator extends AbstractMergeSortJoinOperato private final List> updateLastMatchedRowFunctions; public MergeSortFullOuterJoinOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator leftChild, int[] leftJoinKeyPositions, int[] leftOutputSymbolIdx, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java index 1f4c9709798be..133be3639c927 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; @@ -35,7 +35,7 @@ public class MergeSortInnerJoinOperator extends AbstractMergeSortJoinOperator { RamUsageEstimator.shallowSizeOfInstance(MergeSortInnerJoinOperator.class); public MergeSortInnerJoinOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator leftChild, int[] leftJoinKeyPositions, int[] leftOutputSymbolIdx, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java index 41031c460bfc0..550a54ca2827a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; @@ -34,7 +34,7 @@ public class MergeSortLeftJoinOperator extends AbstractMergeSortJoinOperator { RamUsageEstimator.shallowSizeOfInstance(MergeSortLeftJoinOperator.class); public MergeSortLeftJoinOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator leftChild, int[] leftJoinKeyPositions, int[] leftOutputSymbolIdx, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java index d9f380cfe635c..c8659532c8758 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; @@ -40,7 +40,7 @@ public class MergeSortSemiJoinOperator extends AbstractMergeSortJoinOperator { private boolean rightHasNullValue = false; public MergeSortSemiJoinOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator leftChild, int leftJoinKeyPosition, int[] leftOutputSymbolIdx, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java index 300e9e65d2856..ba639dc3f0e28 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; @@ -43,7 +43,7 @@ public class AggregationOperator implements ProcessOperator { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(AggregationOperator.class); - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private final Operator child; @@ -61,7 +61,7 @@ public class AggregationOperator implements ProcessOperator { private boolean finished = false; public AggregationOperator( - OperatorContext operatorContext, Operator child, List aggregators) { + CommonOperatorContext operatorContext, Operator child, List aggregators) { this.operatorContext = operatorContext; this.child = child; this.aggregators = aggregators; @@ -69,11 +69,7 @@ public AggregationOperator( new TsBlockBuilder( aggregators.stream().map(TableAggregator::getType).collect(toImmutableList())); this.resultColumnsBuilder = resultBuilder.getValueColumnBuilders(); - this.memoryReservationManager = - operatorContext - .getDriverContext() - .getFragmentInstanceContext() - .getMemoryReservationContext(); + this.memoryReservationManager = operatorContext.getMemoryReservationContext(); } @Override @@ -127,7 +123,7 @@ public void close() throws Exception { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java index 0e4b6e975bc1a..8080577a351b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; @@ -69,7 +69,7 @@ public class HashAggregationOperator extends AbstractOperator { private boolean finished = false; public HashAggregationOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator child, List groupByTypes, List groupByChannels, @@ -89,11 +89,7 @@ public HashAggregationOperator( this.maxPartialMemory = maxPartialMemory; this.spillEnabled = spillEnabled; this.unspillMemoryLimit = unspillMemoryLimit; - this.memoryReservationManager = - operatorContext - .getDriverContext() - .getFragmentInstanceContext() - .getMemoryReservationContext(); + this.memoryReservationManager = operatorContext.getMemoryReservationContext(); } @Override @@ -199,7 +195,7 @@ public void close() throws Exception { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java index 2032ba156c29f..4d653b33377af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; @@ -74,7 +74,7 @@ public class StreamingAggregationOperator extends AbstractOperator { private final Deque outputs = new LinkedList<>(); public StreamingAggregationOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator child, List groupByTypes, List groupByChannels, @@ -256,7 +256,7 @@ public void close() throws Exception { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java index 7e8eaedeb7239..43e17b2b227ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; @@ -87,7 +87,7 @@ public class StreamingHashAggregationOperator extends AbstractOperator { private long maxUsedMemory; public StreamingHashAggregationOperator( - OperatorContext operatorContext, + CommonOperatorContext operatorContext, Operator child, List preGroupedChannels, List preGroupedIndexInResult, @@ -127,11 +127,7 @@ public StreamingHashAggregationOperator( operatorContext, maxPartialMemory, NOOP); - this.memoryReservationManager = - operatorContext - .getDriverContext() - .getFragmentInstanceContext() - .getMemoryReservationContext(); + this.memoryReservationManager = operatorContext.getMemoryReservationContext(); updateOccupiedMemorySize(); } @@ -327,7 +323,7 @@ public void close() throws Exception { } @Override - public OperatorContext getOperatorContext() { + public CommonOperatorContext getOperatorContext() { return operatorContext; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java index d6253e05c79b9..1e6a71ccaea1f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; @@ -66,7 +66,7 @@ public class InMemoryHashAggregationBuilder implements HashAggregationBuilder { private final int expectedGroups; private final Optional hashChannel; - private final OperatorContext operatorContext; + private final CommonOperatorContext operatorContext; private static final String CURRENT_GROUP_NUMBER = "CurrentGroupNumber"; private static final String MAX_GROUP_NUMBER = "MaxGroupNumber"; @@ -79,7 +79,7 @@ public InMemoryHashAggregationBuilder( List groupByTypes, List groupByChannels, Optional hashChannel, - OperatorContext operatorContext, + CommonOperatorContext operatorContext, long maxPartialMemory, UpdateMemory updateMemory) { this( @@ -102,7 +102,7 @@ public InMemoryHashAggregationBuilder( List groupByTypes, List groupByChannels, Optional hashChannel, - OperatorContext operatorContext, + CommonOperatorContext operatorContext, long maxPartialMemory, Optional unspillIntermediateChannelOffset, UpdateMemory updateMemory) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 0d23e34705d2d..f09f27e268626 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.plan.planner; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.AssignUniqueIdOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.CollectOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.EnforceSingleRowOperator; @@ -365,7 +365,7 @@ protected Operator constructFilterAndProjectOperator( visitor.process(expression, projectColumnTransformerContext)); } - final OperatorContext operatorContext = + final CommonOperatorContext operatorContext = addOperatorContext(context, planNodeId, FilterAndProjectOperator.class.getSimpleName()); // Project expressions don't contain Non-Mappable UDF, TransformOperator is not needed @@ -429,7 +429,7 @@ public Operator visitGapFill(GapFillNode node, C context) { int timeColumnIndex = getColumnIndex(node.getGapFillColumn(), node.getChild()); if (node.getGapFillGroupingKeys().isEmpty()) { // without group keys if (node.getMonthDuration() == 0) { // without month interval - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), GapFillWoGroupWoMoOperator.class.getSimpleName()); return new GapFillWoGroupWoMoOperator( @@ -441,7 +441,7 @@ public Operator visitGapFill(GapFillNode node, C context) { inputDataTypes, node.getNonMonthDuration()); } else { // with month interval - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), GapFillWoGroupWMoOperator.class.getSimpleName()); return new GapFillWoGroupWMoOperator( @@ -461,7 +461,7 @@ public Operator visitGapFill(GapFillNode node, C context) { genFillGroupKeyComparator( node.getGapFillGroupingKeys(), node, inputDataTypes, groupingKeysIndexSet); if (node.getMonthDuration() == 0) { // without month interval - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), GapFillWGroupWoMoOperator.class.getSimpleName()); return new GapFillWGroupWoMoOperator( @@ -475,7 +475,7 @@ public Operator visitGapFill(GapFillNode node, C context) { groupingKeysIndexSet, node.getNonMonthDuration()); } else { // with month interval - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), GapFillWGroupWMoOperator.class.getSimpleName()); return new GapFillWGroupWMoOperator( @@ -512,7 +512,7 @@ public Operator visitPreviousFill(PreviousFillNode node, C context) { context.getZoneId()); if (node.getGroupingKeys().isPresent()) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), PreviousFillWithGroupOperator.class.getSimpleName()); return new PreviousFillWithGroupOperator( @@ -524,7 +524,7 @@ public Operator visitPreviousFill(PreviousFillNode node, C context) { node.getGroupingKeys().get(), node, inputDataTypes, new HashSet<>()), inputDataTypes); } else { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), TableFillOperator.class.getSimpleName()); return new TableFillOperator(operatorContext, fillArray, child, helperColumnIndex); @@ -580,7 +580,7 @@ public Operator visitLinearFill(LinearFillNode node, C context) { ILinearFill[] fillArray = getLinearFill(inputColumnCount, inputDataTypes); if (node.getGroupingKeys().isPresent()) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), @@ -594,7 +594,7 @@ public Operator visitLinearFill(LinearFillNode node, C context) { node.getGroupingKeys().get(), node, inputDataTypes, new HashSet<>()), inputDataTypes); } else { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), TableLinearFillOperator.class.getSimpleName()); return new TableLinearFillOperator(operatorContext, fillArray, child, helperColumnIndex); @@ -604,7 +604,7 @@ public Operator visitLinearFill(LinearFillNode node, C context) { @Override public Operator visitValueFill(ValueFillNode node, C context) { Operator child = node.getChild().accept(this, context); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext(context, node.getPlanNodeId(), TableFillOperator.class.getSimpleName()); List inputDataTypes = getOutputColumnTypes(node.getChild(), context.getTableTypeProvider()); @@ -707,7 +707,7 @@ private IFill[] getValueFill( @Override public Operator visitLimit(LimitNode node, C context) { Operator child = node.getChild().accept(this, context); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext(context, node.getPlanNodeId(), LimitOperator.class.getSimpleName()); return new LimitOperator(operatorContext, node.getCount(), child); @@ -716,7 +716,7 @@ public Operator visitLimit(LimitNode node, C context) { @Override public Operator visitOffset(OffsetNode node, C context) { Operator child = node.getChild().accept(this, context); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext(context, node.getPlanNodeId(), OffsetOperator.class.getSimpleName()); return new OffsetOperator(operatorContext, node.getCount(), child); @@ -729,7 +729,7 @@ public Operator visitOutput(OutputNode node, C context) { @Override public Operator visitCollect(CollectNode node, C context) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext(context, node.getPlanNodeId(), CollectOperator.class.getSimpleName()); List children = new ArrayList<>(node.getChildren().size()); for (PlanNode child : node.getChildren()) { @@ -740,7 +740,7 @@ public Operator visitCollect(CollectNode node, C context) { @Override public Operator visitMergeSort(MergeSortNode node, C context) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), TableMergeSortOperator.class.getSimpleName()); List children = new ArrayList<>(node.getChildren().size()); @@ -769,7 +769,7 @@ public Operator visitMergeSort(MergeSortNode node, C context) { @Override public Operator visitSort(SortNode node, C context) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext(context, node.getPlanNodeId(), TableSortOperator.class.getSimpleName()); List dataTypes = getOutputColumnTypes(node, context.getTableTypeProvider()); int sortItemsCount = node.getOrderingScheme().getOrderBy().size(); @@ -794,14 +794,14 @@ public Operator visitSort(SortNode node, C context) { node.getOrderingScheme().getOrderingList(), sortItemIndexList, sortItemDataTypeList)); } - protected abstract String getSortTmpDir(OperatorContext operatorContext); + protected abstract String getSortTmpDir(CommonOperatorContext operatorContext); - protected abstract OperatorContext addOperatorContext( + protected abstract CommonOperatorContext addOperatorContext( C context, PlanNodeId planNodeId, String operatorType); @Override public Operator visitTopK(TopKNode node, C context) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext(context, node.getPlanNodeId(), TableTopKOperator.class.getSimpleName()); List children = new ArrayList<>(node.getChildren().size()); for (PlanNode child : node.getChildren()) { @@ -862,7 +862,7 @@ protected void genSortInformation( @Override public Operator visitStreamSort(StreamSortNode node, C context) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), TableStreamSortOperator.class.getSimpleName()); List dataTypes = getOutputColumnTypes(node, context.getTableTypeProvider()); @@ -950,7 +950,7 @@ public Operator visitJoin(JoinNode node, C context) { // cross join does not need time column if (node.isCrossJoin()) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), @@ -1020,7 +1020,7 @@ public Operator visitJoin(JoinNode node, C context) { ComparisonExpression.Operator asofOperator = asofJoinClause.getOperator(); if (requireNonNull(node.getJoinType()) == JoinNode.JoinType.INNER) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), @@ -1040,7 +1040,7 @@ public Operator visitJoin(JoinNode node, C context) { !asofJoinClause.isOperatorContainsGreater()), dataTypes); } else if (requireNonNull(node.getJoinType()) == JoinNode.JoinType.LEFT) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), AsofMergeSortLeftJoinOperator.class.getSimpleName()); return new AsofMergeSortLeftJoinOperator( @@ -1063,7 +1063,7 @@ public Operator visitJoin(JoinNode node, C context) { } if (requireNonNull(node.getJoinType()) == JoinNode.JoinType.INNER) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), MergeSortInnerJoinOperator.class.getSimpleName()); return new MergeSortInnerJoinOperator( @@ -1077,7 +1077,7 @@ public Operator visitJoin(JoinNode node, C context) { JoinKeyComparatorFactory.getComparators(joinKeyTypes, true), dataTypes); } else if (requireNonNull(node.getJoinType()) == JoinNode.JoinType.FULL) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), MergeSortFullOuterJoinOperator.class.getSimpleName()); return new MergeSortFullOuterJoinOperator( @@ -1092,7 +1092,7 @@ public Operator visitJoin(JoinNode node, C context) { dataTypes, joinKeyTypes.stream().map(this::buildUpdateLastRowFunction).collect(Collectors.toList())); } else if (requireNonNull(node.getJoinType()) == JoinNode.JoinType.LEFT) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), MergeSortLeftJoinOperator.class.getSimpleName()); return new MergeSortLeftJoinOperator( @@ -1195,7 +1195,7 @@ public Operator visitSemiJoin(SemiJoinNode node, C context) { sourceJoinKeyType, context.getTableTypeProvider().getTableModelType(node.getFilteringSourceJoinSymbol())); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), MergeSortSemiJoinOperator.class.getSimpleName()); return new MergeSortSemiJoinOperator( @@ -1222,7 +1222,7 @@ protected void checkIfJoinKeyTypeMatches(Type leftJoinKeyType, Type rightJoinKey @Override public Operator visitEnforceSingleRow(EnforceSingleRowNode node, C context) { Operator child = node.getChild().accept(this, context); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), EnforceSingleRowOperator.class.getSimpleName()); @@ -1232,7 +1232,7 @@ public Operator visitEnforceSingleRow(EnforceSingleRowNode node, C context) { @Override public Operator visitAssignUniqueId(AssignUniqueId node, C context) { Operator child = node.getChild().accept(this, context); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), EnforceSingleRowOperator.class.getSimpleName()); @@ -1253,7 +1253,7 @@ public Operator visitAggregation(AggregationNode node, C context) { private Operator planGlobalAggregation( AggregationNode node, Operator child, ITableTypeProvider typeProvider, C context) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), AggregationOperator.class.getSimpleName()); Map aggregationMap = node.getAggregations(); @@ -1355,7 +1355,7 @@ protected Operator planGroupByAggregation( null, Collections.emptySet()))); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), StreamingAggregationOperator.class.getSimpleName()); return new StreamingAggregationOperator( @@ -1399,7 +1399,7 @@ protected Operator planGroupByAggregation( } List preGroupedChannels = preGroupedChannelsBuilder.build(); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), @@ -1427,7 +1427,7 @@ protected Operator planGroupByAggregation( (k, v) -> aggregatorBuilder.add( buildGroupByAggregator(childLayout, k, v, node.getStep(), typeProvider))); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), HashAggregationOperator.class.getSimpleName()); @@ -1513,13 +1513,13 @@ public Operator visitTableFunctionProcessor(TableFunctionProcessorNode node, C c .map(context.getTableTypeProvider()::getTableModelType) .map(InternalTypeManager::getTSDataType) .collect(Collectors.toList()); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), TableFunctionLeafOperator.class.getSimpleName()); return new TableFunctionLeafOperator(operatorContext, processorProvider, outputDataTypes); } else { Operator operator = node.getChild().accept(this, context); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), TableFunctionOperator.class.getSimpleName()); @@ -1600,7 +1600,7 @@ private PatternAggregator buildPatternAggregator( @Override public Operator visitPatternRecognition(PatternRecognitionNode node, C context) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), PatternRecognitionOperator.class.getSimpleName()); @@ -1961,7 +1961,7 @@ protected enum OptimizeType { @Override public Operator visitMarkDistinct(MarkDistinctNode node, C context) { Operator child = node.getChild().accept(this, context); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), MarkDistinctOperator.class.getSimpleName()); @@ -1983,7 +1983,7 @@ public Operator visitMarkDistinct(MarkDistinctNode node, C context) { public Operator visitWindowFunction(WindowNode node, C context) { ITableTypeProvider typeProvider = context.getTableTypeProvider(); Operator child = node.getChild().accept(this, context); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), TableWindowOperator.class.getSimpleName()); @@ -2145,7 +2145,7 @@ public Operator visitUnion(UnionNode node, C context) { node.getChildren().stream() .map(child -> child.accept(this, context)) .collect(Collectors.toList()); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), MappingCollectOperator.class.getSimpleName()); @@ -2167,7 +2167,7 @@ public Operator visitUnion(UnionNode node, C context) { @Override public Operator visitValuesNode(ValuesNode node, C context) { - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), MappingCollectOperator.class.getSimpleName()); @@ -2179,7 +2179,7 @@ public Operator visitValuesNode(ValuesNode node, C context) { @Override public Operator visitRowNumber(RowNumberNode node, C context) { Operator child = node.getChild().accept(this, context); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), MappingCollectOperator.class.getSimpleName()); @@ -2216,7 +2216,7 @@ public Operator visitRowNumber(RowNumberNode node, C context) { @Override public Operator visitTopKRanking(TopKRankingNode node, C context) { Operator child = node.getChild().accept(this, context); - OperatorContext operatorContext = + CommonOperatorContext operatorContext = addOperatorContext( context, node.getPlanNodeId(), MappingCollectOperator.class.getSimpleName()); 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 c278f253358d7..dadc5012ec384 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 @@ -45,7 +45,6 @@ import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.db.audit.DNAuditLogger; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.SessionInfo; @@ -75,6 +74,7 @@ import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FakedFragmentInstanceContext; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractSeriesAggregationScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesAggregationScanOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java index b9ae87b37e73c..305bd5c9033f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.schedule.task.DriverTaskId; import org.apache.iotdb.db.queryengine.metric.QueryMetricsManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java index 1bbe2b9b764a1..d153e05f69631 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.driver; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.ExchangeOperator; import org.apache.iotdb.db.queryengine.execution.schedule.task.DriverTaskId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java index 5b42dab79fc6d..4e2319b5a1872 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java @@ -20,7 +20,6 @@ package org.apache.iotdb.db.queryengine.execution.fragment; import org.apache.iotdb.commons.utils.FileUtils; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -30,6 +29,7 @@ import org.apache.iotdb.db.queryengine.execution.exchange.MPPDataExchangeManager; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; import org.apache.iotdb.db.queryengine.execution.operator.ExplainAnalyzeOperator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.schedule.IDriverScheduler; import org.apache.iotdb.db.utils.SetThreadName; import org.apache.iotdb.mpp.rpc.thrift.TFetchFragmentInstanceStatisticsResp; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java index 5aa39c1e99aed..9653b4a39cfbb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java @@ -20,7 +20,6 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java index ed7f3c88eb1da..fd44ca26d4c5c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java @@ -25,7 +25,6 @@ import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java new file mode 100644 index 0000000000000..cef87ab5b139d --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java @@ -0,0 +1,112 @@ +/* + * 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; + +import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; +import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; + +import org.apache.tsfile.utils.RamUsageEstimator; + +import java.util.Objects; + +/** DataNode-specific operator context. */ +public class OperatorContext extends CommonOperatorContext { + + private static final long INSTANCE_SIZE = + RamUsageEstimator.shallowSizeOfInstance(OperatorContext.class); + private DriverContext driverContext; + + public OperatorContext( + int operatorId, PlanNodeId planNodeId, String operatorType, DriverContext driverContext) { + super(operatorId, planNodeId, operatorType); + this.driverContext = driverContext; + } + + @TestOnly + public OperatorContext( + int operatorId, + PlanNodeId planNodeId, + String operatorType, + FragmentInstanceContext fragmentInstanceContext) { + super(operatorId, planNodeId, operatorType); + this.driverContext = new DriverContext(fragmentInstanceContext, 0); + } + + public DriverContext getDriverContext() { + return driverContext; + } + + public void setDriverContext(DriverContext driverContext) { + this.driverContext = driverContext; + } + + public FragmentInstanceContext getInstanceContext() { + return driverContext.getFragmentInstanceContext(); + } + + public SessionInfo getSessionInfo() { + return getInstanceContext().getSessionInfo(); + } + + @Override + public MemoryReservationManager getMemoryReservationContext() { + return getInstanceContext().getMemoryReservationContext(); + } + + @Override + public int getFragmentId() { + return getInstanceContext().getId().getFragmentId().getId(); + } + + @Override + public int getPipelineId() { + return driverContext.getPipelineId(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + OperatorContext that = (OperatorContext) o; + return operatorId == that.operatorId; + } + + @Override + public int hashCode() { + return Objects.hash(operatorId); + } + + @Override + public long ramBytesUsed() { + return INSTANCE_SIZE + + RamUsageEstimator.sizeOf(operatorType) + + MemoryEstimationHelper.getEstimatedSizeOfAccountableObject(planNodeId); + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java index 457438e925190..4df031d59a8e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java @@ -22,11 +22,11 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.IntoProcessException; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.rpc.TSStatusCode; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java index b326c9d557de7..371aaea226dc6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java index d20644fbde0a8..ee16d5936ecaa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java index d0ca9dc420e71..33d6dfea4f46a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.TimeRange; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java index e9c8fbacee55e..37a89a9db0f03 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.columngenerator.ColumnGenerator; import com.google.common.util.concurrent.ListenableFuture; 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 352995ba593a4..efd2514790324 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 @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.IntoProcessException; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java index b37b04f1e03e5..8d4b779c2b66c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java index 9539ee0efb36f..768bbbad6768b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java index 8e80a80701855..ca0715b3c3eda 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.window.IWindow; import org.apache.iotdb.db.queryengine.execution.operator.window.IWindowManager; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java index 160b75b4e98a1..2069bce5012ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java index 2171746ba8fd1..da80d054d4484 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java index 2e41a73a4fcd2..aa3b0ac29450a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow.SlidingWindowAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java index 468f93af7968c..35a5ef1f06c3b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java @@ -24,10 +24,10 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java index 984c85c68df82..583d4713711f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java index d6694a056e4d9..6c2bfe47d2d27 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java @@ -22,7 +22,6 @@ import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -30,6 +29,7 @@ import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java index 11e8be6562a53..5d5590bc9fe31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractFillOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java index 3b3245a6e15f8..d4998c9015c1f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java index 771ec8a79ea67..4ffa1d1cf3202 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractLinearFillOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java index fdc29a1b4e172..c0a9597675dc5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java index 0586ef55c9f41..e7ed6ae349466 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.SortOperator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.db.utils.sort.TreeDiskSpiller; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java index 0a6531dedf8ae..001deeb873869 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.TopKOperator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java index 277cfb4e09221..f55c38c645cb5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java @@ -23,7 +23,6 @@ import org.apache.iotdb.ainode.rpc.thrift.TInferenceResp; import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; import org.apache.iotdb.db.exception.runtime.ModelInferenceProcessException; @@ -31,6 +30,7 @@ import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.protocol.client.an.AINodeClient; import org.apache.iotdb.db.protocol.client.an.AINodeClientManager; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.model.ModelInferenceDescriptor; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java index 4a9ec2248cb1c..6971475c4316d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.CopyToTsFileOptions; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.TsFileFormatCopyToWriter; import org.apache.iotdb.db.storageengine.rescon.disk.TierManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java index bceb28183758e..a32367649480a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.ColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java index 73a92df566579..0e7cd8256c67c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java index 8b5f10db8da3d..df0473a03041c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java index b1116ea423030..99dcbf2e560f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java index dd7a5375ecb15..6a5ec86cc2aa7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java index 0a0a7febb393b..08d7e71cf9fa4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java index 7a29a99829e63..6c159e2672746 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java index ff8f9c7f61137..832300f4f5771 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java index 009f1d997baf3..d5a7f92aff957 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java index 50bf870d92a78..276e62d08960b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java index 0aa1799ec9716..09e69af85c1ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java index 3a37d00b4b1fb..d573f9a234fea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java index d15cb8b66a229..a80bccfed9cdb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java index e3869ab8f1632..26e960db04093 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java index 9a3b972d6bf24..996508364fb9d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java index c45f2f774be66..6b73ede4a6f6b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java index 9742554db3660..f1851eeb5901c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; 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/CountMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java index ee72cee1b09e5..8fe4604ea907d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.enums.TSDataType; 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 1d54f07bb93e3..314a931cc524e 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 @@ -24,9 +24,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.node.MNodeType; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; 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 ae7bb15d3c135..e2a08deaa6830 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 @@ -24,9 +24,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; 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 608da4762ec08..7b1fa1f9385ff 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 @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java index edd71f2a3e0d3..bd55f5103b7bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java index e5c68d374b8b5..18c7a2bf9eae8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java index 77cff0040c800..aa65e3441d5d6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java @@ -25,11 +25,11 @@ import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.common.schematree.node.SchemaNode; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java index b4a50673180c8..3f7d49ab588b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; 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 8d33cc13a8b25..e9fccdfedf974 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 @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; 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 0b0c48e00b9ac..0ba4335eee36d 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 @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; import org.apache.iotdb.commons.schema.column.ColumnHeader; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java index 7bae5d19ea4b8..b4abb30ef0fa0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java index a4691f8126b07..e0b62aa5d3d2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java index 08cedd587567a..d5fffd6b14b8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.tsfile.enums.TSDataType; 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 db952156935be..916921e3c870f 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 @@ -24,9 +24,9 @@ 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.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DeviceContext; +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.schemaengine.template.ClusterTemplateManager; 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 d081aa41e61e5..0f2b940a3a62e 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 @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java index 20e80ee043f53..8ad102ef9f904 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.AlignedFullPath; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java index 3633b673f1cc3..3bdb8f78d9d9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.AlignedFullPath; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java index 066523c3cf935..8a7c2fda8dbc3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.source.ISourceHandle; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java index 484e922b03d34..1ffa6542a8359 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java index 4e201f16e30d9..d8ba1cf7989ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.IFullPath; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java index 0f4ab091e72c4..5d35db1e16146 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.IFullPath; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java index fe9059716197d..09dc225f9a025 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.db.storageengine.dataregion.utils.StorageEngineTimePartitionIterator; import org.apache.iotdb.db.storageengine.dataregion.utils.TreeDiskUsageStatisticUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java index 4bdfd82a880b0..8ccddf64ccc40 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; import org.apache.iotdb.db.utils.TimestampPrecisionUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java index 447d85df05a25..655a8854dd35d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanUtil; import org.apache.iotdb.db.queryengine.execution.operator.source.SeriesScanUtil; @@ -188,7 +188,7 @@ protected void constructAlignedSeriesScanUtil() { alignedPath, scanOrder, seriesScanOptions, - operatorContext.getInstanceContext(), + ((OperatorContext) operatorContext).getInstanceContext(), true, measurementColumnTSDataTypes); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java index 49466500deec7..a73a613e33f88 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.commons.path.AlignedFullPath; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractSeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; @@ -283,7 +283,7 @@ private void constructAlignedSeriesScanUtil() { alignedPath, scanOrder, seriesScanOptions, - operatorContext.getInstanceContext(), + ((OperatorContext) operatorContext).getInstanceContext(), true, measurementColumnTSDataTypes); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java index b998db4fdc3bc..70caacbf358eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java @@ -21,10 +21,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; import org.apache.iotdb.db.utils.cte.CteDataReader; import org.apache.iotdb.db.utils.cte.CteDataStore; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java index ecd7659ee9daa..a3b18234c3ad9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; 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 index 288c686a4e6d7..472a2db1d5df2 100644 --- 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 @@ -63,7 +63,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowTopicReq; import org.apache.iotdb.confignode.rpc.thrift.TTableInfo; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.ConnectionInfo; @@ -80,6 +79,7 @@ import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.QueryState; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; import org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.ShowCreateViewTask; 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 index fd1fc859c77fd..579eb316ca982 100644 --- 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 @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java index 53aca92a40c4b..952a1b802c256 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; 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/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 6aa266ff74333..d482746268c2f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -23,8 +23,8 @@ 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.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; @@ -61,6 +61,7 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.queryengine.execution.operator.EmptyDataOperator; import org.apache.iotdb.db.queryengine.execution.operator.ExplainAnalyzeOperator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.TableIntoOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.TableCopyToOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.FullOuterTimeJoinOperator; @@ -208,14 +209,19 @@ public DataNodeTableOperatorGenerator(Metadata metadata) { } @Override - protected String getSortTmpDir(OperatorContext operatorContext) { - operatorContext.getDriverContext().setHaveTmpFile(true); - operatorContext.getDriverContext().getFragmentInstanceContext().setMayHaveTmpFile(true); + protected String getSortTmpDir(CommonOperatorContext operatorContext) { + OperatorContext dataNodeOperatorContext = (OperatorContext) operatorContext; + dataNodeOperatorContext.getDriverContext().setHaveTmpFile(true); + dataNodeOperatorContext.getDriverContext().getFragmentInstanceContext().setMayHaveTmpFile(true); return IoTDBDescriptor.getInstance().getConfig().getSortTmpDir() + File.separator - + operatorContext.getDriverContext().getFragmentInstanceContext().getId().getFullId() + + dataNodeOperatorContext + .getDriverContext() + .getFragmentInstanceContext() + .getId() + .getFullId() + File.separator - + operatorContext.getDriverContext().getPipelineId() + + dataNodeOperatorContext.getDriverContext().getPipelineId() + File.separator; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index 2f18a99fe0d41..d0354b3028406 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -30,7 +30,6 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.AggregationMergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.CollectOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator; @@ -77,6 +76,7 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil; import org.apache.iotdb.db.queryengine.execution.operator.ExplainAnalyzeOperator; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.ActiveRegionScanMergeOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.AggregationOperator; import org.apache.iotdb.db.queryengine.execution.operator.process.ColumnInjectOperator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java index 5cc287f6e4259..b43e373ed0472 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.AggregationMergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java index be16024ee04c8..edf7131b09995 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java @@ -26,7 +26,6 @@ import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java index faa1bd6301a71..1d51a91c29ef2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java @@ -22,7 +22,6 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.CteScanOperator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java index 54b1b9550e3e9..719cfbdc77b05 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java @@ -26,7 +26,6 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java index aed7e437003b3..7d77c3e25dbf3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java @@ -20,7 +20,6 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java index 78f085d5b3378..6649a6f6ebede 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java @@ -20,7 +20,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.FixedIntervalFillFilter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java index 7afc2ca4e12ef..802655c8307e7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java @@ -21,7 +21,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; 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 b73d6fbb05a1f..d20ea18e48cce 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,7 +22,6 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index 20e66401667c7..daa3db41df121 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -27,7 +27,6 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java index 0b36fb00c44c9..4320835e16741 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java @@ -23,7 +23,6 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.SortOperator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java index f6e0546ab24d5..2aca46bbadcd3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java @@ -23,7 +23,6 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java index 05d0f19f7b4e0..08fd4a88ba93f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java @@ -25,7 +25,6 @@ import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java index a2426ee731538..74cd3dd52720d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java @@ -20,7 +20,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java index 11e35fdd0cc9a..5d1ce71e2a3c4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java @@ -24,7 +24,6 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java index 62889b87d088c..edc281b9a41dc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java @@ -24,7 +24,6 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java index 238fa37c94d65..49386b1497c8e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java @@ -22,7 +22,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.TableStreamSortOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -33,6 +32,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; import org.apache.iotdb.db.utils.datastructure.SortKey; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java index 1b0ecd6e0c2e7..bb4b8d8cb3f81 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java @@ -21,7 +21,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWGroupWMoOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; @@ -34,6 +33,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java index 91ac1d4710b8b..9c20f80212542 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java @@ -21,7 +21,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; @@ -34,6 +33,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java index add04df03d5e6..0f766b1f92518 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java @@ -21,7 +21,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWMoOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; @@ -33,6 +32,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java index aaee67935a028..7c67543246cfe 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java @@ -21,7 +21,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; @@ -32,6 +31,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java index 2728830ec61eb..59dba2b9147d5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java index ed2b97afe9754..b3a7dd0678309 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java index ce6ce3d01b26a..77a84ae14210e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java @@ -21,7 +21,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.PartitionRecognizer; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; @@ -31,6 +30,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java index e043afadcb503..86264f0952565 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java @@ -21,7 +21,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.RowNumberOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -31,6 +30,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java index 592ce5a56fb4a..8d7677a94343b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java @@ -21,7 +21,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.TableWindowOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RankFunction; @@ -34,6 +33,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java index f61689914e48a..1280dd293be45 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java @@ -21,7 +21,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.TopKRankingOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -33,6 +32,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.TreeLinearFillOperator; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java index 0eb94ffc02c07..350962529fe08 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java @@ -21,7 +21,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -30,6 +29,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ITimeSeriesSchemaInfo; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java index 37f0b7782e083..1d2fe58b93f46 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java @@ -20,7 +20,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -29,6 +28,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ISchemaInfo; 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 8c4ff31f50bea..09ca7b0047886 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 @@ -25,7 +25,6 @@ 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.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -34,6 +33,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.SchemaSourceFactory; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java index 1416a235bb5c0..30625a830d744 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.AbstractTableScanOperatorParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java index e91486b17dd09..b499dd5a4eb62 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java @@ -21,7 +21,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; @@ -34,6 +33,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java index c8dffa7497fbc..2d3dbfe4c1c7a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.memory.ThreadSafeMemoryReservationManager; import com.google.common.util.concurrent.ListenableFuture; 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 99f6a9c7fa5c4..b9262f8fb8618 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 @@ -21,7 +21,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.OperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -43,6 +42,7 @@ import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; +import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; From bfcbb917299da42c7c9b16f7875eaccdb0df4a65 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 20 Apr 2026 15:38:29 +0800 Subject: [PATCH 38/45] move ObjectTypeUtils --- .../request/read/ttl/ShowTTLPlan.java | 2 +- .../response/pipe/task/PipeTableResp.java | 2 +- .../confignode/manager/ProcedureManager.java | 2 +- .../impl/region/AddRegionPeerProcedure.java | 2 +- .../region/ReconstructRegionProcedure.java | 2 +- .../impl/region/RegionMigrateProcedure.java | 2 +- .../region/RemoveRegionPeerProcedure.java | 2 +- .../ArithmeticBinaryColumnTransformer.ftl | 4 +- .../exception/MemoryNotEnoughException.java | 2 +- .../GroupedTopNRowNumberAccumulator.java | 2 +- .../SimpleTsBlockWithPositionComparator.java | 4 +- .../process/AbstractSortOperator.java | 14 +- .../process/AggregationMergeSortOperator.java | 6 +- .../operator/process/MergeSortOperator.java | 6 +- .../PreviousFillWithGroupOperator.java | 2 +- .../operator/process/SortOperator.java | 4 +- .../TableLinearFillWithGroupOperator.java | 2 +- .../process/TableMergeSortOperator.java | 2 +- .../operator/process/TableSortOperator.java | 4 +- .../process/TableStreamSortOperator.java | 4 +- .../operator/process/TableTopKOperator.java | 2 +- .../operator/process/TopKOperator.java | 6 +- .../process/function/PartitionRecognizer.java | 2 +- .../process/function/partition/Slice.java | 2 +- .../gapfill/AbstractGapFillOperator.java | 2 +- .../AbstractGapFillWGroupOperator.java | 2 +- .../AbstractGapFillWoGroupOperator.java | 2 +- .../gapfill/GapFillWGroupWMoOperator.java | 2 +- .../gapfill/GapFillWGroupWoMoOperator.java | 2 +- .../join/merge/MergeSortComparator.java | 2 +- .../process/join/merge/SortKeyComparator.java | 2 +- .../aggregation/RecordIterator.java | 2 +- .../grouped/StreamingAggregationOperator.java | 2 +- .../StreamingHashAggregationOperator.java | 2 +- .../plan/planner/CommonOperatorUtils.java | 2 +- .../plan/planner/TableOperatorGenerator.java | 10 +- .../CastToTimestampLiteralVisitor.java | 2 +- ...AbstractCastFunctionColumnTransformer.java | 2 +- .../unary/scalar/ExtractTransformer.java | 8 +- .../unary/scalar/FormatColumnTransformer.java | 2 +- .../scalar/ObjectLengthColumnTransformer.java | 2 +- .../dag/util/CastFunctionUtils.java | 2 +- .../utils/HeapTraversal.java | 2 +- .../utils/constant/SqlConstant.java | 2 +- .../utils/datastructure/MergeSortHeap.java | 2 +- .../utils/datastructure/MergeSortKey.java | 2 +- .../utils/datastructure/SortKey.java | 2 +- .../utils/sort/DiskSpiller.java | 4 +- .../utils/sort/FileSpillerReader.java | 4 +- .../utils/sort/MemoryReader.java | 4 +- .../utils/sort/SortBufferManager.java | 4 +- .../utils/sort/SortReader.java | 4 +- .../utils/sort/TableDiskSpiller.java | 2 +- .../utils/sort/TreeDiskSpiller.java | 2 +- .../org/apache/iotdb/db/conf/IoTDBConfig.java | 22 -- .../apache/iotdb/db/conf/IoTDBDescriptor.java | 21 +- .../db/exception/query/OutOfTTLException.java | 2 +- .../relational/metadata/ColumnMetadata.java | 2 +- .../relational/metadata/ColumnSchema.java | 2 +- .../plan/relational/metadata/TableSchema.java | 2 +- .../plan/relational/sql/ast/Query.java | 2 +- .../utils/DateTimeUtils.java | 238 +--------------- .../utils/IObjectFileService.java | 38 +++ .../utils/IObjectFileServiceProvider.java | 25 ++ .../utils}/IObjectPath.java | 2 +- .../utils/ObjectTypeUtils.java | 122 ++------- .../utils/TimestampPrecisionUtils.java | 2 +- .../utils/cte/CteDataStore.java | 14 +- .../common/heartbeat/PipeHeartbeatEvent.java | 2 +- .../processor/TumblingWindowingProcessor.java | 4 +- .../TumblingTimeSamplingProcessor.java | 2 +- .../transform/converter/ValueConverter.java | 6 +- .../protocol/opcua/server/OpcUaNameSpace.java | 4 +- ...icalDataRegionTsFileAndDeletionSource.java | 2 +- .../PipeRealtimeDataRegionSource.java | 2 +- .../queryengine/common/MPPQueryContext.java | 2 +- .../timerangeiterator/AggrWindowIterator.java | 4 +- .../TimeRangeIteratorFactory.java | 2 +- .../fragment/FragmentInstanceContext.java | 2 +- .../fragment/FragmentInstanceExecution.java | 2 +- .../operator/process/TableIntoOperator.java | 2 +- .../process/TreeMergeSortOperator.java | 2 +- .../operator/process/TreeSortOperator.java | 4 +- .../operator/process/TreeTopKOperator.java | 2 +- .../copyto/tsfile/CopyToTsFileOptions.java | 6 +- .../join/merge/MergeSortComparatorUtils.java | 2 +- .../operator/source/ShowQueriesOperator.java | 2 +- .../AbstractAggTableScanOperator.java | 2 +- .../relational/AbstractTableScanOperator.java | 2 +- .../source/relational/CteScanOperator.java | 2 +- ...formationSchemaContentSupplierFactory.java | 2 +- .../LastQueryAggTableScanOperator.java | 2 +- .../MeasurementToTableViewAdaptorUtils.java | 2 +- .../TreeToTableViewAdaptorOperator.java | 2 +- .../execution/schedule/DriverScheduler.java | 2 +- .../execution/schedule/IDriverScheduler.java | 2 +- .../plan/analyze/AnalyzeVisitor.java | 6 +- .../plan/analyze/ExpressionAnalyzer.java | 2 +- .../plan/analyze/ExpressionTypeAnalyzer.java | 2 +- .../plan/analyze/PredicateUtils.java | 2 +- .../analyze/TemplatedAggregationAnalyze.java | 2 +- .../plan/analyze/load/LoadTsFileAnalyzer.java | 2 +- .../load/LoadTsFileTableSchemaCache.java | 8 +- .../TreeSchemaAutoCreatorAndVerifier.java | 2 +- .../schema/ClusterSchemaFetchExecutor.java | 2 +- .../executor/ClusterConfigTaskExecutor.java | 2 +- .../config/metadata/GetTimeSlotListTask.java | 2 +- .../config/metadata/ShowRegionTask.java | 2 +- .../config/sys/pipe/ShowPipeTask.java | 2 +- .../builtin/helper/CastFunctionHelper.java | 2 +- .../builtin/helper/ReplaceFunctionHelper.java | 4 +- .../builtin/helper/RoundFunctionHelper.java | 2 +- .../helper/SubStringFunctionHelper.java | 10 +- .../CountTimeAggregationAmountVisitor.java | 2 +- .../visitor/ReconstructVisitor.java | 2 +- .../BindSchemaForExpressionVisitor.java | 4 +- .../BindSchemaForPredicateVisitor.java | 4 +- ...viceAndBindSchemaForExpressionVisitor.java | 4 +- ...oncatExpressionWithSuffixPathsVisitor.java | 2 +- .../ConvertPredicateToFilterVisitor.java | 2 +- .../ConvertPredicateToTimeFilterVisitor.java | 2 +- .../optimization/AggregationPushDown.java | 2 +- .../optimization/LimitOffsetPushDown.java | 2 +- .../queryengine/plan/parser/ASTVisitor.java | 61 +++-- .../plan/parser/StatementGenerator.java | 4 +- .../DataNodeTableOperatorGenerator.java | 24 +- .../plan/planner/LocalExecutionPlanner.java | 2 +- .../plan/planner/LogicalPlanBuilder.java | 4 +- .../planner/distribution/SourceRewriter.java | 12 +- .../plan/node/write/InsertTabletNode.java | 2 +- .../planner/plan/node/write/ObjectNode.java | 2 +- .../plan/parameter/AggregationDescriptor.java | 6 +- .../CrossSeriesAggregationDescriptor.java | 2 +- .../plan/parameter/GroupByTimeParameter.java | 2 +- .../plan/relational/analyzer/Analysis.java | 4 +- .../analyzer/ExpressionAnalyzer.java | 8 +- .../analyzer/StatementAnalyzer.java | 6 +- .../ConvertPredicateToFilterVisitor.java | 2 +- .../plan/relational/metadata/Metadata.java | 1 + .../relational/metadata/MetadataUtil.java | 1 + .../relational/metadata/TableMetadata.java | 3 + .../metadata/TableMetadataImpl.java | 4 +- .../metadata/TreeDeviceViewSchema.java | 2 + .../fetcher/TableHeaderSchemaValidator.java | 4 +- .../relational/planner/CteMaterializer.java | 6 +- .../relational/planner/RelationPlanner.java | 4 +- .../planner/TableLogicalPlanner.java | 4 +- .../TableDistributedPlanGenerator.java | 4 +- .../planner/ir/ReplaceSymbolInExpression.java | 2 +- .../iterative/rule/PruneTableScanColumns.java | 2 +- .../rule/SetOperationNodeTranslator.java | 4 +- .../rule/SimplifyCountOverConstant.java | 2 +- .../node/AggregationTableScanNode.java | 6 +- .../AggregationTreeDeviceViewScanNode.java | 2 +- ...gnedAggregationTreeDeviceViewScanNode.java | 2 +- .../relational/planner/node/CteScanNode.java | 2 +- .../planner/node/DeviceTableScanNode.java | 2 +- .../node/InformationSchemaTableScanNode.java | 2 +- .../relational/planner/node/IntoNode.java | 2 +- ...gnedAggregationTreeDeviceViewScanNode.java | 2 +- ...skUsageInformationSchemaTableScanNode.java | 2 +- .../planner/node/TableScanNode.java | 2 +- .../node/TreeAlignedDeviceViewScanNode.java | 2 +- .../planner/node/TreeDeviceViewScanNode.java | 2 +- .../TreeNonAlignedDeviceViewScanNode.java | 2 +- .../optimizations/ParallelizeGrouping.java | 2 +- .../PushLimitOffsetIntoTableScan.java | 2 +- .../PushPredicateIntoTableScan.java | 4 +- .../TransformAggregationToStreamable.java | 2 +- .../TransformSortToStreamSort.java | 2 +- .../UnaliasSymbolReferences.java | 2 +- .../sql/ast/WrappedInsertStatement.java | 4 +- .../relational/sql/parser/AstBuilder.java | 35 ++- .../statement/crud/InsertBaseStatement.java | 2 +- .../statement/crud/InsertRowStatement.java | 2 +- .../statement/crud/InsertTabletStatement.java | 2 +- .../plan/statement/crud/QueryStatement.java | 2 +- .../org/apache/iotdb/db/service/DataNode.java | 2 +- .../storageengine/dataregion/DataRegion.java | 4 +- .../memtable/AbstractWritableMemChunk.java | 2 +- .../reader/chunk/DiskAlignedChunkLoader.java | 2 +- .../read/reader/chunk/DiskChunkLoader.java | 2 +- .../iotdb/db/tools/IoTDBDataDirViewer.java | 2 +- .../iotdb/db/tools/TsFileResourcePrinter.java | 2 +- .../apache/iotdb/db/utils/CommonUtils.java | 6 +- .../iotdb/db/utils/DataNodeDateTimeUtils.java | 259 ++++++++++++++++++ .../db/utils/DataNodeObjectFileService.java | 134 +++++++++ .../DataNodeObjectFileServiceProvider.java | 31 +++ .../apache/iotdb/db/utils/SchemaUtils.java | 2 +- .../iotdb/db/utils/TypeInferenceUtils.java | 2 +- .../iotdb/db/utils/cte/MemoryReader.java | 1 + ...e_commons.utils.IObjectFileServiceProvider | 1 + .../iotdb/db/qp/sql/ASTVisitorTest.java | 2 +- .../FragmentInstanceExecutionTest.java | 2 +- .../AggregationMergeSortOperatorTest.java | 2 +- .../operator/CteScanOperatorTest.java | 6 +- .../operator/MergeTreeSortOperatorTest.java | 2 +- ...nedTreeDeviceViewScanOperatorTreeTest.java | 5 +- .../operator/SortOperatorSortBranchTest.java | 2 +- .../operator/TreeSortOperatorTest.java | 2 +- .../ViewFromTreeAdaptorOperatorTest.java | 2 +- .../process/TableStreamSortOperatorTest.java | 2 +- .../gapfill/GapFillWGroupWMoOperatorTest.java | 2 +- .../GapFillWGroupWoMoOperatorTest.java | 2 +- .../relational/TableScanOperatorTest.java | 2 +- .../schedule/DriverSchedulerTest.java | 2 +- .../ConvertPredicateToTimeFilterTest.java | 2 +- .../plan/parser/StatementGeneratorTest.java | 2 +- .../node/process/IntoNodeSerdeTest.java | 2 +- .../node/source/SourceNodeSerdeTest.java | 2 +- .../relational/analyzer/AnalyzerTest.java | 4 +- .../analyzer/ExtractExpressionTest.java | 2 +- .../relational/analyzer/TSBSMetadata.java | 6 +- .../relational/analyzer/TestMetadata.java | 6 +- .../relational/analyzer/TestPlanBuilder.java | 2 +- .../planner/assertions/AliasMatcher.java | 2 +- .../planner/assertions/ColumnReference.java | 4 +- .../planner/assertions/RvalueMatcher.java | 2 +- .../TablePredicateConversionTest.java | 2 +- .../plan/statement/InsertStatementTest.java | 4 +- .../plan/statement/StatementTestUtils.java | 4 +- .../memtable/PrimitiveMemTableTest.java | 2 +- .../iotdb/db/utils/DateTimeUtilsTest.java | 153 +++++++---- .../iotdb/db/utils/SchemaUtilsTest.java | 2 +- .../db/utils/TimestampPrecisionUtilsTest.java | 2 + .../datastructure/MergeSortHeapTest.java | 3 + .../iotdb/db/utils/sort/SortUtilTest.java | 9 +- .../iotdb/commons/conf/CommonConfig.java | 22 ++ 228 files changed, 1038 insertions(+), 775 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => calc_commons}/exception/MemoryNotEnoughException.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => calc_commons}/utils/HeapTraversal.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => calc_commons}/utils/constant/SqlConstant.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => calc_commons}/utils/datastructure/MergeSortHeap.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => calc_commons}/utils/datastructure/MergeSortKey.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => calc_commons}/utils/datastructure/SortKey.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => calc_commons}/utils/sort/DiskSpiller.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => calc_commons}/utils/sort/FileSpillerReader.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => calc_commons}/utils/sort/MemoryReader.java (93%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => calc_commons}/utils/sort/SortBufferManager.java (95%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => calc_commons}/utils/sort/SortReader.java (92%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => calc_commons}/utils/sort/TableDiskSpiller.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => calc_commons}/utils/sort/TreeDiskSpiller.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/metadata/ColumnMetadata.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/metadata/ColumnSchema.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{queryengine => node_commons}/plan/relational/metadata/TableSchema.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => node_commons}/utils/DateTimeUtils.java (76%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectFileService.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectFileServiceProvider.java rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{storageengine/dataregion => node_commons/utils}/IObjectPath.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => node_commons}/utils/ObjectTypeUtils.java (59%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => node_commons}/utils/TimestampPrecisionUtils.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{ => node_commons}/utils/cte/CteDataStore.java (87%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeDateTimeUtils.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java create mode 100644 iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.utils.IObjectFileServiceProvider diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java index 9f2992eeeb1ac..884d557109fd3 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java @@ -21,7 +21,7 @@ import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType; import org.apache.iotdb.confignode.consensus.request.read.ConfigPhysicalReadPlan; -import org.apache.iotdb.db.utils.constant.SqlConstant; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; public class ShowTTLPlan extends ConfigPhysicalReadPlan { private final String[] pathPattern; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java index 5b5393eaa6895..040636fbde57a 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java @@ -39,7 +39,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowPipeResp; import org.apache.iotdb.confignode.service.ConfigNode; import org.apache.iotdb.consensus.common.DataSet; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; import java.io.IOException; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java index 499c2fe30d3f0..57eb6327c1bff 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java @@ -152,8 +152,8 @@ import org.apache.iotdb.confignode.rpc.thrift.TSubscribeReq; import org.apache.iotdb.confignode.rpc.thrift.TUnsubscribeReq; import org.apache.iotdb.consensus.ConsensusFactory; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.BatchProcessException; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.iotdb.rpc.RpcUtils; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java index d9cd2ad88179a..1ee0af25c9964 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java @@ -31,7 +31,7 @@ import org.apache.iotdb.confignode.procedure.exception.ProcedureException; import org.apache.iotdb.confignode.procedure.state.AddRegionPeerState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.mpp.rpc.thrift.TRegionMigrateResult; import org.slf4j.Logger; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java index 230a40098e378..a08d753abf584 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java @@ -28,7 +28,7 @@ import org.apache.iotdb.confignode.procedure.exception.ProcedureException; import org.apache.iotdb.confignode.procedure.state.ReconstructRegionState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RegionMigrateProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RegionMigrateProcedure.java index 3d70f04f76d46..55baab2ee7eaf 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RegionMigrateProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RegionMigrateProcedure.java @@ -29,7 +29,7 @@ import org.apache.iotdb.confignode.procedure.exception.ProcedureException; import org.apache.iotdb.confignode.procedure.state.RegionTransitionState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java index 9b4c29b095ecc..04eb72b05c44e 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java @@ -32,7 +32,7 @@ import org.apache.iotdb.confignode.procedure.exception.ProcedureException; import org.apache.iotdb.confignode.procedure.state.RemoveRegionPeerState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.mpp.rpc.thrift.TRegionMigrateResult; import org.slf4j.Logger; diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl index 23faf1ecaa6ac..805e28a4f2f5e 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl @@ -32,7 +32,7 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -176,7 +176,7 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/exception/MemoryNotEnoughException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/exception/MemoryNotEnoughException.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/exception/MemoryNotEnoughException.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/exception/MemoryNotEnoughException.java index 769399d51abd9..c873ffd9955d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/exception/MemoryNotEnoughException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/exception/MemoryNotEnoughException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.exception; +package org.apache.iotdb.db.calc_commons.exception; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java index 15a687afa5276..4c0f6f1acf2ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java @@ -21,7 +21,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; -import org.apache.iotdb.db.utils.HeapTraversal; +import org.apache.iotdb.db.calc_commons.utils.HeapTraversal; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java index c9c296b8dca07..7c08086a53775 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.utils.datastructure.MergeSortKey; -import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java index e777b960f9345..7364b519284d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java @@ -23,13 +23,13 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; -import org.apache.iotdb.db.utils.datastructure.MergeSortKey; -import org.apache.iotdb.db.utils.datastructure.SortKey; -import org.apache.iotdb.db.utils.sort.DiskSpiller; -import org.apache.iotdb.db.utils.sort.MemoryReader; -import org.apache.iotdb.db.utils.sort.SortBufferManager; -import org.apache.iotdb.db.utils.sort.SortReader; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.sort.DiskSpiller; +import org.apache.iotdb.db.calc_commons.utils.sort.MemoryReader; +import org.apache.iotdb.db.calc_commons.utils.sort.SortBufferManager; +import org.apache.iotdb.db.calc_commons.utils.sort.SortReader; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java index 7f51429af96a5..838595026e55e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; -import org.apache.iotdb.db.utils.datastructure.MergeSortKey; -import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java index 17e8759ede6c7..c1bcc4cc3ec8e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java @@ -21,10 +21,10 @@ import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; -import org.apache.iotdb.db.utils.datastructure.MergeSortKey; -import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java index 5fa15e6feeea5..859f81512c920 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java index 4d745e7269494..925f7deb4f042 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.sort.DiskSpiller; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.utils.datastructure.SortKey; -import org.apache.iotdb.db.utils.sort.DiskSpiller; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java index 7b6eb6685e1f6..8edbe38a88b5c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java index 87f1da491f264..b2ec1adf3bb04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java index 0b74af42ebb3e..93228769356ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.utils.datastructure.SortKey; -import org.apache.iotdb.db.utils.sort.TableDiskSpiller; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.sort.TableDiskSpiller; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java index ef059465d7959..580d8a31771c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.sort.TableDiskSpiller; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.utils.datastructure.SortKey; -import org.apache.iotdb.db.utils.sort.TableDiskSpiller; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java index 199d5a60f29bb..efb5ed43804bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java @@ -22,7 +22,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java index 2e69dd2174859..24c42c4d58551 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java @@ -21,10 +21,10 @@ import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.utils.datastructure.MergeSortHeap; -import org.apache.iotdb.db.utils.datastructure.MergeSortKey; -import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/PartitionRecognizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/PartitionRecognizer.java index 985192d5d29c5..b73ecc9cae986 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/PartitionRecognizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/PartitionRecognizer.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; -import org.apache.iotdb.db.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.type.Type; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/Slice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/Slice.java index 44630f3aeeec0..da4b684b299b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/Slice.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/Slice.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition; -import org.apache.iotdb.db.utils.ObjectTypeUtils; +import org.apache.iotdb.db.node_commons.utils.ObjectTypeUtils; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillOperator.java index 76ec9e4e18edf..1978100d19e8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillOperator.java @@ -23,8 +23,8 @@ import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWGroupOperator.java index ed003b13c90d6..ee8b92d21030d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWGroupOperator.java @@ -21,7 +21,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWoGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWoGroupOperator.java index 788acb69be1fb..357703651a028 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWoGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWoGroupOperator.java @@ -21,7 +21,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWMoOperator.java index 652f3d5e2b4b0..8ffbbc1b64073 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWMoOperator.java @@ -21,7 +21,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWoMoOperator.java index 54925b53ab459..456d2096fe203 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWoMoOperator.java @@ -23,7 +23,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java index c329b92bea51b..417c96f5c0fb0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.external.commons.collections4.comparators.ComparatorChain; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java index de83c8dc75d30..fdbb2d60dd548 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge; -import org.apache.iotdb.db.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import java.util.Comparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java index 2dbda97411a3e..7a2560b3a3f54 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.utils.ObjectTypeUtils; +import org.apache.iotdb.db.node_commons.utils.ObjectTypeUtils; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java index 4d653b33377af..42fe652ebce73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java @@ -24,9 +24,9 @@ import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java index 43e17b2b227ec..2abe5bab5dfc1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java @@ -25,9 +25,9 @@ import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/CommonOperatorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/CommonOperatorUtils.java index f7903a3b72212..9a23d395b9e31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/CommonOperatorUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/CommonOperatorUtils.java @@ -48,7 +48,7 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.db.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; +import static org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; public class CommonOperatorUtils { public static final IdentityLinearFill IDENTITY_LINEAR_FILL = new IdentityLinearFill(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index f09f27e268626..05e6a24ef899c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -104,6 +104,7 @@ import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToTimestampLiteralVisitor; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.analyze.ITableTypeProvider; @@ -163,7 +164,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; @@ -216,6 +216,10 @@ import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.UNKNOWN_DATATYPE; import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.getLinearFill; import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.getPreviousFill; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_AGGREGATION; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; @@ -225,10 +229,6 @@ import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition.LAST; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; -import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_AGGREGATION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_BY_AGGREGATION; import static org.apache.tsfile.read.common.type.LongType.INT64; import static org.apache.tsfile.read.common.type.StringType.STRING; import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java index ffda563646b79..0dfd9574d9aa8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java @@ -29,7 +29,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import java.time.ZoneId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java index 5b62959072452..c8f8247b3e711 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java @@ -24,7 +24,7 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.util.CastFunctionUtils; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java index c43f872cb21e9..638cb8aaa5375 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java @@ -31,10 +31,10 @@ import java.util.function.Function; import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR; -import static org.apache.iotdb.db.utils.DateTimeUtils.convertToZonedDateTime; -import static org.apache.iotdb.db.utils.DateTimeUtils.getExtractTimestampMsPartFunction; -import static org.apache.iotdb.db.utils.DateTimeUtils.getExtractTimestampNsPartFunction; -import static org.apache.iotdb.db.utils.DateTimeUtils.getExtractTimestampUsPartFunction; +import static org.apache.iotdb.db.node_commons.utils.DateTimeUtils.convertToZonedDateTime; +import static org.apache.iotdb.db.node_commons.utils.DateTimeUtils.getExtractTimestampMsPartFunction; +import static org.apache.iotdb.db.node_commons.utils.DateTimeUtils.getExtractTimestampNsPartFunction; +import static org.apache.iotdb.db.node_commons.utils.DateTimeUtils.getExtractTimestampUsPartFunction; public class ExtractTransformer extends UnaryColumnTransformer { private final Function evaluateFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java index c20f32b315254..c3ef9dd261708 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java @@ -17,7 +17,7 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java index 1776979a7c285..d898bc714f3ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.utils.ObjectTypeUtils; +import org.apache.iotdb.db.node_commons.utils.ObjectTypeUtils; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java index 434ffdade7991..ec538381bca75 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java @@ -16,7 +16,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/HeapTraversal.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/HeapTraversal.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/HeapTraversal.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/HeapTraversal.java index b0fca32fe9c30..b37e69079b038 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/HeapTraversal.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/HeapTraversal.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.utils; +package org.apache.iotdb.db.calc_commons.utils; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/constant/SqlConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/constant/SqlConstant.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/constant/SqlConstant.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/constant/SqlConstant.java index 564185474ad39..919a3ce08762b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/constant/SqlConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/constant/SqlConstant.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.utils.constant; +package org.apache.iotdb.db.calc_commons.utils.constant; import org.apache.iotdb.commons.path.PartialPath; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeap.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/MergeSortHeap.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeap.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/MergeSortHeap.java index 4d6fd026744b7..b5491333f0cbe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeap.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/MergeSortHeap.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.utils.datastructure; +package org.apache.iotdb.db.calc_commons.utils.datastructure; import java.util.Arrays; import java.util.Comparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/MergeSortKey.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/MergeSortKey.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/MergeSortKey.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/MergeSortKey.java index dbb54afeb0a7b..1ae5060ab1c6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/MergeSortKey.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/MergeSortKey.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.utils.datastructure; +package org.apache.iotdb.db.calc_commons.utils.datastructure; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/SortKey.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/SortKey.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/SortKey.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/SortKey.java index b6a4bec203fad..8db76b13c7d9b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/SortKey.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/SortKey.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.utils.datastructure; +package org.apache.iotdb.db.calc_commons.utils.datastructure; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/DiskSpiller.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/DiskSpiller.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/DiskSpiller.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/DiskSpiller.java index dcba1c8a930af..5d2b440be9f61 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/DiskSpiller.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/DiskSpiller.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.utils.sort; +package org.apache.iotdb.db.calc_commons.utils.sort; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/FileSpillerReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/FileSpillerReader.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/FileSpillerReader.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/FileSpillerReader.java index 2c5e4ef621382..bbc3cc1a43f39 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/FileSpillerReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/FileSpillerReader.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.utils.sort; +package org.apache.iotdb.db.calc_commons.utils.sort; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.utils.datastructure.MergeSortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/MemoryReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/MemoryReader.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/MemoryReader.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/MemoryReader.java index 1adc68be334b0..35da47435640a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/MemoryReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/MemoryReader.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.utils.sort; +package org.apache.iotdb.db.calc_commons.utils.sort; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.utils.datastructure.MergeSortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/SortBufferManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/SortBufferManager.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/SortBufferManager.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/SortBufferManager.java index b26a3f8a58a04..90a451c100b25 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/SortBufferManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/SortBufferManager.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.utils.sort; +package org.apache.iotdb.db.calc_commons.utils.sort; -import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; +import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; public class SortBufferManager { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/SortReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/SortReader.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/SortReader.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/SortReader.java index d3c8a7099bcf5..a3c18344035d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/SortReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/SortReader.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.utils.sort; +package org.apache.iotdb.db.calc_commons.utils.sort; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.utils.datastructure.MergeSortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; public interface SortReader { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/TableDiskSpiller.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/TableDiskSpiller.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/TableDiskSpiller.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/TableDiskSpiller.java index 3ff756aa8eeb1..516306e339602 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/TableDiskSpiller.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/TableDiskSpiller.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.utils.sort; +package org.apache.iotdb.db.calc_commons.utils.sort; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/TreeDiskSpiller.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/TreeDiskSpiller.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/TreeDiskSpiller.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/TreeDiskSpiller.java index 77230f253a79e..0c6d201facc8c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/sort/TreeDiskSpiller.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/TreeDiskSpiller.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.utils.sort; +package org.apache.iotdb.db.calc_commons.utils.sort; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java index d147e39c65948..c7fc72152e21e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java @@ -439,12 +439,6 @@ public class IoTDBConfig { /** Enable auto repair compaction */ private volatile boolean enableAutoRepairCompaction = true; - /** The buffer for cte scan operation */ - private long cteBufferSize = 128 * 1024L; - - /** Max number of rows for cte materialization */ - private int maxRowsInCteBuffer = 1000; - /** Mods cache size limit per fi */ private long modsCacheSizeLimitPerFI = 32 * 1024 * 1024; @@ -4217,22 +4211,6 @@ public void setRateLimiterType(String rateLimiterType) { RateLimiterType = rateLimiterType; } - public void setCteBufferSize(long cteBufferSize) { - this.cteBufferSize = cteBufferSize; - } - - public long getCteBufferSize() { - return cteBufferSize; - } - - public void setMaxRowsInCteBuffer(int maxRowsInCteBuffer) { - this.maxRowsInCteBuffer = maxRowsInCteBuffer; - } - - public int getMaxRowsInCteBuffer() { - return maxRowsInCteBuffer; - } - public void setModsCacheSizeLimitPerFI(long modsCacheSizeLimitPerFI) { this.modsCacheSizeLimitPerFI = modsCacheSizeLimitPerFI; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java index e65b96d29ee01..a209998e6f8a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java @@ -54,7 +54,7 @@ import org.apache.iotdb.db.storageengine.load.disk.ILoadDiskSelector; import org.apache.iotdb.db.storageengine.rescon.disk.TierManager; import org.apache.iotdb.db.storageengine.rescon.memory.SystemInfo; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.utils.DataNodeDateTimeUtils; import org.apache.iotdb.db.utils.datastructure.TVListSortAlgorithm; import org.apache.iotdb.external.api.IPropertiesLoader; import org.apache.iotdb.metrics.config.MetricConfigDescriptor; @@ -1063,18 +1063,18 @@ public void loadProperties(TrimProperties properties) throws BadNodeUrlException long cteBufferSizeInBytes = Long.parseLong( properties.getProperty( - "cte_buffer_size_in_bytes", Long.toString(conf.getCteBufferSize()))); + "cte_buffer_size_in_bytes", Long.toString(commonConfig.getCteBufferSize()))); if (cteBufferSizeInBytes > 0) { - conf.setCteBufferSize(cteBufferSizeInBytes); + commonConfig.setCteBufferSize(cteBufferSizeInBytes); } // max number of rows for cte materialization int maxRowsInCteBuffer = Integer.parseInt( properties.getProperty( - "max_rows_in_cte_buffer", Integer.toString(conf.getMaxRowsInCteBuffer()))); + "max_rows_in_cte_buffer", Integer.toString(commonConfig.getMaxRowsInCteBuffer()))); if (maxRowsInCteBuffer > 0) { - conf.setMaxRowsInCteBuffer(maxRowsInCteBuffer); + commonConfig.setMaxRowsInCteBuffer(maxRowsInCteBuffer); } loadFixedSizeLimitForQuery( @@ -2272,17 +2272,18 @@ public synchronized void loadHotModifiedProps(TrimProperties properties) long cteBufferSizeInBytes = Long.parseLong( properties.getProperty( - "cte_buffer_size_in_bytes", Long.toString(conf.getCteBufferSize()))); + "cte_buffer_size_in_bytes", Long.toString(commonConfig.getCteBufferSize()))); if (cteBufferSizeInBytes > 0) { - conf.setCteBufferSize(cteBufferSizeInBytes); + commonConfig.setCteBufferSize(cteBufferSizeInBytes); } // max number of rows for cte materialization int maxRowsInCteBuffer = Integer.parseInt( properties.getProperty( - "max_rows_in_cte_buffer", Integer.toString(conf.getMaxRowsInCteBuffer()))); + "max_rows_in_cte_buffer", + Integer.toString(commonConfig.getMaxRowsInCteBuffer()))); if (maxRowsInCteBuffer > 0) { - conf.setMaxRowsInCteBuffer(maxRowsInCteBuffer); + commonConfig.setMaxRowsInCteBuffer(maxRowsInCteBuffer); } // max sub-task num for information table scan @@ -2755,7 +2756,7 @@ private void loadCQProps(TrimProperties properties) { } conf.setContinuousQueryMinimumEveryInterval( - DateTimeUtils.convertDurationStrToLong( + DataNodeDateTimeUtils.convertDurationStrToLong( properties.getProperty("continuous_query_minimum_every_interval", "1s").trim(), CommonDescriptor.getInstance().getConfig().getTimestampPrecision(), false)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java index 0eb4fe058ed94..3bddfc7c45b10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.exception.query; import org.apache.iotdb.db.exception.WriteProcessException; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.rpc.TSStatusCode; public class OutOfTTLException extends WriteProcessException { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/ColumnMetadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ColumnMetadata.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/ColumnMetadata.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ColumnMetadata.java index b4c9ba13cb797..fcc0e9431506b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/ColumnMetadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ColumnMetadata.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.metadata; +package org.apache.iotdb.db.node_commons.plan.relational.metadata; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/ColumnSchema.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ColumnSchema.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/ColumnSchema.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ColumnSchema.java index 709bc7b340c7a..fe912b263ac81 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/ColumnSchema.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ColumnSchema.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.metadata; +package org.apache.iotdb.db.node_commons.plan.relational.metadata; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableSchema.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/TableSchema.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableSchema.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/TableSchema.java index cc523503c990f..860e96fe9d7b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableSchema.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/TableSchema.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.queryengine.plan.relational.metadata; +package org.apache.iotdb.db.node_commons.plan.relational.metadata; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Query.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Query.java index 27ef6f6015006..f085ae6e503e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Query.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Query.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.utils.cte.CteDataStore; +import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DateTimeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/DateTimeUtils.java similarity index 76% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DateTimeUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/DateTimeUtils.java index 63e577407cb02..ca47f57c285d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DateTimeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/DateTimeUtils.java @@ -16,21 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.utils; +package org.apache.iotdb.db.node_commons.utils; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.protocol.session.SessionManager; -import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; -import org.apache.iotdb.db.qp.sql.SqlLexer; -import org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor; -import org.apache.iotdb.db.queryengine.plan.parser.SqlParseError; - -import org.antlr.v4.runtime.CharStream; -import org.antlr.v4.runtime.CharStreams; -import org.antlr.v4.runtime.CommonTokenStream; -import org.antlr.v4.runtime.atn.PredictionMode; + import org.apache.tsfile.utils.DateUtils; import org.apache.tsfile.utils.TimeDuration; @@ -46,7 +36,6 @@ import java.time.format.ResolverStyle; import java.time.format.SignStyle; import java.time.temporal.ChronoField; -import java.util.Calendar; import java.util.TimeZone; import java.util.concurrent.TimeUnit; import java.util.function.Function; @@ -61,6 +50,10 @@ private DateTimeUtils() { private static String timestampPrecision; + public static String getTimestampPrecision() { + return timestampPrecision; + } + public static long correctPrecision(long millis) { try { switch (timestampPrecision) { @@ -616,158 +609,6 @@ public static long convertDatetimeStrToLong( return getInstantWithPrecision(str, timestampPrecision); } - /** - * Convert duration string to time value. CurrentTime is used to calculate the days of natural - * month. If it's set as -1, which means a context free situation, then '1mo' will be thought as - * 30 days. - * - * @param duration represent duration string like: 12d8m9ns, 1y1mo, etc. - * @return time in milliseconds, microseconds, or nanoseconds depending on the profile - */ - public static long convertDurationStrToLong(String duration) { - return convertDurationStrToLong(-1, duration, false); - } - - public static long convertDurationStrToLong(String duration, boolean convertYearToMonth) { - return convertDurationStrToLong(-1, duration, convertYearToMonth); - } - - public static long convertDurationStrToLong( - String duration, String timestampPrecision, boolean convertYearToMonth) { - return convertDurationStrToLong(-1, duration, timestampPrecision, convertYearToMonth); - } - - public static long convertDurationStrToLong( - long currentTime, String duration, boolean convertYearToMonth) { - return convertDurationStrToLong( - currentTime, - duration, - CommonDescriptor.getInstance().getConfig().getTimestampPrecision(), - convertYearToMonth); - } - - /** - * convert duration string to time value. - * - * @param duration represent duration string like: 12d8m9ns, 1y1mo, etc. - * @param convertYearToMonth if we need convert year to month. eg: 1y -> 12mo - * @return time in milliseconds, microseconds, or nanoseconds depending on the profile - */ - public static long convertDurationStrToLong( - long currentTime, String duration, String timestampPrecision, boolean convertYearToMonth) { - long total = 0; - long temp = 0; - for (int i = 0; i < duration.length(); i++) { - char ch = duration.charAt(i); - if (Character.isDigit(ch)) { - temp *= 10; - temp += (ch - '0'); - } else { - String unit = String.valueOf(duration.charAt(i)); - // This is to identify units with two letters. - if (i + 1 < duration.length() && !Character.isDigit(duration.charAt(i + 1))) { - i++; - unit += duration.charAt(i); - } - unit = unit.toLowerCase(); - if (convertYearToMonth && unit.equals("y")) { - temp *= 12; - unit = "mo"; - } - total += - DateTimeUtils.convertDurationStrToLong( - currentTime == -1 ? -1 : currentTime + total, temp, unit, timestampPrecision); - temp = 0; - } - } - return total; - } - - @TestOnly - public static long convertDurationStrToLongForTest( - long value, String unit, String timestampPrecision) { - return convertDurationStrToLong(-1, value, unit, timestampPrecision); - } - - /** convert duration string to millisecond, microsecond or nanosecond. */ - public static long convertDurationStrToLong( - long currentTime, long value, String unit, String timestampPrecision) { - DurationUnit durationUnit = DurationUnit.valueOf(unit); - long res = value; - switch (durationUnit) { - case y: - case year: - res *= 365 * 86_400_000L; - break; - case mo: - case month: - if (currentTime == -1) { - res *= 30 * 86_400_000L; - } else { - Calendar calendar = Calendar.getInstance(); - calendar.setTimeZone(SessionManager.getInstance().getSessionTimeZone()); - calendar.setTimeInMillis(currentTime); - calendar.add(Calendar.MONTH, (int) (value)); - res = calendar.getTimeInMillis() - currentTime; - } - break; - case w: - case week: - res *= 7 * 86_400_000L; - break; - case d: - case day: - res *= 86_400_000L; - break; - case h: - case hour: - res *= 3_600_000L; - break; - case m: - case minute: - res *= 60_000L; - break; - case s: - case second: - res *= 1_000L; - break; - default: - break; - } - - if ("us".equals(timestampPrecision) || "microsecond".equals(timestampPrecision)) { - if (unit.equals(DurationUnit.ns.toString()) - || unit.equals(DurationUnit.nanosecond.toString())) { - return value / 1000; - } else if (unit.equals(DurationUnit.us.toString()) - || unit.equals(DurationUnit.microsecond.toString())) { - return value; - } else { - return res * 1000; - } - } else if ("ns".equals(timestampPrecision) || "nanosecond".equals(timestampPrecision)) { - if (unit.equals(DurationUnit.ns.toString()) - || unit.equals(DurationUnit.nanosecond.toString())) { - return value; - } else if (unit.equals(DurationUnit.us.toString()) - || unit.equals(DurationUnit.microsecond.toString())) { - return value * 1000; - } else { - return res * 1000_000; - } - } else { - if (unit.equals(DurationUnit.ns.toString()) - || unit.equals(DurationUnit.nanosecond.toString())) { - return value / 1000_000; - } else if (unit.equals(DurationUnit.us.toString()) - || unit.equals(DurationUnit.microsecond.toString())) { - return value / 1000; - } else { - return res; - } - } - } - public static TimeUnit timestampPrecisionStringToTimeUnit(String timestampPrecision) { if ("us".equals(timestampPrecision) || "microsecond".equals(timestampPrecision)) { return TimeUnit.MICROSECONDS; @@ -885,73 +726,6 @@ public static long calcPositiveIntervalByMonth( startTime, duration, TimeZone.getTimeZone(zoneId), TimestampPrecisionUtils.currPrecision); } - /** - * Storage the duration into two parts: month part and non-month part, the non-month part's - * precision is depended on current time precision. e.g. ms precision: '1y1mo1ms' -> monthDuration - * = 13, nonMonthDuration = 1, ns precision: '1y1mo1ms' -> monthDuration = 13, nonMonthDuration = - * 1000_000. - * - * @param duration the input duration string - * @return the TimeDuration instance contains month part and non-month part - */ - public static TimeDuration constructTimeDuration(String duration) { - duration = duration.toLowerCase(); - String currTimePrecision = CommonDescriptor.getInstance().getConfig().getTimestampPrecision(); - long temp = 0; - long monthDuration = 0; - long nonMonthDuration = 0; - int i = 0; - for (; i < duration.length(); i++) { - char ch = duration.charAt(i); - if (Character.isDigit(ch)) { - temp *= 10; - temp += (ch - '0'); - } else { - StringBuilder unit = new StringBuilder(String.valueOf(duration.charAt(i))); - i++; - // This is to identify units. - while (i < duration.length() && !Character.isDigit(duration.charAt(i))) { - unit.append(duration.charAt(i)); - i++; - } - i--; - if ("y".contentEquals(unit) || "year".contentEquals(unit)) { - monthDuration += temp * 12; - temp = 0; - continue; - } - if ("mo".contentEquals(unit) || "month".contentEquals(unit)) { - monthDuration += temp; - temp = 0; - continue; - } - nonMonthDuration += - DateTimeUtils.convertDurationStrToLong(-1, temp, unit.toString(), currTimePrecision); - temp = 0; - } - } - return new TimeDuration((int) monthDuration, nonMonthDuration); - } - - public static Long parseDateTimeExpressionToLong(String dateExpression, ZoneId zoneId) { - ASTVisitor astVisitor = new ASTVisitor(); - astVisitor.setZoneId(zoneId); - - CharStream charStream1 = CharStreams.fromString(dateExpression); - - SqlLexer lexer1 = new SqlLexer(charStream1); - lexer1.removeErrorListeners(); - lexer1.addErrorListener(SqlParseError.INSTANCE); - - CommonTokenStream tokens1 = new CommonTokenStream(lexer1); - - IoTDBSqlParser parser1 = new IoTDBSqlParser(tokens1); - parser1.getInterpreter().setPredictionMode(PredictionMode.SLL); - parser1.removeErrorListeners(); - parser1.addErrorListener(SqlParseError.INSTANCE); - return astVisitor.parseDateExpression(parser1.dateExpression(), timestampPrecision); - } - public static Integer parseDateExpressionToInt(String dateExpression) { return DateUtils.parseDateExpressionToInt(dateExpression); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectFileService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectFileService.java new file mode 100644 index 0000000000000..edc3b1980aae8 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectFileService.java @@ -0,0 +1,38 @@ +/* + * 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.node_commons.utils; + +import org.apache.tsfile.utils.Binary; + +import java.io.File; +import java.nio.ByteBuffer; +import java.util.Optional; + +public interface IObjectFileService { + + ByteBuffer readObjectContent( + String relativePath, long offset, int readSize, boolean mayNotInCurrentNode); + + Optional getObjectPathFromBinary(Binary binary, boolean needTempFile); + + void deleteObjectPathFromBinary(Binary binary); + + void deleteObjectPath(File file); +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectFileServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectFileServiceProvider.java new file mode 100644 index 0000000000000..889162a9b4270 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectFileServiceProvider.java @@ -0,0 +1,25 @@ +/* + * 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.node_commons.utils; + +public interface IObjectFileServiceProvider { + + IObjectFileService getObjectFileService(); +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/IObjectPath.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectPath.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/IObjectPath.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectPath.java index 2a2910a73d003..408eba7fb7f62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/IObjectPath.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectPath.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.storageengine.dataregion; +package org.apache.iotdb.db.node_commons.utils; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ObjectTypeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/ObjectTypeUtils.java similarity index 59% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ObjectTypeUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/ObjectTypeUtils.java index 6d61056ed6a05..c3e4340240015 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ObjectTypeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/ObjectTypeUtils.java @@ -17,14 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.utils; +package org.apache.iotdb.db.node_commons.utils; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.commons.exception.ObjectFileNotExist; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.service.metrics.FileMetrics; -import org.apache.iotdb.db.storageengine.dataregion.IObjectPath; -import org.apache.iotdb.db.storageengine.rescon.disk.TierManager; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.tsfile.encoding.decoder.Decoder; @@ -32,25 +28,34 @@ import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.Pair; import org.apache.tsfile.utils.ReadWriteIOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.File; -import java.io.IOException; import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; -import java.nio.file.Files; -import java.nio.file.StandardOpenOption; -import java.util.Objects; import java.util.Optional; +import java.util.ServiceLoader; public class ObjectTypeUtils { - private static final Logger logger = LoggerFactory.getLogger(ObjectTypeUtils.class); - private static final TierManager TIER_MANAGER = TierManager.getInstance(); + private static final IObjectFileService OBJECT_FILE_SERVICE = loadObjectFileService(); private ObjectTypeUtils() {} + private static IObjectFileService loadObjectFileService() { + IObjectFileService objectFileService = null; + ServiceLoader loader = + ServiceLoader.load(IObjectFileServiceProvider.class); + for (IObjectFileServiceProvider provider : loader) { + if (objectFileService != null) { + throw new IllegalStateException("Multiple IObjectFileServiceProvider found"); + } + objectFileService = provider.getObjectFileService(); + } + if (objectFileService == null) { + throw new IllegalStateException("No IObjectFileServiceProvider found"); + } + return objectFileService; + } + public static ByteBuffer readObjectContent( Binary binary, long offset, int length, boolean mayNotInCurrentNode) { Pair objectLengthPathPair = @@ -66,31 +71,8 @@ public static ByteBuffer readObjectContent( public static ByteBuffer readObjectContent( String relativePath, long offset, int readSize, boolean mayNotInCurrentNode) { - Optional objectFile = TIER_MANAGER.getAbsoluteObjectFilePath(relativePath, false); - if (objectFile.isPresent()) { - return readObjectContentFromLocalFile(objectFile.get(), offset, readSize); - } - if (mayNotInCurrentNode) { - return readObjectContentFromRemoteFile(relativePath, offset, readSize); - } - throw new ObjectFileNotExist(relativePath); - } - - private static ByteBuffer readObjectContentFromLocalFile(File file, long offset, long readSize) { - byte[] bytes = new byte[(int) readSize]; - ByteBuffer buffer = ByteBuffer.wrap(bytes); - try (FileChannel fileChannel = FileChannel.open(file.toPath(), StandardOpenOption.READ)) { - fileChannel.read(buffer, offset); - } catch (IOException e) { - throw new IoTDBRuntimeException(e, TSStatusCode.OBJECT_READ_ERROR.getStatusCode()); - } - buffer.flip(); - return buffer; - } - - private static ByteBuffer readObjectContentFromRemoteFile( - final String relativePath, final long offset, final int readSize) { - throw new UnsupportedOperationException("readObjectContentFromRemoteFile"); + return OBJECT_FILE_SERVICE.readObjectContent( + relativePath, offset, readSize, mayNotInCurrentNode); } public static Binary generateObjectBinary(long objectSize, IObjectPath objectPath) { @@ -183,70 +165,14 @@ public static Optional getObjectPathFromBinary(Binary binary) { } public static Optional getObjectPathFromBinary(Binary binary, boolean needTempFile) { - byte[] bytes = binary.getValues(); - ByteBuffer buffer = ByteBuffer.wrap(bytes, 8, bytes.length - 8); - String relativeObjectFilePath = - IObjectPath.getDeserializer().deserializeFromObjectValue(buffer).toString(); - return TIER_MANAGER.getAbsoluteObjectFilePath(relativeObjectFilePath, needTempFile); + return OBJECT_FILE_SERVICE.getObjectPathFromBinary(binary, needTempFile); } public static void deleteObjectPathFromBinary(Binary binary) { - Optional file = ObjectTypeUtils.getObjectPathFromBinary(binary, true); - if (!file.isPresent()) { - return; - } - File tmpFile = new File(file.get().getPath() + ".tmp"); - File bakFile = new File(file.get().getPath() + ".back"); - for (int i = 0; i < 2; i++) { - if (file.get().exists()) { - FileMetrics.getInstance().decreaseObjectFileNum(1); - FileMetrics.getInstance().decreaseObjectFileSize(file.get().length()); - } - try { - deleteObjectFile(file.get()); - deleteObjectFile(tmpFile); - deleteObjectFile(bakFile); - } catch (IOException e) { - logger.error("Failed to remove object file {}", file.get().getAbsolutePath(), e); - } - } + OBJECT_FILE_SERVICE.deleteObjectPathFromBinary(binary); } public static void deleteObjectPath(File file) { - File tmpFile = new File(file.getPath() + ".tmp"); - File bakFile = new File(file.getPath() + ".back"); - for (int i = 0; i < 2; i++) { - if (file.exists()) { - FileMetrics.getInstance().decreaseObjectFileNum(1); - FileMetrics.getInstance().decreaseObjectFileSize(file.length()); - } - try { - deleteObjectFile(file); - deleteObjectFile(tmpFile); - deleteObjectFile(bakFile); - } catch (IOException e) { - logger.error("Failed to remove object file {}", file.getAbsolutePath(), e); - } - } - deleteEmptyParentDir(file); - } - - private static void deleteEmptyParentDir(File file) { - File dir = file.getParentFile(); - if (dir.isDirectory() && Objects.requireNonNull(dir.list()).length == 0) { - try { - Files.deleteIfExists(dir.toPath()); - deleteEmptyParentDir(dir); - } catch (IOException e) { - logger.error("Failed to remove empty object dir {}", dir.getAbsolutePath(), e); - } - } - } - - private static void deleteObjectFile(File file) throws IOException { - if (file.exists()) { - logger.info("Remove object file {}, size is {}(byte)", file.getAbsolutePath(), file.length()); - } - Files.deleteIfExists(file.toPath()); + OBJECT_FILE_SERVICE.deleteObjectPath(file); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TimestampPrecisionUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/TimestampPrecisionUtils.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TimestampPrecisionUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/TimestampPrecisionUtils.java index 1dee0a9738f26..b40447f381db0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TimestampPrecisionUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/TimestampPrecisionUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.utils; +package org.apache.iotdb.db.node_commons.utils; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/CteDataStore.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/cte/CteDataStore.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/CteDataStore.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/cte/CteDataStore.java index cb37759e20099..f2fe0899083a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/CteDataStore.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/cte/CteDataStore.java @@ -19,12 +19,12 @@ * */ -package org.apache.iotdb.db.utils.cte; +package org.apache.iotdb.db.node_commons.utils.cte; +import org.apache.iotdb.commons.conf.CommonConfig; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.conf.IoTDBConfig; -import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.Accountable; @@ -58,11 +58,11 @@ public CteDataStore(TableSchema tableSchema, List columnIndex2TsBlockCo } public boolean addTsBlock(TsBlock tsBlock) { - IoTDBConfig iotConfig = IoTDBDescriptor.getInstance().getConfig(); + CommonConfig config = CommonDescriptor.getInstance().getConfig(); long bytesSize = tsBlock.getRetainedSizeInBytes(); int rows = tsBlock.getPositionCount(); - if (bytesSize + cachedBytes >= iotConfig.getCteBufferSize() - || rows + cachedRows >= iotConfig.getMaxRowsInCteBuffer()) { + if (bytesSize + cachedBytes >= config.getCteBufferSize() + || rows + cachedRows >= config.getMaxRowsInCteBuffer()) { return false; } cachedData.add(tsBlock); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java index 8ed7317d2bc5e..1f2aa488b48d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java @@ -26,10 +26,10 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.pipe.metric.overview.PipeHeartbeatEventMetrics; import org.apache.iotdb.db.pipe.source.dataregion.realtime.disruptor.RingBuffer; -import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.iotdb.pipe.api.event.Event; import org.slf4j.Logger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/window/processor/TumblingWindowingProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/window/processor/TumblingWindowingProcessor.java index 27828cba443de..363942d7471f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/window/processor/TumblingWindowingProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/window/processor/TumblingWindowingProcessor.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.pipe.processor.aggregate.window.processor; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.pipe.processor.aggregate.window.datastructure.TimeSeriesWindow; import org.apache.iotdb.db.pipe.processor.aggregate.window.datastructure.WindowOutput; import org.apache.iotdb.db.pipe.processor.aggregate.window.datastructure.WindowState; -import org.apache.iotdb.db.utils.DateTimeUtils; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.iotdb.pipe.api.annotation.TreeModel; import org.apache.iotdb.pipe.api.customizer.configuration.PipeProcessorRuntimeConfiguration; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/downsampling/tumbling/TumblingTimeSamplingProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/downsampling/tumbling/TumblingTimeSamplingProcessor.java index a7411aada3efa..ffe92db552d9a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/downsampling/tumbling/TumblingTimeSamplingProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/downsampling/tumbling/TumblingTimeSamplingProcessor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.processor.downsampling.tumbling; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.pipe.processor.downsampling.DownSamplingProcessor; import org.apache.iotdb.db.pipe.processor.downsampling.PartialPathLastObjectCache; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.iotdb.pipe.api.access.Row; import org.apache.iotdb.pipe.api.annotation.TreeModel; import org.apache.iotdb.pipe.api.collector.RowCollector; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/converter/ValueConverter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/converter/ValueConverter.java index 0ca6c2aa0c454..c1f59415d1939 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/converter/ValueConverter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/converter/ValueConverter.java @@ -19,7 +19,8 @@ package org.apache.iotdb.db.pipe.receiver.transform.converter; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.db.utils.DataNodeDateTimeUtils; import org.apache.iotdb.db.utils.TypeInferenceUtils; import org.apache.tsfile.common.conf.TSFileConfig; @@ -797,7 +798,8 @@ private static long parseTimestamp(final String value) { try { return TypeInferenceUtils.isNumber(value) ? Long.parseLong(value) - : DateTimeUtils.parseDateTimeExpressionToLong(StringUtils.trim(value), ZoneOffset.UTC); + : DataNodeDateTimeUtils.parseDateTimeExpressionToLong( + StringUtils.trim(value), ZoneOffset.UTC); } catch (final Exception e) { return 0L; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java index 3c79a3aa30454..dd5bc20ae1240 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java @@ -22,11 +22,11 @@ import org.apache.iotdb.commons.exception.pipe.PipeRuntimeCriticalException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeNonCriticalException; import org.apache.iotdb.commons.pipe.resource.log.PipeLogger; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.pipe.sink.protocol.opcua.OpcUaSink; import org.apache.iotdb.db.pipe.sink.util.sorter.PipeTableModelTabletEventSorter; import org.apache.iotdb.db.pipe.sink.util.sorter.PipeTreeModelTabletEventSorter; -import org.apache.iotdb.db.utils.DateTimeUtils; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.iotdb.pipe.api.event.Event; import org.apache.tsfile.common.constant.TsFileConstant; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java index 66f8d48ce2813..ccb84bf3216f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java @@ -41,6 +41,7 @@ import org.apache.iotdb.consensus.pipe.IoTConsensusV2; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.DataRegionConsensusImpl; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.pipe.consensus.ReplicateProgressDataNodeManager; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResourceManager; @@ -55,7 +56,6 @@ import org.apache.iotdb.db.storageengine.dataregion.memtable.TsFileProcessor; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileManager; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; -import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.iotdb.pipe.api.customizer.configuration.PipeExtractorRuntimeConfiguration; import org.apache.iotdb.pipe.api.customizer.configuration.PipeRuntimeEnvironment; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java index 718529243d9d0..46290dbec03de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java @@ -32,6 +32,7 @@ import org.apache.iotdb.commons.pipe.event.ProgressReportEvent; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent; import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent; @@ -44,7 +45,6 @@ import org.apache.iotdb.db.pipe.source.dataregion.realtime.listener.PipeTimePartitionListener; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; -import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.iotdb.pipe.api.PipeExtractor; import org.apache.iotdb.pipe.api.customizer.configuration.PipeExtractorRuntimeConfiguration; import org.apache.iotdb.pipe.api.customizer.configuration.PipeRuntimeEnvironment; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java index c682644d482ee..8231039748406 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java @@ -32,6 +32,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; @@ -39,7 +40,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.lock.SchemaLockType; import org.apache.iotdb.db.queryengine.plan.planner.memory.NotThreadSafeMemoryReservationManager; import org.apache.iotdb.db.queryengine.statistics.QueryPlanStatistics; -import org.apache.iotdb.db.utils.cte.CteDataStore; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/AggrWindowIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/AggrWindowIterator.java index e9847f814cff4..cc80c89921e8b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/AggrWindowIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/AggrWindowIterator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator; -import org.apache.iotdb.db.utils.DateTimeUtils; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.tsfile.read.common.TimeRange; import org.apache.tsfile.utils.TimeDuration; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TimeRangeIteratorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TimeRangeIteratorFactory.java index 7331971b4a6e4..e2cc5ed5434a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TimeRangeIteratorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TimeRangeIteratorFactory.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.tsfile.utils.TimeDuration; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java index 41f23b6bbe9c0..1fe1f0f02dc79 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java @@ -34,6 +34,7 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -53,7 +54,6 @@ import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSourceType; import org.apache.iotdb.db.storageengine.dataregion.read.control.FileReaderManager; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.utils.datastructure.PatternTreeMapFactory; import org.apache.iotdb.db.utils.datastructure.TVList; import org.apache.iotdb.mpp.rpc.thrift.TFetchFragmentInstanceStatisticsResp; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java index 4e2319b5a1872..d1bde67f8fa9d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.fragment; import org.apache.iotdb.commons.utils.FileUtils; +import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.exception.CpuNotEnoughException; -import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; import org.apache.iotdb.db.queryengine.execution.driver.IDriver; import org.apache.iotdb.db.queryengine.execution.exchange.MPPDataExchangeManager; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java index 35a5ef1f06c3b..b92f2e19f5fad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java @@ -26,9 +26,9 @@ import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; import com.google.common.util.concurrent.Futures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java index c0a9597675dc5..a437efdb766d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java @@ -21,8 +21,8 @@ import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java index e7ed6ae349466..117320c811802 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.SortOperator; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.sort.TreeDiskSpiller; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.utils.datastructure.SortKey; -import org.apache.iotdb.db.utils.sort.TreeDiskSpiller; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java index 001deeb873869..e0b080a24c64a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java @@ -21,8 +21,8 @@ import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.TopKOperator; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java index d09597b5518bf..22d7e1f7863aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java @@ -21,14 +21,14 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.RelationPlan; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.type.TypeFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java index d2855d2d8de11..1aa4d4c011301 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java @@ -15,10 +15,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.plan.statement.component.NullOrdering; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; -import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.external.commons.collections4.comparators.ComparatorChain; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java index 8ccddf64ccc40..c47f5d46a5326 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java @@ -22,11 +22,11 @@ import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java index 655a8854dd35d..c72ec1b1a0041 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.window.TimeWindow; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; -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.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java index a73a613e33f88..6362a28e5d093 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java @@ -23,11 +23,11 @@ import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractSeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; -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.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java index 70caacbf358eb..b4a0114a617cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java @@ -23,11 +23,11 @@ import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; import org.apache.iotdb.db.utils.cte.CteDataReader; -import org.apache.iotdb.db.utils.cte.CteDataStore; import org.apache.iotdb.db.utils.cte.MemoryReader; import org.apache.tsfile.common.conf.TSFileDescriptor; 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 index 472a2db1d5df2..67a9ad7b674c4 100644 --- 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 @@ -72,6 +72,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ReservedIdentifiers; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; @@ -95,7 +96,6 @@ import org.apache.iotdb.db.storageengine.dataregion.utils.tableDiskUsageIndex.TableDiskUsageIndexReader; import org.apache.iotdb.db.storageengine.dataregion.utils.tableDiskUsageIndex.TimePartitionTableSizeQueryContext; import org.apache.iotdb.db.utils.MathUtils; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; 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/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java index e593d94eabf92..46340e68e31af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java @@ -25,10 +25,10 @@ import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; -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.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceSchemaCache; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java index 3efd6482fb8e5..71ced322fb8a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java index 952a1b802c256..fc1f294a7d835 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java @@ -22,8 +22,8 @@ import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java index e5a93093d5e4d..5242b8d3a11bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.service.IService; import org.apache.iotdb.commons.service.ServiceType; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.exception.CpuNotEnoughException; -import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; import org.apache.iotdb.db.queryengine.execution.driver.DataDriver; import org.apache.iotdb.db.queryengine.execution.driver.IDriver; import org.apache.iotdb.db.queryengine.execution.exchange.IMPPDataExchangeManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java index 7b91ae7f09998..f808ca137b34d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.schedule; +import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.exception.CpuNotEnoughException; -import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; import org.apache.iotdb.db.queryengine.execution.driver.IDriver; import java.util.List; 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 dacdc69ba4596..f853cba65c785 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 @@ -39,6 +39,7 @@ import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.utils.TimePartitionUtils; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.ainode.GetModelInfoException; @@ -140,7 +141,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.sys.ShowDiskUsageStatement; import org.apache.iotdb.db.queryengine.plan.statement.sys.ShowQueriesStatement; import org.apache.iotdb.db.queryengine.plan.statement.sys.ShowVersionStatement; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.iotdb.rpc.RpcUtils; import org.apache.iotdb.rpc.TSStatusCode; @@ -180,6 +180,8 @@ import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_MATCH_PATTERN; 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.calc_commons.utils.constant.SqlConstant.COUNT_TIME_HEADER; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.TREE_MODEL_DATABASE_PREFIX; 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.plan.analyze.AnalyzeUtils.removeLogicalView; @@ -202,8 +204,6 @@ import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.parseNodeString; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.DataNodeLocationSupplierFactory.getReadableDataNodeLocations; import static org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.GetSourcePathsVisitor.getSourcePaths; -import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME_HEADER; -import static org.apache.iotdb.db.utils.constant.SqlConstant.TREE_MODEL_DATABASE_PREFIX; /** This visitor is used to analyze each type of Statement and returns the {@link Analysis}. */ public class AnalyzeVisitor extends StatementVisitor { 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 fb2aa51a3a602..94f69d27cbdd8 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 @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; @@ -56,7 +57,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatDeviceAndBindSchemaForPredicateVisitor; import org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.ConcatExpressionWithSuffixPathsVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.ResultColumn; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.common.constant.TsFileConstant; import org.apache.tsfile.file.metadata.IDeviceID; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java index f57c80980de09..699008ab74d18 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; @@ -44,7 +45,6 @@ import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDAFInformationInferrer; import org.apache.iotdb.db.queryengine.transformation.dag.udf.UDTFInformationInferrer; import org.apache.iotdb.db.utils.TypeInferenceUtils; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.write.schema.IMeasurementSchema; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java index 55cfd18f16f48..fa690e71cb9fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; @@ -42,7 +43,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.PredicatePushIntoScanChecker; import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.PredicateSimplifier; import org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate.ReversePredicateVisitor; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.filter.basic.Filter; 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 8e8fd3cd40600..ddf6b75a44261 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 @@ -45,6 +45,7 @@ import java.util.Set; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.ENDTIME; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_TIME; 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; @@ -56,7 +57,6 @@ import static org.apache.iotdb.db.queryengine.plan.analyze.TemplatedAnalyze.analyzeDeviceViewOutput; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.canPushDownLimitOffsetInGroupByTimeForDevice; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.pushDownLimitOffsetInGroupByTimeForDevice; -import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME; /** Methods in this class are used for aggregation, templated with align by device situation. */ public class TemplatedAggregationAnalyze { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java index d612bbd57941b..4829b4808050f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java @@ -29,6 +29,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.common.SqlDialect; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; @@ -46,7 +47,6 @@ import org.apache.iotdb.db.storageengine.load.converter.LoadTsFileDataTypeConverter; import org.apache.iotdb.db.storageengine.load.metrics.LoadTsFileCostMetricsSet; import org.apache.iotdb.db.storageengine.load.util.LoadUtil; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; 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/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java index 6754468bad532..83434caf438c9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java @@ -29,15 +29,15 @@ import org.apache.iotdb.db.exception.load.LoadAnalyzeException; import org.apache.iotdb.db.exception.load.LoadRuntimeOutOfMemoryException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult; import org.apache.iotdb.db.queryengine.plan.execution.config.executor.ClusterConfigTaskExecutor; import org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ITableDeviceSchemaValidation; 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.metadata.TableSchema; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.storageengine.dataregion.modification.ModEntry; import org.apache.iotdb.db.storageengine.dataregion.modification.ModificationFile; @@ -296,9 +296,7 @@ public void createTableAndDatabaseIfNecessary(final String tableName) autoCreateTableDatabaseIfAbsent(database); needToCreateDatabase = false; } - final org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema fileSchema = - org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema.fromTsFileTableSchema( - tableName, schema); + final TableSchema fileSchema = TableSchema.fromTsFileTableSchema(tableName, schema); final TableSchema realSchema = metadata .validateTableHeaderSchema4TsFile( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java index cf2aedc6c19f2..a03a3522dd4ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java @@ -32,6 +32,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TGetDatabaseReq; import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp; import org.apache.iotdb.db.auth.AuthorityChecker; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadAnalyzeException; import org.apache.iotdb.db.exception.load.LoadAnalyzeTypeMismatchException; @@ -52,7 +53,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowDatabaseStatement; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.db.storageengine.dataregion.tsfile.timeindex.ITimeIndex; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.thrift.TException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java index d575f6420eb7c..89456cfc949f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java @@ -27,12 +27,12 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.template.Template; +import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; -import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java index bd3300019663a..976a3fd29a572 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java @@ -391,10 +391,10 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_MATCH_SCOPE; import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_RESULT_NODES; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.ROOT; import static org.apache.iotdb.db.protocol.client.ConfigNodeClient.MSG_RECONNECTION_FAIL; import static org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory.getShowExternalServiceHeader; import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.externalservice.ShowExternalServiceTask.appendServiceEntry; -import static org.apache.iotdb.db.utils.constant.SqlConstant.ROOT; import static org.apache.iotdb.udf.api.type.Type.OBJECT; public class ClusterConfigTaskExecutor implements IConfigTaskExecutor { 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 7bdd850bd0853..fb7a7c8af776a 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 @@ -24,13 +24,13 @@ 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.node_commons.utils.DateTimeUtils; 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; 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.statement.metadata.GetTimeSlotListStatement; -import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.iotdb.rpc.TSStatusCode; import com.google.common.util.concurrent.ListenableFuture; 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 f13df675a013c..dff3229965c8e 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 @@ -26,13 +26,13 @@ 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.node_commons.utils.DateTimeUtils; 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; 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.statement.metadata.ShowRegionStatement; -import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.iotdb.db.utils.MathUtils; import org.apache.iotdb.rpc.TSStatusCode; 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 09b925d3978c1..949c18303a745 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 @@ -22,6 +22,7 @@ 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.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.plan.execution.config.executor.IConfigTaskExecutor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowPipes; import org.apache.iotdb.db.queryengine.plan.statement.metadata.pipe.ShowPipesStatement; -import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.iotdb.rpc.TSStatusCode; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java index 09d5eb752d235..de65da11ae3d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java @@ -34,7 +34,7 @@ import java.time.ZoneId; import java.util.Map; -import static org.apache.iotdb.db.utils.constant.SqlConstant.CAST_TYPE; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.CAST_TYPE; public class CastFunctionHelper implements BuiltInScalarFunctionHelper { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java index 16016f285813a..09502a4dd4b39 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java @@ -33,8 +33,8 @@ import java.util.Map; -import static org.apache.iotdb.db.utils.constant.SqlConstant.REPLACE_FROM; -import static org.apache.iotdb.db.utils.constant.SqlConstant.REPLACE_TO; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.REPLACE_FROM; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.REPLACE_TO; public class ReplaceFunctionHelper implements BuiltInScalarFunctionHelper { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java index fe0d26bb46f84..a58297449a319 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java @@ -33,8 +33,8 @@ import java.util.Map; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.ROUND_PLACES; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.checkFunctionExpressionInputSize; -import static org.apache.iotdb.db.utils.constant.SqlConstant.ROUND_PLACES; public class RoundFunctionHelper implements BuiltInScalarFunctionHelper { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java index d811e696aec2a..ae2e67a5ad399 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java @@ -34,11 +34,11 @@ import java.util.LinkedHashMap; import java.util.Map; -import static org.apache.iotdb.db.utils.constant.SqlConstant.SUBSTRING_FOR; -import static org.apache.iotdb.db.utils.constant.SqlConstant.SUBSTRING_FROM; -import static org.apache.iotdb.db.utils.constant.SqlConstant.SUBSTRING_IS_STANDARD; -import static org.apache.iotdb.db.utils.constant.SqlConstant.SUBSTRING_LENGTH; -import static org.apache.iotdb.db.utils.constant.SqlConstant.SUBSTRING_START; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_FOR; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_FROM; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_IS_STANDARD; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_LENGTH; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_START; public class SubStringFunctionHelper implements BuiltInScalarFunctionHelper { public static final String BLANK_STRING = " "; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java index 1a573f856c26e..0713242fdf7b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java @@ -27,7 +27,7 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_TIME; public class CountTimeAggregationAmountVisitor extends CollectVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java index 94e2022637558..1db12d8fffa85 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.other.CaseWhenThenExpression; import org.apache.iotdb.db.queryengine.plan.expression.ternary.TernaryExpression; import org.apache.iotdb.db.queryengine.plan.expression.unary.UnaryExpression; -import org.apache.iotdb.db.utils.constant.SqlConstant; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java index a26863e5a4e33..854310102323b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.CompleteMeasurementSchemaVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.view.visitor.TransformToExpressionVisitor; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.external.commons.lang3.Validate; import org.apache.tsfile.write.schema.IMeasurementSchema; @@ -44,10 +44,10 @@ import java.util.List; import java.util.stream.Collectors; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_TIME; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; import static org.apache.iotdb.db.utils.TypeInferenceUtils.bindTypeForBuiltinAggregationNonSeriesInputExpressions; -import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME; public class BindSchemaForExpressionVisitor extends CartesianProductVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java index 71691cd79e651..e2251bff7b638 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.expression.Expression; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.external.commons.lang3.Validate; @@ -41,13 +41,13 @@ import java.util.List; import java.util.stream.Collectors; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_TIME; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructBinaryExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructTimeSeriesOperandsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; import static org.apache.iotdb.db.utils.TypeInferenceUtils.bindTypeForBuiltinAggregationNonSeriesInputExpressions; -import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME; public class BindSchemaForPredicateVisitor extends CartesianProductVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java index 00e71b6f08caa..b6023a52853c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.external.commons.lang3.Validate; @@ -41,11 +41,11 @@ import java.util.List; import java.util.stream.Collectors; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_TIME; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; import static org.apache.iotdb.db.utils.TypeInferenceUtils.bindTypeForBuiltinAggregationNonSeriesInputExpressions; -import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME; public class ConcatDeviceAndBindSchemaForExpressionVisitor extends CartesianProductVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java index 391c66ad3c228..d9fe4ab4b078b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java @@ -21,13 +21,13 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.common.constant.TsFileConstant; import org.apache.tsfile.external.commons.lang3.Validate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java index 1b14f05833724..866324b2c2329 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; -import org.apache.iotdb.db.utils.DateTimeUtils; import com.google.common.io.BaseEncoding; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java index 7982de7d01542..24a6af124c7df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; @@ -38,7 +39,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.unary.LikeExpression; import org.apache.iotdb.db.queryengine.plan.expression.unary.LogicNotExpression; import org.apache.iotdb.db.queryengine.plan.expression.unary.RegularExpression; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.filter.basic.Filter; 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 60818163d12cd..b6edaf9e321db 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 @@ -74,7 +74,7 @@ import java.util.Set; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_TIME; public class AggregationPushDown implements PlanOptimizer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java index c811740ce0685..f8ed47f8c33c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; @@ -44,7 +45,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.component.GroupByTimeComponent; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; -import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.utils.TimeDuration; 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 b3f95fb64f330..c7ba85897c77d 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 @@ -38,6 +38,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.PathUtils; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; @@ -51,6 +52,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.ConstantContext; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.CountDatabasesContext; @@ -255,9 +258,7 @@ import org.apache.iotdb.db.queryengine.plan.statement.sys.quota.ShowThrottleQuotaStatement; import org.apache.iotdb.db.schemaengine.template.TemplateAlterOperationType; import org.apache.iotdb.db.storageengine.load.config.LoadTsFileConfigurator; -import org.apache.iotdb.db.utils.DateTimeUtils; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; -import org.apache.iotdb.db.utils.constant.SqlConstant; +import org.apache.iotdb.db.utils.DataNodeDateTimeUtils; import org.apache.iotdb.trigger.api.enums.TriggerEvent; import org.apache.iotdb.trigger.api.enums.TriggerType; @@ -309,22 +310,22 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.CAST_FUNCTION; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.CAST_TYPE; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.REPLACE_FROM; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.REPLACE_FUNCTION; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.REPLACE_TO; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.ROUND_FUNCTION; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.ROUND_PLACES; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_FUNCTION; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_IS_STANDARD; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_LENGTH; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_START; +import static org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; +import static org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils.currPrecision; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.canPushDownLimitOffsetToGroupByTime; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.pushDownLimitOffsetToTimeParameter; import static org.apache.iotdb.db.queryengine.plan.relational.sql.parser.AstBuilder.lowerIdentifier; -import static org.apache.iotdb.db.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; -import static org.apache.iotdb.db.utils.TimestampPrecisionUtils.currPrecision; -import static org.apache.iotdb.db.utils.constant.SqlConstant.CAST_FUNCTION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.CAST_TYPE; -import static org.apache.iotdb.db.utils.constant.SqlConstant.REPLACE_FROM; -import static org.apache.iotdb.db.utils.constant.SqlConstant.REPLACE_FUNCTION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.REPLACE_TO; -import static org.apache.iotdb.db.utils.constant.SqlConstant.ROUND_FUNCTION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.ROUND_PLACES; -import static org.apache.iotdb.db.utils.constant.SqlConstant.SUBSTRING_FUNCTION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.SUBSTRING_IS_STANDARD; -import static org.apache.iotdb.db.utils.constant.SqlConstant.SUBSTRING_LENGTH; -import static org.apache.iotdb.db.utils.constant.SqlConstant.SUBSTRING_START; /** Parse AST to Statement. */ public class ASTVisitor extends IoTDBSqlParserBaseVisitor { @@ -1232,7 +1233,7 @@ private void parseResampleClause( IoTDBSqlParser.ResampleClauseContext ctx, CreateContinuousQueryStatement statement) { if (ctx.EVERY() != null) { statement.setEveryInterval( - DateTimeUtils.convertDurationStrToLong(ctx.everyInterval.getText())); + DataNodeDateTimeUtils.convertDurationStrToLong(ctx.everyInterval.getText())); } else { QueryStatement queryStatement = statement.getQueryBodyStatement(); if (!queryStatement.isGroupByTime()) { @@ -1250,10 +1251,10 @@ private void parseResampleClause( if (ctx.RANGE() != null) { statement.setStartTimeOffset( - DateTimeUtils.convertDurationStrToLong(ctx.startTimeOffset.getText())); + DataNodeDateTimeUtils.convertDurationStrToLong(ctx.startTimeOffset.getText())); if (ctx.endTimeOffset != null) { statement.setEndTimeOffset( - DateTimeUtils.convertDurationStrToLong(ctx.endTimeOffset.getText())); + DataNodeDateTimeUtils.convertDurationStrToLong(ctx.endTimeOffset.getText())); } } else { statement.setStartTimeOffset(statement.getEveryInterval()); @@ -1878,7 +1879,8 @@ private GroupByTimeComponent parseGroupByTimeClause( } // Parse time interval - groupByTimeComponent.setInterval(DateTimeUtils.constructTimeDuration(ctx.interval.getText())); + groupByTimeComponent.setInterval( + DataNodeDateTimeUtils.constructTimeDuration(ctx.interval.getText())); groupByTimeComponent.setOriginalInterval(ctx.interval.getText()); if (groupByTimeComponent.getInterval().monthDuration == 0 && groupByTimeComponent.getInterval().nonMonthDuration == 0) { @@ -1888,7 +1890,8 @@ private GroupByTimeComponent parseGroupByTimeClause( // parse sliding step if (ctx.step != null) { - groupByTimeComponent.setSlidingStep(DateTimeUtils.constructTimeDuration(ctx.step.getText())); + groupByTimeComponent.setSlidingStep( + DataNodeDateTimeUtils.constructTimeDuration(ctx.step.getText())); groupByTimeComponent.setOriginalSlidingStep(ctx.step.getText()); } else { groupByTimeComponent.setSlidingStep(groupByTimeComponent.getInterval()); @@ -1965,7 +1968,7 @@ private GroupByComponent parseGroupByClause( groupByConditionComponent.setIgnoringNull(ignoringNull); return groupByConditionComponent; } else if (windowType == WindowType.SESSION_WINDOW) { - long interval = DateTimeUtils.convertDurationStrToLong(ctx.timeInterval.getText()); + long interval = DataNodeDateTimeUtils.convertDurationStrToLong(ctx.timeInterval.getText()); return new GroupBySessionComponent(interval); } else if (windowType == WindowType.COUNT_WINDOW) { ExpressionContext countExpressionContext = expressions.get(0); @@ -2095,7 +2098,7 @@ public FillComponent parseFillClause(IoTDBSqlParser.FillClauseContext ctx) { "Only FILL(PREVIOUS) support specifying the time duration threshold."); } fillComponent.setTimeDurationThreshold( - DateTimeUtils.constructTimeDuration(ctx.interval.getText())); + DataNodeDateTimeUtils.constructTimeDuration(ctx.interval.getText())); } return fillComponent; } @@ -3577,11 +3580,11 @@ public Long parseDateExpression(IoTDBSqlParser.DateExpressionContext ctx, String for (int i = 1; i < ctx.getChildCount(); i = i + 2) { if ("+".equals(ctx.getChild(i).getText())) { time += - DateTimeUtils.convertDurationStrToLong( + DataNodeDateTimeUtils.convertDurationStrToLong( time, ctx.getChild(i + 1).getText(), precision, false); } else { time -= - DateTimeUtils.convertDurationStrToLong( + DataNodeDateTimeUtils.convertDurationStrToLong( time, ctx.getChild(i + 1).getText(), precision, false); } } @@ -3593,9 +3596,13 @@ private Long parseDateExpression(IoTDBSqlParser.DateExpressionContext ctx, long time = parseDateTimeFormat(ctx.getChild(0).getText(), currentTime, zoneId); for (int i = 1; i < ctx.getChildCount(); i = i + 2) { if ("+".equals(ctx.getChild(i).getText())) { - time += DateTimeUtils.convertDurationStrToLong(time, ctx.getChild(i + 1).getText(), false); + time += + DataNodeDateTimeUtils.convertDurationStrToLong( + time, ctx.getChild(i + 1).getText(), false); } else { - time -= DateTimeUtils.convertDurationStrToLong(time, ctx.getChild(i + 1).getText(), false); + time -= + DataNodeDateTimeUtils.convertDurationStrToLong( + time, ctx.getChild(i + 1).getText(), false); } } return time; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java index 4fc5e50a060af..b28d78ca89e16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java @@ -26,7 +26,9 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.SqlLexer; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; @@ -69,8 +71,6 @@ import org.apache.iotdb.db.schemaengine.template.TemplateQueryType; import org.apache.iotdb.db.utils.QueryDataSetUtils; import org.apache.iotdb.db.utils.TabletDecoder; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.iotdb.mpp.rpc.thrift.TFetchTimeseriesReq; import org.apache.iotdb.service.rpc.thrift.TSAggregationQueryReq; import org.apache.iotdb.service.rpc.thrift.TSCreateAlignedTimeseriesReq; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index d482746268c2f..eff1e970ded16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -40,12 +40,14 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.TableDateBinTimeRangeIterator; @@ -99,7 +101,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.ConvertPredicateToTimeFilterVisitor; -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.NonAlignedDeviceEntry; @@ -128,7 +129,6 @@ import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -175,6 +175,16 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.AVG; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.EXTREME; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_AGGREGATION; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.MAX; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.MIN; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUM; import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.common.DataNodeEndPoints.isSameNode; import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DELIMITER_BETWEEN_ID; @@ -185,16 +195,6 @@ import static org.apache.iotdb.db.queryengine.plan.planner.OperatorTreeGenerator.isFilterGtOrGe; import static org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions.updateFilterUsingTTL; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_PRIMITIVE_TYPE; -import static org.apache.iotdb.db.utils.constant.SqlConstant.AVG; -import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT; -import static org.apache.iotdb.db.utils.constant.SqlConstant.EXTREME; -import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_AGGREGATION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_BY_AGGREGATION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.MAX; -import static org.apache.iotdb.db.utils.constant.SqlConstant.MIN; -import static org.apache.iotdb.db.utils.constant.SqlConstant.SUM; import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; public class DataNodeTableOperatorGenerator diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java index 65fe16b1df435..1ddc593f1fcce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.memory.IMemoryBlock; import org.apache.iotdb.commons.memory.MemoryBlockType; import org.apache.iotdb.commons.path.IFullPath; +import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.DeviceContext; -import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; 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 6662856ae8df2..f915417b954cb 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 @@ -128,11 +128,11 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; 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.calc_commons.utils.constant.SqlConstant.LAST_VALUE; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.MAX_TIME; import static org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy.LINEAR; 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.utils.constant.SqlConstant.LAST_VALUE; -import static org.apache.iotdb.db.utils.constant.SqlConstant.MAX_TIME; public class LogicalPlanBuilder { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java index c7c4387c61ece..710c00501e1db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java @@ -30,6 +30,7 @@ import org.apache.iotdb.commons.schema.table.Audit; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.expression.multi.FunctionType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; @@ -85,7 +86,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; -import org.apache.iotdb.db.utils.constant.SqlConstant; import com.google.common.collect.ImmutableList; import org.apache.tsfile.common.conf.TSFileConfig; @@ -109,13 +109,13 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.LAST_VALUE; import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.AVG; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_IF; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.DIFF; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_VALUE; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.TIME_DURATION; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionTypeAnalyzer.analyzeExpression; import static org.apache.iotdb.db.queryengine.plan.planner.LogicalPlanBuilder.updateTypeProviderByPartialAggregation; -import static org.apache.iotdb.db.utils.constant.SqlConstant.AVG; -import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_IF; -import static org.apache.iotdb.db.utils.constant.SqlConstant.DIFF; -import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_VALUE; -import static org.apache.iotdb.db.utils.constant.SqlConstant.TIME_DURATION; public class SourceRewriter extends BaseSourceRewriter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java index 51356ca415299..3978024794343 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java @@ -33,6 +33,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; @@ -43,7 +44,6 @@ import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.IWALByteBufferView; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntryValue; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALWriteUtils; -import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.iotdb.db.utils.QueryDataSetUtils; 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/queryengine/plan/planner/plan/node/write/ObjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java index ef336afd892b2..bda122a7249af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java @@ -27,10 +27,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.utils.IObjectPath; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; -import org.apache.iotdb.db.storageengine.dataregion.IObjectPath; import org.apache.iotdb.db.storageengine.dataregion.memtable.TsFileProcessor; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.IWALByteBufferView; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntryType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java index 40ad0aab985c4..745d72fec3fe7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java @@ -21,8 +21,8 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -37,10 +37,10 @@ import java.util.Objects; import java.util.stream.Collectors; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_VALUE; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.STDDEV; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.addPartialSuffix; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.isBuiltinAggregationName; -import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_VALUE; -import static org.apache.iotdb.db.utils.constant.SqlConstant.STDDEV; public class AggregationDescriptor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java index d986baf2faa3c..3501c546788f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.expression.Expression; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByTimeParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByTimeParameter.java index 9de54f85c0a16..5f173a48c8bd7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByTimeParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByTimeParameter.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.statement.component.GroupByTimeComponent; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.tsfile.utils.ReadWriteIOUtils; import org.apache.tsfile.utils.TimeDuration; 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 698020c3a4f40..1fb9d6b487bc7 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 @@ -25,7 +25,9 @@ import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.security.Identity; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; @@ -67,9 +69,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.TimePredicate; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.PatternFunctionAnalysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.tablefunction.TableFunctionInvocationAnalysis; -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.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowStatement; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index e32f3764e4f39..4901caecd2043 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -145,6 +145,10 @@ import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_AGGREGATION; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression.isQualifiedAllFieldsReference; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.FOLLOWING; @@ -157,10 +161,6 @@ import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.ExpressionTreeUtils.extractExpressions; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; -import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_AGGREGATION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_AGGREGATION; -import static org.apache.iotdb.db.utils.constant.SqlConstant.LAST_BY_AGGREGATION; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index 41e833cba640f..5fb1e1ffd82cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -29,6 +29,8 @@ import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; @@ -116,6 +118,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; import org.apache.iotdb.db.queryengine.execution.warnings.IoTDBWarning; @@ -130,10 +133,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.tablefunction.ArgumentsAnalysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.tablefunction.TableArgumentAnalysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.tablefunction.TableFunctionInvocationAnalysis; -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.metadata.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware; import org.apache.iotdb.db.queryengine.plan.relational.planner.TranslationMap; @@ -199,7 +200,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertBaseStatement; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; -import org.apache.iotdb.db.utils.cte.CteDataStore; import org.apache.iotdb.rpc.RpcUtils; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.exception.UDFException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java index d1af74d677c1c..2c76b8cbac2f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; @@ -47,7 +48,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import com.google.common.collect.ImmutableList; import com.google.common.math.DoubleMath; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java index 0a5cabbd0d387..1ca005a9b6819 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java @@ -30,6 +30,7 @@ import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionFactory; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java index 4fb8e4dd964a9..577cdc107cbdf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java @@ -21,6 +21,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnMetadata; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadata.java index a3acb473d2c54..3ab7afa469dbf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadata.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnMetadata; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; + import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; 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 bef1ea1b48411..0f1c616ee1c02 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 @@ -30,6 +30,7 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; @@ -39,6 +40,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.ModulusResolver; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; @@ -52,7 +55,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.iotdb.udf.api.customizer.analysis.AggregateFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TreeDeviceViewSchema.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TreeDeviceViewSchema.java index 5b75fd5965072..646b085d62099 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TreeDeviceViewSchema.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TreeDeviceViewSchema.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; import org.apache.iotdb.commons.schema.table.TreeViewSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import java.util.List; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java index 1a8a6e2fab4b9..009b76a60877a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java @@ -37,6 +37,8 @@ import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.ColumnCreationFailException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.lock.DataNodeSchemaLockManager; @@ -45,9 +47,7 @@ import org.apache.iotdb.db.queryengine.plan.execution.config.executor.ClusterConfigTaskExecutor; import org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.AlterTableAddColumnTask; import org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateTableTask; -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.TableSchema; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java index f1c4c6ab2d5c5..9b00dfedfb10d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java @@ -28,11 +28,14 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -44,13 +47,10 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import org.apache.iotdb.db.queryengine.statistics.FragmentInstanceStatisticsDrawer; import org.apache.iotdb.db.queryengine.statistics.QueryStatisticsFetcher; import org.apache.iotdb.db.queryengine.statistics.StatisticLine; -import org.apache.iotdb.db.utils.cte.CteDataStore; import org.apache.iotdb.mpp.rpc.thrift.TFetchFragmentInstanceStatisticsResp; import org.apache.iotdb.rpc.TSStatusCode; 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 c82bead621c74..f28a3956b6442 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 @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; @@ -84,6 +85,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; @@ -109,7 +111,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.tablefunction.TableArgumentAnalysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.tablefunction.TableFunctionInvocationAnalysis; -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.metadata.TreeDeviceViewSchema; @@ -132,7 +133,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowsStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; -import org.apache.iotdb.db.utils.cte.CteDataStore; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; 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 cf63bc86cb168..b36c8696a4a88 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 @@ -30,6 +30,8 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -57,10 +59,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.RelationType; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; import org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.PlanOptimizersStatsCollector; -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.metadata.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode; 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 59a2d94ae7bc0..5533ee6e6da86 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 @@ -38,6 +38,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; @@ -85,7 +86,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; -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.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; @@ -144,6 +144,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT; import static org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind.AGGREGATE; import static org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; @@ -151,7 +152,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PushPredicateIntoTableScan.containsDiffFunction; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.TransformSortToStreamSort.isOrderByAllIdsAndTime; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.split; -import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT; import static org.apache.tsfile.utils.Preconditions.checkArgument; /** This class is used to generate distributed plan for table model. */ diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java index e1a19c2d8edb2..4e8e1cf317505 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import java.util.Map; 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 c9d34d3d9b049..a68648ed5adf5 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 @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -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.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java index b6ea2b034b37a..1c3141c502a7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; @@ -44,7 +45,6 @@ import org.apache.iotdb.db.queryengine.common.QueryId; 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.utils.constant.SqlConstant; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; @@ -63,11 +63,11 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.concat; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT; import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; -import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.LongType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java index 3d8a472f68398..044e82ea2dd4a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java @@ -45,6 +45,7 @@ import static com.google.common.base.Verify.verify; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT; import static org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind.AGGREGATE; import static org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression; @@ -52,7 +53,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; -import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT; public class SimplifyCountOverConstant implements Rule { private static final Capture CHILD = newCapture(); 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 2596d2e6d64b7..5cca16ca67121 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 @@ -24,6 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; 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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -60,9 +60,9 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST_BY; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.TABLE_TIME_COLUMN_NAME; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator.DATE_BIN_PREFIX; -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 DeviceTableScanNode { // if there is date_bin function of time, we should use this field to transform time input diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java index 184c7fabe54bb..e84abb11606e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java @@ -22,12 +22,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java index b9c28465e1946..ead707b22d52c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java @@ -22,12 +22,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java index 2739ea811f02c..4caa03281b682 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java @@ -28,9 +28,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; -import org.apache.iotdb.db.utils.cte.CteDataStore; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java index 93a504d79a87d..04e308a3a4732 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java @@ -22,11 +22,11 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; -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.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; 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 index 0c21c104c96c8..40d5d09e9199a 100644 --- 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 @@ -23,10 +23,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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 java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java index a7ad2a52b9561..dbdefb6d6c61a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java @@ -24,9 +24,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; 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.sql.ast.Insert; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java index fdc18882c3979..e4e0681c6e0ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java @@ -22,12 +22,12 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java index 47afa6899f0a5..c696e87052506 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java @@ -23,9 +23,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 11aae81ed3136..b41581605e276 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 @@ -26,10 +26,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.Metadata; 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/planner/node/TreeAlignedDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java index 989e79299cbb1..7bb1e1e77cb4f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java index a71d02c5b6856..105b7c2bd9dfa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java index 6366211387a33..69e0398322ded 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; 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.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java index f50bde336d234..ef694fb9f6ce2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; 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 edff2481a967d..477676a0f3376 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,6 +22,7 @@ import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; @@ -40,7 +41,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; 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 781c3db37b95e..f0c7171de174b 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 @@ -28,6 +28,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; @@ -48,6 +49,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; @@ -58,7 +60,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.ConvertPredicateToTimeFilterVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicateCombineIntoTableScanChecker; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoMetadataChecker; -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.NonAlignedDeviceEntry; @@ -73,7 +74,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; 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 1cc2aa3f0dfc7..25e36456eaf80 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,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; 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.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; 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 9604c0a20e58e..9b6f345fe1175 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; 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 e42a9aedc3d1c..5f5ff1e165319 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 @@ -20,6 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; @@ -57,7 +58,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; 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.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.NodeAndMappings; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java index c301bb9190606..dfc784504ba22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java @@ -27,12 +27,12 @@ import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeUtils; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ITableDeviceSchemaValidation; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertBaseStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; import org.apache.iotdb.db.utils.TypeInferenceUtils; 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 953357f3aeda2..b51758d6ba48c 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 @@ -148,6 +148,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrMoreQuantifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrOneQuantifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; @@ -269,8 +270,7 @@ import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlParser; import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache; import org.apache.iotdb.db.storageengine.load.config.LoadTsFileConfigurator; -import org.apache.iotdb.db.utils.DateTimeUtils; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; +import org.apache.iotdb.db.utils.DataNodeDateTimeUtils; import com.google.common.collect.ImmutableList; import org.antlr.v4.runtime.ParserRuleContext; @@ -315,6 +315,9 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.APPROX_COUNT_DISTINCT; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.APPROX_MOST_FREQUENT; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.APPROX_PERCENTILE; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_END; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_START; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets.Type.CUBE; @@ -331,6 +334,7 @@ import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.skipToFirst; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.skipToLast; import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.skipToNextRow; +import static org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils.currPrecision; import static org.apache.iotdb.db.queryengine.plan.execution.config.TableConfigTaskVisitor.DATABASE_NOT_SPECIFIED; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.SERVICE_MANAGEMENT_NOT_SUPPORTED; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.parseDateTimeFormat; @@ -340,10 +344,6 @@ import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AsofJoinOn.constructAsofJoinOn; 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.table; -import static org.apache.iotdb.db.utils.TimestampPrecisionUtils.currPrecision; -import static org.apache.iotdb.db.utils.constant.SqlConstant.APPROX_COUNT_DISTINCT; -import static org.apache.iotdb.db.utils.constant.SqlConstant.APPROX_MOST_FREQUENT; -import static org.apache.iotdb.db.utils.constant.SqlConstant.APPROX_PERCENTILE; public class AstBuilder extends RelationalSqlBaseVisitor { @@ -2356,7 +2356,8 @@ public Node visitPreviousFill(RelationalSqlParser.PreviousFillContext ctx) { List fillGroupingElements = null; if (ctx.timeBoundClause() != null) { timeBound = - DateTimeUtils.constructTimeDuration(ctx.timeBoundClause().timeDuration().getText()); + DataNodeDateTimeUtils.constructTimeDuration( + ctx.timeBoundClause().timeDuration().getText()); if (timeBound.monthDuration != 0 && timeBound.nonMonthDuration != 0) { throw new SemanticException( @@ -2747,7 +2748,8 @@ public Node visitJoinRelation(RelationalSqlParser.JoinRelationContext ctx) { if (ctx.joinCriteria().ON() != null) { if (ctx.ASOF() != null) { if (ctx.timeDuration() != null) { - timeDuration = DateTimeUtils.constructTimeDuration(ctx.timeDuration().getText()); + timeDuration = + DataNodeDateTimeUtils.constructTimeDuration(ctx.timeDuration().getText()); if (timeDuration.monthDuration != 0) { throw new SemanticException( @@ -3058,7 +3060,8 @@ public Node visitScalarArgument(RelationalSqlParser.ScalarArgumentContext ctx) { if (ctx.expression() != null) { return visit(ctx.expression()); } else { - TimeDuration timeDuration = DateTimeUtils.constructTimeDuration(ctx.timeDuration().getText()); + TimeDuration timeDuration = + DataNodeDateTimeUtils.constructTimeDuration(ctx.timeDuration().getText()); if (timeDuration.monthDuration != 0) { throw new SemanticException("Setting monthly intervals is not supported."); @@ -3366,9 +3369,13 @@ private Long parseDateExpression( time = parseDateTimeFormat(ctx.getChild(0).getText(), currentTime, zoneId); for (int i = 1; i < ctx.getChildCount(); i = i + 2) { if ("+".equals(ctx.getChild(i).getText())) { - time += DateTimeUtils.convertDurationStrToLong(time, ctx.getChild(i + 1).getText(), false); + time += + DataNodeDateTimeUtils.convertDurationStrToLong( + time, ctx.getChild(i + 1).getText(), false); } else { - time -= DateTimeUtils.convertDurationStrToLong(time, ctx.getChild(i + 1).getText(), false); + time -= + DataNodeDateTimeUtils.convertDurationStrToLong( + time, ctx.getChild(i + 1).getText(), false); } } return time; @@ -3608,7 +3615,8 @@ public Node visitFunctionCall(RelationalSqlParser.FunctionCallContext ctx) { @Override public Node visitDateBinGapFill(RelationalSqlParser.DateBinGapFillContext ctx) { - TimeDuration timeDuration = DateTimeUtils.constructTimeDuration(ctx.timeDuration().getText()); + TimeDuration timeDuration = + DataNodeDateTimeUtils.constructTimeDuration(ctx.timeDuration().getText()); if (timeDuration.monthDuration != 0 && timeDuration.nonMonthDuration != 0) { throw new SemanticException( @@ -3641,7 +3649,8 @@ public Node visitDateBinGapFill(RelationalSqlParser.DateBinGapFillContext ctx) { @Override public Node visitDateBin(RelationalSqlParser.DateBinContext ctx) { - TimeDuration timeDuration = DateTimeUtils.constructTimeDuration(ctx.timeDuration().getText()); + TimeDuration timeDuration = + DataNodeDateTimeUtils.constructTimeDuration(ctx.timeDuration().getText()); if (timeDuration.monthDuration != 0 && timeDuration.nonMonthDuration != 0) { throw new SemanticException( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java index 101055a8ad998..45fb751706ae8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java @@ -29,11 +29,11 @@ import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.schemaengine.schemaregion.attribute.update.UpdateDetailContainer; import org.apache.iotdb.db.utils.CommonUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java index e6f92b3b5d1e4..89d2f023f10a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java @@ -29,12 +29,12 @@ import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.IMeasurementSchemaInfo; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRow; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java index 1e7e0ec91b6d7..ec24718aae4ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java @@ -29,6 +29,7 @@ import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException; import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; @@ -38,7 +39,6 @@ import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertTablet; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java index d966903abd392..2b9cfa25ccab5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java @@ -55,7 +55,7 @@ import java.util.Map; import java.util.Set; -import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_TIME; /** * Base class of SELECT statement. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java index ae506274aca99..6d0fd2f789409 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java @@ -149,7 +149,7 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.DEFAULT_CLUSTER_NAME; import static org.apache.iotdb.commons.utils.StatusUtils.retrieveExitStatusCode; import static org.apache.iotdb.db.conf.IoTDBStartCheck.PROPERTIES_FILE_NAME; -import static org.apache.iotdb.db.utils.DateTimeUtils.initTimestampPrecision; +import static org.apache.iotdb.db.node_commons.utils.DateTimeUtils.initTimestampPrecision; public class DataNode extends ServerCommandLine implements DataNodeMBean { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java index 906a4692749d2..c8feafec22bef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java @@ -66,6 +66,8 @@ import org.apache.iotdb.db.exception.quota.ExceedQuotaException; import org.apache.iotdb.db.exception.runtime.TableLostRuntimeException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.ObjectTypeUtils; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource.Status; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResourceManager; @@ -160,10 +162,8 @@ import org.apache.iotdb.db.tools.DelayAnalyzer; import org.apache.iotdb.db.tools.settle.TsFileAndModSettleTool; import org.apache.iotdb.db.utils.CommonUtils; -import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.iotdb.db.utils.EncryptDBUtils; import org.apache.iotdb.db.utils.ModificationUtils; -import org.apache.iotdb.db.utils.ObjectTypeUtils; import org.apache.iotdb.metrics.utils.MetricLevel; 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/storageengine/dataregion/memtable/AbstractWritableMemChunk.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java index b0bc6b8a76a29..adbbea0a043f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.IWALByteBufferView; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java index dff789bb98501..ae867bb0babba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.storageengine.dataregion.read.reader.chunk; +import org.apache.iotdb.db.node_commons.utils.ObjectTypeUtils; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.metric.SeriesScanCostMetricSet; import org.apache.iotdb.db.storageengine.buffer.ChunkCache; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileID; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; -import org.apache.iotdb.db.utils.ObjectTypeUtils; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.AbstractAlignedChunkMetadata; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java index da0779129c754..cdcb7e9c921c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.storageengine.dataregion.read.reader.chunk; import org.apache.iotdb.db.exception.ChunkTypeInconsistentException; +import org.apache.iotdb.db.node_commons.utils.ObjectTypeUtils; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.metric.SeriesScanCostMetricSet; import org.apache.iotdb.db.storageengine.buffer.ChunkCache; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileID; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; -import org.apache.iotdb.db.utils.ObjectTypeUtils; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.MetaMarker; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java index b850af9513ae2..6323cead9455e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.tools; import org.apache.iotdb.commons.file.SystemFileFactory; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; -import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.fileSystem.FSFactoryProducer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java index 530181fd1f321..7f950cf5452da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.tools; import org.apache.iotdb.commons.file.SystemFileFactory; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; -import org.apache.iotdb.db.utils.DateTimeUtils; import org.apache.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.fileSystem.FSFactoryProducer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java index 784312f9f9cd2..52c69d372c933 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java @@ -24,13 +24,14 @@ import org.apache.iotdb.commons.service.metric.enums.Metric; import org.apache.iotdb.commons.service.metric.enums.Tag; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.protocol.thrift.OperationType; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; import org.apache.iotdb.db.queryengine.plan.statement.literal.BinaryLiteral; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.iotdb.metrics.utils.MetricLevel; import org.apache.iotdb.service.rpc.thrift.TSAggregationQueryReq; import org.apache.iotdb.service.rpc.thrift.TSFastLastDataQueryForOneDeviceReq; @@ -104,7 +105,8 @@ public static Object parseValue(TSDataType dataType, String value, ZoneId zoneId if (TypeInferenceUtils.isNumber(value)) { return Long.parseLong(value); } else { - return DateTimeUtils.parseDateTimeExpressionToLong(StringUtils.trim(value), zoneId); + return DataNodeDateTimeUtils.parseDateTimeExpressionToLong( + StringUtils.trim(value), zoneId); } } catch (Throwable e) { throw new NumberFormatException( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeDateTimeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeDateTimeUtils.java new file mode 100644 index 0000000000000..087d72b3acd86 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeDateTimeUtils.java @@ -0,0 +1,259 @@ +/* + * 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.utils; + +import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.db.protocol.session.SessionManager; +import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; +import org.apache.iotdb.db.qp.sql.SqlLexer; +import org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor; +import org.apache.iotdb.db.queryengine.plan.parser.SqlParseError; + +import org.antlr.v4.runtime.CharStream; +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.CommonTokenStream; +import org.antlr.v4.runtime.atn.PredictionMode; +import org.apache.tsfile.utils.TimeDuration; + +import java.time.ZoneId; +import java.util.Calendar; + +public class DataNodeDateTimeUtils { + public static Long parseDateTimeExpressionToLong(String dateExpression, ZoneId zoneId) { + ASTVisitor astVisitor = new ASTVisitor(); + astVisitor.setZoneId(zoneId); + + CharStream charStream1 = CharStreams.fromString(dateExpression); + + SqlLexer lexer1 = new SqlLexer(charStream1); + lexer1.removeErrorListeners(); + lexer1.addErrorListener(SqlParseError.INSTANCE); + + CommonTokenStream tokens1 = new CommonTokenStream(lexer1); + + IoTDBSqlParser parser1 = new IoTDBSqlParser(tokens1); + parser1.getInterpreter().setPredictionMode(PredictionMode.SLL); + parser1.removeErrorListeners(); + parser1.addErrorListener(SqlParseError.INSTANCE); + return astVisitor.parseDateExpression( + parser1.dateExpression(), DateTimeUtils.getTimestampPrecision()); + } + + /** convert duration string to millisecond, microsecond or nanosecond. */ + public static long convertDurationStrToLong( + long currentTime, long value, String unit, String timestampPrecision) { + DateTimeUtils.DurationUnit durationUnit = DateTimeUtils.DurationUnit.valueOf(unit); + long res = value; + switch (durationUnit) { + case y: + case year: + res *= 365 * 86_400_000L; + break; + case mo: + case month: + if (currentTime == -1) { + res *= 30 * 86_400_000L; + } else { + Calendar calendar = Calendar.getInstance(); + calendar.setTimeZone(SessionManager.getInstance().getSessionTimeZone()); + calendar.setTimeInMillis(currentTime); + calendar.add(Calendar.MONTH, (int) (value)); + res = calendar.getTimeInMillis() - currentTime; + } + break; + case w: + case week: + res *= 7 * 86_400_000L; + break; + case d: + case day: + res *= 86_400_000L; + break; + case h: + case hour: + res *= 3_600_000L; + break; + case m: + case minute: + res *= 60_000L; + break; + case s: + case second: + res *= 1_000L; + break; + default: + break; + } + + if ("us".equals(timestampPrecision) || "microsecond".equals(timestampPrecision)) { + if (unit.equals(DateTimeUtils.DurationUnit.ns.toString()) + || unit.equals(DateTimeUtils.DurationUnit.nanosecond.toString())) { + return value / 1000; + } else if (unit.equals(DateTimeUtils.DurationUnit.us.toString()) + || unit.equals(DateTimeUtils.DurationUnit.microsecond.toString())) { + return value; + } else { + return res * 1000; + } + } else if ("ns".equals(timestampPrecision) || "nanosecond".equals(timestampPrecision)) { + if (unit.equals(DateTimeUtils.DurationUnit.ns.toString()) + || unit.equals(DateTimeUtils.DurationUnit.nanosecond.toString())) { + return value; + } else if (unit.equals(DateTimeUtils.DurationUnit.us.toString()) + || unit.equals(DateTimeUtils.DurationUnit.microsecond.toString())) { + return value * 1000; + } else { + return res * 1000_000; + } + } else { + if (unit.equals(DateTimeUtils.DurationUnit.ns.toString()) + || unit.equals(DateTimeUtils.DurationUnit.nanosecond.toString())) { + return value / 1000_000; + } else if (unit.equals(DateTimeUtils.DurationUnit.us.toString()) + || unit.equals(DateTimeUtils.DurationUnit.microsecond.toString())) { + return value / 1000; + } else { + return res; + } + } + } + + @TestOnly + public static long convertDurationStrToLongForTest( + long value, String unit, String timestampPrecision) { + return convertDurationStrToLong(-1, value, unit, timestampPrecision); + } + + /** + * convert duration string to time value. + * + * @param duration represent duration string like: 12d8m9ns, 1y1mo, etc. + * @param convertYearToMonth if we need convert year to month. eg: 1y -> 12mo + * @return time in milliseconds, microseconds, or nanoseconds depending on the profile + */ + public static long convertDurationStrToLong( + long currentTime, String duration, String timestampPrecision, boolean convertYearToMonth) { + long total = 0; + long temp = 0; + for (int i = 0; i < duration.length(); i++) { + char ch = duration.charAt(i); + if (Character.isDigit(ch)) { + temp *= 10; + temp += (ch - '0'); + } else { + String unit = String.valueOf(duration.charAt(i)); + // This is to identify units with two letters. + if (i + 1 < duration.length() && !Character.isDigit(duration.charAt(i + 1))) { + i++; + unit += duration.charAt(i); + } + unit = unit.toLowerCase(); + if (convertYearToMonth && unit.equals("y")) { + temp *= 12; + unit = "mo"; + } + total += + convertDurationStrToLong( + currentTime == -1 ? -1 : currentTime + total, temp, unit, timestampPrecision); + temp = 0; + } + } + return total; + } + + public static long convertDurationStrToLong( + long currentTime, String duration, boolean convertYearToMonth) { + return convertDurationStrToLong( + currentTime, + duration, + CommonDescriptor.getInstance().getConfig().getTimestampPrecision(), + convertYearToMonth); + } + + /** + * Convert duration string to time value. CurrentTime is used to calculate the days of natural + * month. If it's set as -1, which means a context free situation, then '1mo' will be thought as + * 30 days. + * + * @param duration represent duration string like: 12d8m9ns, 1y1mo, etc. + * @return time in milliseconds, microseconds, or nanoseconds depending on the profile + */ + public static long convertDurationStrToLong(String duration) { + return convertDurationStrToLong(-1, duration, false); + } + + public static long convertDurationStrToLong(String duration, boolean convertYearToMonth) { + return convertDurationStrToLong(-1, duration, convertYearToMonth); + } + + public static long convertDurationStrToLong( + String duration, String timestampPrecision, boolean convertYearToMonth) { + return convertDurationStrToLong(-1, duration, timestampPrecision, convertYearToMonth); + } + + /** + * Storage the duration into two parts: month part and non-month part, the non-month part's + * precision is depended on current time precision. e.g. ms precision: '1y1mo1ms' -> monthDuration + * = 13, nonMonthDuration = 1, ns precision: '1y1mo1ms' -> monthDuration = 13, nonMonthDuration = + * 1000_000. + * + * @param duration the input duration string + * @return the TimeDuration instance contains month part and non-month part + */ + public static TimeDuration constructTimeDuration(String duration) { + duration = duration.toLowerCase(); + String currTimePrecision = CommonDescriptor.getInstance().getConfig().getTimestampPrecision(); + long temp = 0; + long monthDuration = 0; + long nonMonthDuration = 0; + int i = 0; + for (; i < duration.length(); i++) { + char ch = duration.charAt(i); + if (Character.isDigit(ch)) { + temp *= 10; + temp += (ch - '0'); + } else { + StringBuilder unit = new StringBuilder(String.valueOf(duration.charAt(i))); + i++; + // This is to identify units. + while (i < duration.length() && !Character.isDigit(duration.charAt(i))) { + unit.append(duration.charAt(i)); + i++; + } + i--; + if ("y".contentEquals(unit) || "year".contentEquals(unit)) { + monthDuration += temp * 12; + temp = 0; + continue; + } + if ("mo".contentEquals(unit) || "month".contentEquals(unit)) { + monthDuration += temp; + temp = 0; + continue; + } + nonMonthDuration += convertDurationStrToLong(-1, temp, unit.toString(), currTimePrecision); + temp = 0; + } + } + return new TimeDuration((int) monthDuration, nonMonthDuration); + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java new file mode 100644 index 0000000000000..801b643deb9f8 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java @@ -0,0 +1,134 @@ +/* + * 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.utils; + +import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.exception.ObjectFileNotExist; +import org.apache.iotdb.db.node_commons.utils.IObjectFileService; +import org.apache.iotdb.db.node_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.db.service.metrics.FileMetrics; +import org.apache.iotdb.db.storageengine.rescon.disk.TierManager; +import org.apache.iotdb.rpc.TSStatusCode; + +import org.apache.tsfile.utils.Binary; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.FileChannel; +import java.nio.file.Files; +import java.nio.file.StandardOpenOption; +import java.util.Objects; +import java.util.Optional; + +public class DataNodeObjectFileService implements IObjectFileService { + + private static final Logger logger = LoggerFactory.getLogger(DataNodeObjectFileService.class); + private static final TierManager TIER_MANAGER = TierManager.getInstance(); + public static final DataNodeObjectFileService INSTANCE = new DataNodeObjectFileService(); + + private DataNodeObjectFileService() {} + + @Override + public ByteBuffer readObjectContent( + String relativePath, long offset, int readSize, boolean mayNotInCurrentNode) { + Optional objectFile = TIER_MANAGER.getAbsoluteObjectFilePath(relativePath, false); + if (objectFile.isPresent()) { + return readObjectContentFromLocalFile(objectFile.get(), offset, readSize); + } + if (mayNotInCurrentNode) { + return readObjectContentFromRemoteFile(relativePath, offset, readSize); + } + throw new ObjectFileNotExist(relativePath); + } + + @Override + public Optional getObjectPathFromBinary(Binary binary, boolean needTempFile) { + String relativeObjectFilePath = + ObjectTypeUtils.parseObjectBinaryToSizeStringPathPair(binary).getRight(); + return TIER_MANAGER.getAbsoluteObjectFilePath(relativeObjectFilePath, needTempFile); + } + + @Override + public void deleteObjectPathFromBinary(Binary binary) { + Optional file = getObjectPathFromBinary(binary, true); + if (file.isPresent()) { + deleteObjectPath(file.get()); + } + } + + @Override + public void deleteObjectPath(File file) { + File tmpFile = new File(file.getPath() + ".tmp"); + File bakFile = new File(file.getPath() + ".back"); + for (int i = 0; i < 2; i++) { + if (file.exists()) { + FileMetrics.getInstance().decreaseObjectFileNum(1); + FileMetrics.getInstance().decreaseObjectFileSize(file.length()); + } + try { + deleteObjectFile(file); + deleteObjectFile(tmpFile); + deleteObjectFile(bakFile); + } catch (IOException e) { + logger.error("Failed to remove object file {}", file.getAbsolutePath(), e); + } + } + deleteEmptyParentDir(file); + } + + private static ByteBuffer readObjectContentFromLocalFile(File file, long offset, long readSize) { + byte[] bytes = new byte[(int) readSize]; + ByteBuffer buffer = ByteBuffer.wrap(bytes); + try (FileChannel fileChannel = FileChannel.open(file.toPath(), StandardOpenOption.READ)) { + fileChannel.read(buffer, offset); + } catch (IOException e) { + throw new IoTDBRuntimeException(e, TSStatusCode.OBJECT_READ_ERROR.getStatusCode()); + } + buffer.flip(); + return buffer; + } + + private static ByteBuffer readObjectContentFromRemoteFile( + final String relativePath, final long offset, final int readSize) { + throw new UnsupportedOperationException("readObjectContentFromRemoteFile"); + } + + private static void deleteEmptyParentDir(File file) { + File dir = file.getParentFile(); + if (dir.isDirectory() && Objects.requireNonNull(dir.list()).length == 0) { + try { + Files.deleteIfExists(dir.toPath()); + deleteEmptyParentDir(dir); + } catch (IOException e) { + logger.error("Failed to remove empty object dir {}", dir.getAbsolutePath(), e); + } + } + } + + private static void deleteObjectFile(File file) throws IOException { + if (file.exists()) { + logger.info("Remove object file {}, size is {}(byte)", file.getAbsolutePath(), file.length()); + } + Files.deleteIfExists(file.toPath()); + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java new file mode 100644 index 0000000000000..f6cd81ce21f43 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java @@ -0,0 +1,31 @@ +/* + * 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.utils; + +import org.apache.iotdb.db.node_commons.utils.IObjectFileService; +import org.apache.iotdb.db.node_commons.utils.IObjectFileServiceProvider; + +public class DataNodeObjectFileServiceProvider implements IObjectFileServiceProvider { + + @Override + public IObjectFileService getObjectFileService() { + return DataNodeObjectFileService.INSTANCE; + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java index 281b1be2b353b..e938cdcc96e53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java @@ -21,8 +21,8 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; -import org.apache.iotdb.db.utils.constant.SqlConstant; import com.google.common.collect.ImmutableSet; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java index aa2855f7b0592..d4dce932aff6f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.utils; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.sql.SemanticException; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelperFactory; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.external.commons.lang3.StringUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/MemoryReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/MemoryReader.java index a76c27894cae3..0dc32fdc7e23a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/MemoryReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/MemoryReader.java @@ -22,6 +22,7 @@ package org.apache.iotdb.db.utils.cte; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.utils.IObjectFileServiceProvider b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.utils.IObjectFileServiceProvider new file mode 100644 index 0000000000000..50d4b02b82b96 --- /dev/null +++ b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.utils.IObjectFileServiceProvider @@ -0,0 +1 @@ +org.apache.iotdb.db.utils.DataNodeObjectFileServiceProvider diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java index ceb44c38df46e..f6240fe02fe39 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.qp.sql; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor; -import org.apache.iotdb.db.utils.constant.SqlConstant; import org.junit.After; import org.junit.Before; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java index 61b24cd4ed969..c609ccff948ce 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java @@ -24,12 +24,12 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.exception.CpuNotEnoughException; -import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; import org.apache.iotdb.db.queryengine.execution.driver.IDriver; import org.apache.iotdb.db.queryengine.execution.exchange.MPPDataExchangeManager; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java index b43e373ed0472..213e2307ff398 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java @@ -21,12 +21,12 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.AggregationMergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.CountAccumulator; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; -import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java index 1d51a91c29ef2..67b15a92a23c7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.CteScanOperator; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.utils.cte.CteDataStore; import com.google.common.collect.ImmutableList; import org.apache.tsfile.common.conf.TSFileDescriptor; 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 d20ea18e48cce..f8868a0d3e963 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.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; @@ -56,7 +57,6 @@ import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; -import org.apache.iotdb.db.utils.datastructure.SortKey; import org.apache.iotdb.isession.SessionConfig; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java index 46f4cf0ad2952..35a5ff0a459d8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java @@ -31,6 +31,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; @@ -48,7 +49,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.DataNodeTableOperatorGenerator; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanContext; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata; -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.NonAlignedDeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; @@ -689,7 +689,8 @@ private void checkResult(Operator operator, List outputColumnList, int e } count += tsBlock.getPositionCount(); } - FragmentInstanceContext fragmentInstance = operator.getOperatorContext().getInstanceContext(); + FragmentInstanceContext fragmentInstance = + ((OperatorContext) operator.getOperatorContext()).getInstanceContext(); Filter globalTimeFilter = fragmentInstance.getGlobalTimeFilter(); if (globalTimeFilter != null) { assertFalse(globalTimeFilter instanceof Or); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java index 4320835e16741..089d37d20bd0b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.SortOperator; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -38,7 +39,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; -import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java index 5d1ce71e2a3c4..d2d5c62f644ca 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; @@ -44,7 +45,6 @@ import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; import org.apache.iotdb.db.storageengine.dataregion.read.reader.series.SeriesReaderTestUtil; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; -import org.apache.iotdb.db.utils.datastructure.SortKey; import io.airlift.units.Duration; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java index 9de4baad159b4..4d9a34cd12978 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TreeToTableViewAdaptorOperator; import org.apache.iotdb.db.queryengine.plan.planner.DataNodeTableOperatorGenerator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java index 49386b1497c8e..b62c009f9a7d7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.TableStreamSortOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator; -import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java index bb4b8d8cb3f81..2354030acb61c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWGroupWMoOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java index 9c20f80212542..b7ee9a98d3b8a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceStateMachine; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; -import org.apache.iotdb.db.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java index 30625a830d744..4ccdae57f4386 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.AbstractTableScanOperatorParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; -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.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverSchedulerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverSchedulerTest.java index b651b62441ed0..167103f75948d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverSchedulerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverSchedulerTest.java @@ -18,12 +18,12 @@ */ package org.apache.iotdb.db.queryengine.execution.schedule; +import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.conf.IoTDBDescriptor; 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.exception.CpuNotEnoughException; -import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.driver.IDriver; import org.apache.iotdb.db.queryengine.execution.exchange.IMPPDataExchangeManager; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java index 3e8c75f943d9e..2c325bbca84f6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.expression.predicate; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.tsfile.read.filter.basic.Filter; import org.apache.tsfile.read.filter.factory.FilterFactory; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java index 22fb4ed564bcc..75da051d84f64 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimestampOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementTestUtils; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java index 4eb502cf3b36c..94c48ee146a27 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java @@ -23,13 +23,13 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewIntoNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.IntoNode; 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.metadata.ColumnSchema; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.FloatType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java index 53cf40079c95f..0b737ceea7796 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java @@ -24,12 +24,12 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.LastQueryScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowDiskUsageNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowQueriesNode; -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.node.TableDiskUsageInformationSchemaTableScanNode; 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 6b22b86cb82f9..e52e70697ca5d 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 @@ -36,6 +36,8 @@ import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -58,12 +60,10 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnHandle; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ITableDeviceSchemaValidation; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.TableLogicalPlanner; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java index bdc6028e4bb78..7f100965cf6ea 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java @@ -26,13 +26,13 @@ import org.junit.BeforeClass; import org.junit.Test; +import static org.apache.iotdb.db.node_commons.utils.DateTimeUtils.initTimestampPrecision; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.assertAnalyzeSemanticException; 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.expression; 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.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan; -import static org.apache.iotdb.db.utils.DateTimeUtils.initTimestampPrecision; public class ExtractExpressionTest { @BeforeClass diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java index 6edb04d7ca85b..ccd20621f9381 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java @@ -29,6 +29,9 @@ import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnMetadata; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; @@ -37,14 +40,11 @@ import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnMetadata; -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.ITableDeviceSchemaValidation; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; import org.apache.iotdb.mpp.rpc.thrift.TRegionRouteReq; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index 87b84356baf8a..f9fa80addca41 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -34,6 +34,9 @@ import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnMetadata; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; @@ -48,15 +51,12 @@ import org.apache.iotdb.db.queryengine.plan.function.Repeat; import org.apache.iotdb.db.queryengine.plan.function.Split; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnMetadata; -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.ITableDeviceSchemaValidation; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.NonAlignedDeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.TreeDeviceViewSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; 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 9dd13640ed0ed..534a6f940bbb7 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -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.QualifiedObjectName; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java index 67742f041c73c..886e86c373098 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; import java.util.Optional; 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 5309cbc4c8c99..4dcbcf3a51d0d 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 @@ -21,10 +21,10 @@ import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -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.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java index ededbc634be2c..6bb59bd41bfdc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java @@ -21,9 +21,9 @@ import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java index b52487a66f634..31c8a9962f9bd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.predicate; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.tsfile.read.common.type.IntType; import org.apache.tsfile.read.common.type.LongType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java index 6f204780bb4ff..9a8fbe2661843 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java @@ -28,11 +28,11 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; -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.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRow; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java index fe164740d3bb6..4260a7df70630 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java @@ -26,10 +26,10 @@ import org.apache.iotdb.commons.schema.table.column.TagColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java index 2a8fa939588f1..4fcfe9e06c3f7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java @@ -25,6 +25,7 @@ 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.db.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -35,7 +36,6 @@ import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.exception.CpuNotEnoughException; -import org.apache.iotdb.db.queryengine.exception.MemoryNotEnoughException; import org.apache.iotdb.db.queryengine.execution.driver.IDriver; import org.apache.iotdb.db.queryengine.execution.exchange.MPPDataExchangeManager; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/DateTimeUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/DateTimeUtilsTest.java index d0bbb97fbae85..35872a9a67613 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/DateTimeUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/DateTimeUtilsTest.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.utils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; @@ -95,73 +96,95 @@ public void convertDatetimeStrToLongTest4() { /** Test time precision is ms. */ @Test public void convertDurationStrToLongTest1() { - Assert.assertEquals(7000L, DateTimeUtils.convertDurationStrToLongForTest(7, "s", "ms")); - Assert.assertEquals(420000L, DateTimeUtils.convertDurationStrToLongForTest(7, "m", "ms")); - Assert.assertEquals(25200000L, DateTimeUtils.convertDurationStrToLongForTest(7, "h", "ms")); - Assert.assertEquals(604800000L, DateTimeUtils.convertDurationStrToLongForTest(7, "d", "ms")); - Assert.assertEquals(4233600000L, DateTimeUtils.convertDurationStrToLongForTest(7, "w", "ms")); - Assert.assertEquals(18144000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "mo", "ms")); - Assert.assertEquals(220752000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "y", "ms")); - Assert.assertEquals(7L, DateTimeUtils.convertDurationStrToLongForTest(7, "ms", "ms")); - Assert.assertEquals(7L, DateTimeUtils.convertDurationStrToLongForTest(7000, "us", "ms")); - Assert.assertEquals(7L, DateTimeUtils.convertDurationStrToLongForTest(7000000, "ns", "ms")); + Assert.assertEquals(7000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "s", "ms")); + Assert.assertEquals( + 420000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "m", "ms")); + Assert.assertEquals( + 25200000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "h", "ms")); + Assert.assertEquals( + 604800000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "d", "ms")); + Assert.assertEquals( + 4233600000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "w", "ms")); + Assert.assertEquals( + 18144000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "mo", "ms")); + Assert.assertEquals( + 220752000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "y", "ms")); + Assert.assertEquals(7L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "ms", "ms")); + Assert.assertEquals( + 7L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7000, "us", "ms")); + Assert.assertEquals( + 7L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7000000, "ns", "ms")); } /** Test time precision is us. */ @Test public void convertDurationStrToLongTest2() { - Assert.assertEquals(7000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "s", "us")); - Assert.assertEquals(420000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "m", "us")); - Assert.assertEquals(25200000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "h", "us")); - Assert.assertEquals(604800000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "d", "us")); Assert.assertEquals( - 4233600000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "w", "us")); + 7000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "s", "us")); + Assert.assertEquals( + 420000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "m", "us")); + Assert.assertEquals( + 25200000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "h", "us")); + Assert.assertEquals( + 604800000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "d", "us")); + Assert.assertEquals( + 4233600000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "w", "us")); Assert.assertEquals( - 18144000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "mo", "us")); + 18144000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "mo", "us")); Assert.assertEquals( - 220752000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "y", "us")); - Assert.assertEquals(7000L, DateTimeUtils.convertDurationStrToLongForTest(7, "ms", "us")); - Assert.assertEquals(7L, DateTimeUtils.convertDurationStrToLongForTest(7, "us", "us")); - Assert.assertEquals(7L, DateTimeUtils.convertDurationStrToLongForTest(7000, "ns", "us")); + 220752000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "y", "us")); + Assert.assertEquals( + 7000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "ms", "us")); + Assert.assertEquals(7L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "us", "us")); + Assert.assertEquals( + 7L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7000, "ns", "us")); } /** Test time precision is ns. */ @Test public void convertDurationStrToLongTest3() { - Assert.assertEquals(7000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "s", "ns")); - Assert.assertEquals(420000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "m", "ns")); Assert.assertEquals( - 25200000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "h", "ns")); + 7000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "s", "ns")); + Assert.assertEquals( + 420000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "m", "ns")); + Assert.assertEquals( + 25200000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "h", "ns")); + Assert.assertEquals( + 604800000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "d", "ns")); + Assert.assertEquals( + 4233600000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "w", "ns")); Assert.assertEquals( - 604800000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "d", "ns")); + 18144000000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "mo", "ns")); Assert.assertEquals( - 4233600000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "w", "ns")); + 220752000000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "y", "ns")); Assert.assertEquals( - 18144000000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "mo", "ns")); + 7000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "ms", "ns")); Assert.assertEquals( - 220752000000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "y", "ns")); - Assert.assertEquals(7000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "ms", "ns")); - Assert.assertEquals(7000L, DateTimeUtils.convertDurationStrToLongForTest(7, "us", "ns")); - Assert.assertEquals(7L, DateTimeUtils.convertDurationStrToLongForTest(7, "ns", "ns")); + 7000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "us", "ns")); + Assert.assertEquals(7L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "ns", "ns")); } @Test public void getInstantWithPrecisionTest() { - Assert.assertEquals(7000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "s", "ns")); - Assert.assertEquals(420000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "m", "ns")); Assert.assertEquals( - 25200000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "h", "ns")); + 7000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "s", "ns")); Assert.assertEquals( - 604800000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "d", "ns")); + 420000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "m", "ns")); Assert.assertEquals( - 4233600000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "w", "ns")); + 25200000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "h", "ns")); Assert.assertEquals( - 18144000000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "mo", "ns")); + 604800000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "d", "ns")); Assert.assertEquals( - 220752000000000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "y", "ns")); - Assert.assertEquals(7000000L, DateTimeUtils.convertDurationStrToLongForTest(7, "ms", "ns")); - Assert.assertEquals(7000L, DateTimeUtils.convertDurationStrToLongForTest(7, "us", "ns")); - Assert.assertEquals(7L, DateTimeUtils.convertDurationStrToLongForTest(7, "ns", "ns")); + 4233600000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "w", "ns")); + Assert.assertEquals( + 18144000000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "mo", "ns")); + Assert.assertEquals( + 220752000000000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "y", "ns")); + Assert.assertEquals( + 7000000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "ms", "ns")); + Assert.assertEquals( + 7000L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "us", "ns")); + Assert.assertEquals(7L, DataNodeDateTimeUtils.convertDurationStrToLongForTest(7, "ns", "ns")); } @Ignore @@ -175,30 +198,42 @@ public void getConvertDurationIncludingMonthUnit() { try { SessionManager.getInstance().registerSession(session); - Assert.assertEquals(31 * 86400000L, DateTimeUtils.convertDurationStrToLong(0, 1, "mo", "ms")); Assert.assertEquals( - 28 * 86400000L, DateTimeUtils.convertDurationStrToLong(2678400000L, 1, "mo", "ms")); + 31 * 86400000L, DataNodeDateTimeUtils.convertDurationStrToLong(0, 1, "mo", "ms")); + Assert.assertEquals( + 28 * 86400000L, + DataNodeDateTimeUtils.convertDurationStrToLong(2678400000L, 1, "mo", "ms")); TimeZone.getTimeZone(ZoneOffset.UTC); Assert.assertEquals( - 31 * 86400000L, DateTimeUtils.convertDurationStrToLong(5097600000L, 1, "mo", "ms")); + 31 * 86400000L, + DataNodeDateTimeUtils.convertDurationStrToLong(5097600000L, 1, "mo", "ms")); Assert.assertEquals( - 30 * 86400000L, DateTimeUtils.convertDurationStrToLong(7776000000L, 1, "mo", "ms")); + 30 * 86400000L, + DataNodeDateTimeUtils.convertDurationStrToLong(7776000000L, 1, "mo", "ms")); Assert.assertEquals( - 31 * 86400000L, DateTimeUtils.convertDurationStrToLong(10368000000L, 1, "mo", "ms")); + 31 * 86400000L, + DataNodeDateTimeUtils.convertDurationStrToLong(10368000000L, 1, "mo", "ms")); Assert.assertEquals( - 30 * 86400000L, DateTimeUtils.convertDurationStrToLong(13046400000L, 1, "mo", "ms")); + 30 * 86400000L, + DataNodeDateTimeUtils.convertDurationStrToLong(13046400000L, 1, "mo", "ms")); Assert.assertEquals( - 31 * 86400000L, DateTimeUtils.convertDurationStrToLong(15638400000L, 1, "mo", "ms")); + 31 * 86400000L, + DataNodeDateTimeUtils.convertDurationStrToLong(15638400000L, 1, "mo", "ms")); Assert.assertEquals( - 31 * 86400000L, DateTimeUtils.convertDurationStrToLong(18316800000L, 1, "mo", "ms")); + 31 * 86400000L, + DataNodeDateTimeUtils.convertDurationStrToLong(18316800000L, 1, "mo", "ms")); Assert.assertEquals( - 30 * 86400000L, DateTimeUtils.convertDurationStrToLong(20995200000L, 1, "mo", "ms")); + 30 * 86400000L, + DataNodeDateTimeUtils.convertDurationStrToLong(20995200000L, 1, "mo", "ms")); Assert.assertEquals( - 31 * 86400000L, DateTimeUtils.convertDurationStrToLong(23587200000L, 1, "mo", "ms")); + 31 * 86400000L, + DataNodeDateTimeUtils.convertDurationStrToLong(23587200000L, 1, "mo", "ms")); Assert.assertEquals( - 30 * 86400000L, DateTimeUtils.convertDurationStrToLong(26265600000L, 1, "mo", "ms")); + 30 * 86400000L, + DataNodeDateTimeUtils.convertDurationStrToLong(26265600000L, 1, "mo", "ms")); Assert.assertEquals( - 31 * 86400000L, DateTimeUtils.convertDurationStrToLong(28857600000L, 1, "mo", "ms")); + 31 * 86400000L, + DataNodeDateTimeUtils.convertDurationStrToLong(28857600000L, 1, "mo", "ms")); } finally { // clean up the session after test SessionManager.getInstance().removeCurrSession(); @@ -311,31 +346,31 @@ public void testConvertDateStrToLong(ZoneOffset zoneOffset, ZoneId zoneId, long @Test public void testConstructTimeDuration() { - TimeDuration timeDuration = DateTimeUtils.constructTimeDuration("1y1d1ns"); + TimeDuration timeDuration = DataNodeDateTimeUtils.constructTimeDuration("1y1d1ns"); Assert.assertEquals(12, timeDuration.monthDuration); Assert.assertEquals(86400_000L, timeDuration.nonMonthDuration); - timeDuration = DateTimeUtils.constructTimeDuration("1y1mo1d1ms1ns"); + timeDuration = DataNodeDateTimeUtils.constructTimeDuration("1y1mo1d1ms1ns"); Assert.assertEquals(13, timeDuration.monthDuration); Assert.assertEquals(86400_001L, timeDuration.nonMonthDuration); - timeDuration = DateTimeUtils.constructTimeDuration("1d1ns"); + timeDuration = DataNodeDateTimeUtils.constructTimeDuration("1d1ns"); Assert.assertEquals(0, timeDuration.monthDuration); Assert.assertEquals(86400_000L, timeDuration.nonMonthDuration); - timeDuration = DateTimeUtils.constructTimeDuration("1y"); + timeDuration = DataNodeDateTimeUtils.constructTimeDuration("1y"); Assert.assertEquals(12, timeDuration.monthDuration); Assert.assertEquals(0, timeDuration.nonMonthDuration); - timeDuration = DateTimeUtils.constructTimeDuration("1mo"); + timeDuration = DataNodeDateTimeUtils.constructTimeDuration("1mo"); Assert.assertEquals(1, timeDuration.monthDuration); Assert.assertEquals(0, timeDuration.nonMonthDuration); - timeDuration = DateTimeUtils.constructTimeDuration("1y1mo"); + timeDuration = DataNodeDateTimeUtils.constructTimeDuration("1y1mo"); Assert.assertEquals(13, timeDuration.monthDuration); Assert.assertEquals(0, timeDuration.nonMonthDuration); - timeDuration = DateTimeUtils.constructTimeDuration("10000000000ms"); + timeDuration = DataNodeDateTimeUtils.constructTimeDuration("10000000000ms"); Assert.assertEquals(10000000000L, timeDuration.nonMonthDuration); } } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java index 53363b8fa110e..c3d32627d4696 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.utils; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.db.utils.constant.SqlConstant; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.AbstractAlignedChunkMetadata; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TimestampPrecisionUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TimestampPrecisionUtilsTest.java index 7c7893e49af8c..d88b440250754 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TimestampPrecisionUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TimestampPrecisionUtilsTest.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.utils; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; + import org.junit.Test; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java index 5e73abe878490..e055d3c2e25fa 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.utils.datastructure; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparatorUtils; import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java index c3475eaa03f63..ee32efb7f502c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java @@ -22,8 +22,13 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.utils.FileUtils; -import org.apache.iotdb.db.utils.datastructure.MergeSortKey; -import org.apache.iotdb.db.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.db.calc_commons.utils.sort.FileSpillerReader; +import org.apache.iotdb.db.calc_commons.utils.sort.MemoryReader; +import org.apache.iotdb.db.calc_commons.utils.sort.SortBufferManager; +import org.apache.iotdb.db.calc_commons.utils.sort.SortReader; +import org.apache.iotdb.db.calc_commons.utils.sort.TreeDiskSpiller; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java index 7af2e2738e0fc..1b8a2c8210269 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java @@ -505,6 +505,12 @@ public class CommonConfig { private int nodeId = -1; + /** The buffer for cte scan operation */ + private long cteBufferSize = 128 * 1024L; + + /** Max number of rows for cte materialization */ + private int maxRowsInCteBuffer = 1000; + CommonConfig() { // Empty constructor } @@ -2913,4 +2919,20 @@ public void setNodeId(int nodeId) { public int getNodeId() { return nodeId; } + + public void setCteBufferSize(long cteBufferSize) { + this.cteBufferSize = cteBufferSize; + } + + public long getCteBufferSize() { + return cteBufferSize; + } + + public void setMaxRowsInCteBuffer(int maxRowsInCteBuffer) { + this.maxRowsInCteBuffer = maxRowsInCteBuffer; + } + + public int getMaxRowsInCteBuffer() { + return maxRowsInCteBuffer; + } } From e40a0d998f5bb24e4601728567571dc47ef09c3f Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 20 Apr 2026 17:45:35 +0800 Subject: [PATCH 39/45] fix --- .../apache/iotdb/mqtt/MPPPublishHandler.java | 2 +- .../handler/StatementConstructionHandler.java | 2 +- .../handler/StatementConstructionHandler.java | 2 +- .../handler/StatementConstructionHandler.java | 2 +- .../apache/iotdb/it/env/cluster/EnvUtils.java | 2 +- .../BuiltinAggregationFunctionEnum.java | 2 +- .../it/partition/IoTDBTimePartitionIT.java | 2 +- .../it/procedure/IoTDBProcedureIT.java | 2 +- .../scalar/IoTDBCastFunctionTableIT.java | 2 +- .../scalar/IoTDBFormatFunctionTableIT.java | 2 +- .../old/query/IoTDBArithmeticTableIT.java | 2 +- .../old/query/IoTDBArithmeticTableViewIT.java | 2 +- .../iotdb/tool/data/AbstractDataTool.java | 4 +- .../process/function/partition/Slice.java | 2 +- .../AbstractGapFillOperator.java | 2 +- .../AbstractGapFillWGroupOperator.java | 2 +- .../AbstractGapFillWoGroupOperator.java | 2 +- .../GapFillWGroupWMoOperator.java | 2 +- .../GapFillWGroupWoMoOperator.java | 2 +- .../GapFillWoGroupWMoOperator.java | 2 +- .../GapFillWoGroupWoMoOperator.java | 2 +- .../rowpattern/LogicalIndexNavigation.java | 14 ++++++ .../rowpattern/expression/Computation.java | 4 +- .../IrRowPatternToProgramRewriter.java | 22 ++++---- .../aggregation/AccumulatorFactory.java | 2 +- .../aggregation/RecordIterator.java | 2 +- .../relational/ColumnTransformerBuilder.java | 2 +- .../plan/planner/TableOperatorGenerator.java | 38 +++++++------- ...AbstractTemporaryQueryDataFileService.java | 2 +- ...TemporaryQueryDataFileServiceProvider.java | 2 +- .../scalar/ObjectLengthColumnTransformer.java | 2 +- .../transformation/dag/udf/UDTFExecutor.java | 2 +- .../datastructure/SerializableList.java | 2 +- .../utils/IObjectFileService.java | 2 +- .../utils/IObjectFileServiceProvider.java | 2 +- .../utils/IObjectPath.java | 2 +- .../utils/ObjectTypeUtils.java | 2 +- .../function/ITableFunctionAINodeService.java | 28 +++++++++++ .../ITableFunctionAINodeServiceProvider.java | 25 ++++++++++ .../function/TableFunctionFactory.java | 2 +- .../function/tvf/ClassifyTableFunction.java | 18 ++----- .../function/tvf/ForecastTableFunction.java | 21 +++----- .../plan/relational/planner/node/Measure.java | 2 +- .../planner/node/PatternRecognitionNode.java | 6 +-- .../{rowpattern => }/AggregationLabelSet.java | 2 +- .../AggregationValuePointer.java | 2 +- .../ClassifierValuePointer.java | 2 +- .../ExpressionAndValuePointers.java | 2 +- .../{rowpattern => }/IrAlternation.java | 2 +- .../rowpattern/{rowpattern => }/IrAnchor.java | 4 +- .../{rowpattern => }/IrConcatenation.java | 2 +- .../rowpattern/{rowpattern => }/IrEmpty.java | 2 +- .../{rowpattern => }/IrExclusion.java | 2 +- .../rowpattern/{rowpattern => }/IrLabel.java | 2 +- .../IrPatternAlternationOptimizer.java | 4 +- .../{rowpattern => }/IrPermutation.java | 2 +- .../{rowpattern => }/IrQuantified.java | 2 +- .../{rowpattern => }/IrQuantifier.java | 2 +- .../{rowpattern => }/IrRowPattern.java | 2 +- .../IrRowPatternFlattener.java | 2 +- .../{rowpattern => }/IrRowPatternVisitor.java | 2 +- .../{rowpattern => }/LogicalIndexPointer.java | 15 +----- .../MatchNumberValuePointer.java | 2 +- .../rowpattern/{rowpattern => }/Patterns.java | 12 ++--- .../{rowpattern => }/ScalarValuePointer.java | 2 +- .../{rowpattern => }/ValuePointer.java | 2 +- .../plan/udf/BuiltinAggregationFunction.java | 2 +- .../plan/udf/BuiltinScalarFunction.java | 2 +- .../BuiltinTimeSeriesGeneratingFunction.java | 2 +- .../plan/udf/TableUDFUtils.java | 32 +++++++++++- .../plan/udf/UDFManagementService.java | 2 +- .../plan/udf/UDTFForecast.java | 25 +++------- .../DataNodeTableFunctionAINodeService.java | 50 +++++++++++++++++++ ...odeTableFunctionAINodeServiceProvider.java | 32 ++++++++++++ .../impl/DataNodeInternalRPCServiceImpl.java | 2 +- .../aggregation/UDAFAccumulator.java | 2 +- .../execution/operator/AggregationUtil.java | 2 +- .../operator/process/TransformOperator.java | 2 +- .../plan/analyze/ExpressionAnalyzer.java | 4 +- .../executor/ClusterConfigTaskExecutor.java | 2 +- .../config/metadata/ShowFunctionsTask.java | 8 +-- .../plan/expression/ExpressionFactory.java | 2 +- .../expression/multi/FunctionExpression.java | 4 +- .../optimization/AggregationPushDown.java | 2 +- .../planner/plan/node/write/ObjectNode.java | 2 +- .../analyzer/ExpressionTreeUtils.java | 2 +- .../metadata/TableMetadataImpl.java | 2 +- .../relational/planner/RelationPlanner.java | 22 ++++---- .../rule/ExpressionRewriteRuleSet.java | 4 +- .../iterative/rule/OptimizeRowPattern.java | 6 +-- .../PrunePatternRecognitionSourceColumns.java | 2 +- .../planner/optimizations/SymbolMapper.java | 14 +++--- .../rowpattern/RowPatternToIrRewriter.java | 30 +++++------ .../db/queryengine/plan/udf/TreeUDFUtils.java | 2 +- .../dag/udf/UDAFInformationInferrer.java | 2 +- .../transformation/dag/udf/UDTFContext.java | 2 +- .../dag/udf/UDTFInformationInferrer.java | 2 +- .../org/apache/iotdb/db/service/DataNode.java | 4 +- ...TemporaryQueryDataFileServiceProvider.java | 4 +- .../TemporaryQueryDataFileService.java | 2 +- .../storageengine/dataregion/DataRegion.java | 2 +- .../reader/chunk/DiskAlignedChunkLoader.java | 2 +- .../read/reader/chunk/DiskChunkLoader.java | 2 +- .../db/utils/DataNodeObjectFileService.java | 4 +- .../DataNodeObjectFileServiceProvider.java | 4 +- ...ce.ITemporaryQueryDataFileServiceProvider} | 0 ..._commons.utils.IObjectFileServiceProvider} | 0 ...nction.ITableFunctionAINodeServiceProvider | 1 + .../gapfill/GapFillWGroupWMoOperatorTest.java | 4 +- .../GapFillWGroupWoMoOperatorTest.java | 4 +- .../GapFillWoGroupWMoOperatorTest.java | 4 +- .../GapFillWoGroupWoMoOperatorTest.java | 2 +- .../IrRowPatternOptimizationTest.java | 26 +++++----- .../process/rowpattern/MatcherTest.java | 22 ++++---- .../relational/analyzer/TSBSMetadata.java | 2 +- .../relational/analyzer/TestMetadata.java | 4 +- .../PatternRecognitionNodeSerdeTest.java | 18 +++---- .../iotdb/db/utils/EnvironmentUtils.java | 2 +- 118 files changed, 419 insertions(+), 282 deletions(-) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/{gapfill => }/AbstractGapFillOperator.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/{gapfill => }/AbstractGapFillWGroupOperator.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/{gapfill => }/AbstractGapFillWoGroupOperator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/{gapfill => }/GapFillWGroupWMoOperator.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/{gapfill => }/GapFillWGroupWoMoOperator.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/{gapfill => }/GapFillWoGroupWMoOperator.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/{gapfill => }/GapFillWoGroupWoMoOperator.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons => calc_commons}/service/AbstractTemporaryQueryDataFileService.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons => calc_commons}/service/ITemporaryQueryDataFileServiceProvider.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons => calc_commons}/utils/IObjectFileService.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons => calc_commons}/utils/IObjectFileServiceProvider.java (94%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons => calc_commons}/utils/IObjectPath.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{node_commons => calc_commons}/utils/ObjectTypeUtils.java (99%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionAINodeService.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionAINodeServiceProvider.java rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/AggregationLabelSet.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/AggregationValuePointer.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/ClassifierValuePointer.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/ExpressionAndValuePointers.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/IrAlternation.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/IrAnchor.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/IrConcatenation.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/IrEmpty.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/IrExclusion.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/IrLabel.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/IrPatternAlternationOptimizer.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/IrPermutation.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/IrQuantified.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/IrQuantifier.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/IrRowPattern.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/IrRowPatternFlattener.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/IrRowPatternVisitor.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/LogicalIndexPointer.java (91%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/MatchNumberValuePointer.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/Patterns.java (90%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/ScalarValuePointer.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/{rowpattern => }/ValuePointer.java (96%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{calc_commons => node_commons}/plan/udf/BuiltinAggregationFunction.java (98%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{calc_commons => node_commons}/plan/udf/BuiltinScalarFunction.java (97%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{calc_commons => node_commons}/plan/udf/BuiltinTimeSeriesGeneratingFunction.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{calc_commons => node_commons}/plan/udf/TableUDFUtils.java (65%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{calc_commons => node_commons}/plan/udf/UDFManagementService.java (99%) rename iotdb-core/datanode/src/main/java/org/apache/iotdb/db/{calc_commons => node_commons}/plan/udf/UDTFForecast.java (91%) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeService.java create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeServiceProvider.java rename iotdb-core/datanode/src/main/resources/META-INF/services/{org.apache.iotdb.db.node_commons.service.ITemporaryQueryDataFileServiceProvider => org.apache.iotdb.db.calc_commons.service.ITemporaryQueryDataFileServiceProvider} (100%) rename iotdb-core/datanode/src/main/resources/META-INF/services/{org.apache.iotdb.db.node_commons.utils.IObjectFileServiceProvider => org.apache.iotdb.db.calc_commons.utils.IObjectFileServiceProvider} (100%) create mode 100644 iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider diff --git a/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java b/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java index 24a34d391f416..7d06d8b782b62 100644 --- a/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java +++ b/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java @@ -26,6 +26,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.node_commons.common.SqlDialect; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.protocol.session.MqttClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.plan.Coordinator; @@ -42,7 +43,6 @@ import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; import org.apache.iotdb.db.utils.CommonUtils; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.service.rpc.thrift.TSProtocolVersion; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/StatementConstructionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/StatementConstructionHandler.java index b7f712c41f779..0fd72c1178e35 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/StatementConstructionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/StatementConstructionHandler.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.WriteProcessRejectException; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.iotdb.rest.protocol.table.v1.model.InsertTabletRequest; import org.apache.tsfile.enums.ColumnCategory; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/StatementConstructionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/StatementConstructionHandler.java index 65ec7a966f1e0..752772bc97055 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/StatementConstructionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/StatementConstructionHandler.java @@ -20,9 +20,9 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.db.exception.WriteProcessRejectException; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.iotdb.rest.protocol.v1.model.InsertTabletRequest; import org.apache.tsfile.enums.TSDataType; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/StatementConstructionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/StatementConstructionHandler.java index 6668244e9e4f0..ffeed55b568ab 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/StatementConstructionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/StatementConstructionHandler.java @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.db.exception.WriteProcessRejectException; import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException; +import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowsStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; -import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.iotdb.rest.protocol.utils.InsertRowDataUtils; import org.apache.iotdb.rest.protocol.v2.model.InsertRecordsRequest; import org.apache.iotdb.rest.protocol.v2.model.InsertTabletRequest; diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java index faa593fb57c60..50f53166266a6 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java @@ -35,7 +35,7 @@ import static org.apache.iotdb.consensus.ConsensusFactory.IOT_CONSENSUS_V2; import static org.apache.iotdb.consensus.ConsensusFactory.RATIS_CONSENSUS; import static org.apache.iotdb.consensus.ConsensusFactory.SIMPLE_CONSENSUS; -import static org.apache.iotdb.db.utils.DateTimeUtils.convertLongToDate; +import static org.apache.iotdb.db.node_commons.utils.DateTimeUtils.convertLongToDate; import static org.apache.iotdb.it.env.cluster.ClusterConstant.CLUSTER_CONFIGURATIONS; import static org.apache.iotdb.it.env.cluster.ClusterConstant.DEFAULT_CONFIG_NODE_NUM; import static org.apache.iotdb.it.env.cluster.ClusterConstant.DEFAULT_DATA_NODE_NUM; diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java b/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java index e24cbfbeea206..b63defb8a41a5 100644 --- a/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java @@ -19,7 +19,7 @@ package org.apache.iotdb.itbase.constant; -import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.db.node_commons.plan.udf.BuiltinAggregationFunction; import java.util.Arrays; import java.util.HashSet; 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 469d6974cb583..2ef679cee46eb 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 @@ -28,7 +28,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowDatabaseStatement; -import org.apache.iotdb.db.utils.constant.SqlConstant; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; 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/confignode/it/procedure/IoTDBProcedureIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/procedure/IoTDBProcedureIT.java index ef56141d0bf16..9b70e707109cc 100644 --- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/procedure/IoTDBProcedureIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/procedure/IoTDBProcedureIT.java @@ -28,7 +28,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp; import org.apache.iotdb.confignode.rpc.thrift.TTestOperation; import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowDatabaseStatement; -import org.apache.iotdb.db.utils.constant.SqlConstant; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; 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/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java index 62c6b84f37af3..8f53c398c264b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java @@ -19,7 +19,7 @@ package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; 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/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java index 4f5d53c1dd83d..1bf34a529d984 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java @@ -14,7 +14,7 @@ package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; 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/IoTDBArithmeticTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBArithmeticTableIT.java index 43e1302db1222..ab9505b351cdd 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBArithmeticTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBArithmeticTableIT.java @@ -19,7 +19,7 @@ package org.apache.iotdb.relational.it.query.old.query; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; 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/view/old/query/IoTDBArithmeticTableViewIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/view/old/query/IoTDBArithmeticTableViewIT.java index e8a19eb2c59cd..9599f9e21eaa7 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/view/old/query/IoTDBArithmeticTableViewIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/view/old/query/IoTDBArithmeticTableViewIT.java @@ -19,7 +19,7 @@ package org.apache.iotdb.relational.it.query.view.old.query; -import org.apache.iotdb.db.utils.DateTimeUtils; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.TableClusterIT; 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 f5f11bc8d51ac..6924db234f78f 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 @@ -26,8 +26,8 @@ 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.utils.DateTimeUtils; -import org.apache.iotdb.db.utils.constant.SqlConstant; +import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.exception.ArgsErrorException; import org.apache.iotdb.isession.SessionDataSet; import org.apache.iotdb.rpc.IoTDBConnectionException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/Slice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/Slice.java index da4b684b299b2..2eb8ce4c580ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/Slice.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/Slice.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition; -import org.apache.iotdb.db.node_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.db.calc_commons.utils.ObjectTypeUtils; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java index 1978100d19e8f..bb764c51b8caa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWGroupOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java index ee8b92d21030d..f6c7e4e7755e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWoGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWoGroupOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java index 357703651a028..887179f8b60a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/AbstractGapFillWoGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWMoOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java index 8ffbbc1b64073..07dbb3390a3f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWoMoOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java index 456d2096fe203..a3467eae7c25b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; // without month interval diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWMoOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java index 6cf4dc011fe15..221a45c7b1901 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWoMoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWoMoOperator.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java index 7cd0fbfbd7a49..68b846a837bdf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/gapfill/GapFillWoGroupWoMoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill; +package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java index 9429304423700..0b3b39d8da3c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java @@ -20,12 +20,16 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; import java.util.Collections; +import java.util.Map; import java.util.Objects; import java.util.Set; import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.util.Objects.requireNonNull; public class LogicalIndexNavigation { @@ -54,6 +58,16 @@ public LogicalIndexNavigation( this.physicalOffset = physicalOffset; } + public LogicalIndexNavigation( + LogicalIndexPointer logicalIndexPointer, Map mapping) { + this( + logicalIndexPointer.getLabels().stream().map(mapping::get).collect(toImmutableSet()), + logicalIndexPointer.isLast(), + logicalIndexPointer.isRunning(), + logicalIndexPointer.getLogicalOffset(), + logicalIndexPointer.getPhysicalOffset()); + } + public Set getLabels() { return labels; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/Computation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/Computation.java index fa2d4e90c14b8..fc1c810690161 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/Computation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/Computation.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers.Assignment; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers.Assignment; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java index bb0b6576e7892..0fc5bbcebcc31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAlternation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAnchor; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrConcatenation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrEmpty; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrExclusion; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrPermutation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantified; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPatternVisitor; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAlternation; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAnchor; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrConcatenation; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrEmpty; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrExclusion; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrPermutation; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantified; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPatternVisitor; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java index 82f3524bac277..46a0b60568452 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java @@ -50,11 +50,11 @@ import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedVarianceAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.IntGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.AggregateFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java index 7a2560b3a3f54..61d0ba36a986c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.node_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.db.calc_commons.utils.ObjectTypeUtils; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java index 5dfba31844956..fdd5838af7028 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java @@ -23,7 +23,6 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.plan.relational.metadata.ITypeMetadata; -import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.TableCaseWhenThenColumnTransformer; @@ -196,6 +195,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.ScalarFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 05e6a24ef899c..60dd362f4f005 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -48,10 +48,10 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.LongConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.TableFunctionLeafOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.TableFunctionOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWGroupWMoOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWGroupWoMoOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWMoOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWGroupWMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; @@ -150,15 +150,15 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.AggregationLabelSet; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.AggregationValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ClassifierValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.MatchNumberValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.AggregationLabelSet; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.AggregationValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ClassifierValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.MatchNumberValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; @@ -1711,7 +1711,7 @@ public Operator visitPatternRecognition(PatternRecognitionNode node, C context) new PhysicalValuePointer( CLASSIFIER, STRING, - classifierPointer.getLogicalIndexPointer().toLogicalIndexNavigation(mapping))); + new LogicalIndexNavigation(classifierPointer.getLogicalIndexPointer(), mapping))); } else if (pointer instanceof ScalarValuePointer) { ScalarValuePointer scalarPointer = (ScalarValuePointer) pointer; valueAccessors.add( @@ -1720,7 +1720,7 @@ public Operator visitPatternRecognition(PatternRecognitionNode node, C context) getChannelsForSymbols( ImmutableList.of(scalarPointer.getInputSymbol()), childLayout)), context.getTableTypeProvider().getTableModelType(scalarPointer.getInputSymbol()), - scalarPointer.getLogicalIndexPointer().toLogicalIndexNavigation(mapping))); + new LogicalIndexNavigation(scalarPointer.getLogicalIndexPointer(), mapping))); } else if (pointer instanceof AggregationValuePointer) { AggregationValuePointer aggregationPointer = (AggregationValuePointer) pointer; @@ -1802,7 +1802,7 @@ public Operator visitPatternRecognition(PatternRecognitionNode node, C context) new PhysicalValuePointer( CLASSIFIER, STRING, - classifierPointer.getLogicalIndexPointer().toLogicalIndexNavigation(mapping))); + new LogicalIndexNavigation(classifierPointer.getLogicalIndexPointer(), mapping))); } else if (pointer instanceof ScalarValuePointer) { ScalarValuePointer scalarPointer = (ScalarValuePointer) pointer; valueAccessors.add( @@ -1811,7 +1811,7 @@ public Operator visitPatternRecognition(PatternRecognitionNode node, C context) getChannelsForSymbols( ImmutableList.of(scalarPointer.getInputSymbol()), childLayout)), context.getTableTypeProvider().getTableModelType(scalarPointer.getInputSymbol()), - scalarPointer.getLogicalIndexPointer().toLogicalIndexNavigation(mapping))); + new LogicalIndexNavigation(scalarPointer.getLogicalIndexPointer(), mapping))); } else if (pointer instanceof AggregationValuePointer) { AggregationValuePointer aggregationPointer = (AggregationValuePointer) pointer; @@ -1871,8 +1871,8 @@ public Operator visitPatternRecognition(PatternRecognitionNode node, C context) boolean last = node.getSkipToPosition().equals(LAST); skipToNavigation = Optional.of( - new LogicalIndexPointer(node.getSkipToLabels(), last, false, 0, 0) - .toLogicalIndexNavigation(mapping)); + new LogicalIndexNavigation( + new LogicalIndexPointer(node.getSkipToLabels(), last, false, 0, 0), mapping)); } return new PatternRecognitionOperator( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/service/AbstractTemporaryQueryDataFileService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/service/AbstractTemporaryQueryDataFileService.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/service/AbstractTemporaryQueryDataFileService.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/service/AbstractTemporaryQueryDataFileService.java index 9776a5bdeeae6..13a9acac1cf54 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/service/AbstractTemporaryQueryDataFileService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/service/AbstractTemporaryQueryDataFileService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.service; +package org.apache.iotdb.db.calc_commons.service; import org.apache.iotdb.commons.exception.StartupException; import org.apache.iotdb.commons.file.SystemFileFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/service/ITemporaryQueryDataFileServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/service/ITemporaryQueryDataFileServiceProvider.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java index 204825a557346..858f3bd29470d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/service/ITemporaryQueryDataFileServiceProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.service; +package org.apache.iotdb.db.calc_commons.service; public interface ITemporaryQueryDataFileServiceProvider { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java index d898bc714f3ab..387fa249ae670 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.db.calc_commons.utils.ObjectTypeUtils; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDTFExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDTFExecutor.java index f887e186e6b5b..8f48394d352bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDTFExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDTFExecutor.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.udf; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.calc_commons.transformation.dag.adapter.PointCollectorAdaptor; import org.apache.iotdb.db.calc_commons.transformation.dag.util.InputRowUtils; import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.udf.api.UDTF; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowWindow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/SerializableList.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/SerializableList.java index 7f43cdf29cec5..5cef9bce255ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/SerializableList.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/SerializableList.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.db.node_commons.service.AbstractTemporaryQueryDataFileService; +import org.apache.iotdb.db.calc_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.tsfile.utils.PublicBAOS; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectFileService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectFileService.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectFileService.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectFileService.java index edc3b1980aae8..7aa1b0e1822aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectFileService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectFileService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.utils; +package org.apache.iotdb.db.calc_commons.utils; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectFileServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectFileServiceProvider.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectFileServiceProvider.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectFileServiceProvider.java index 889162a9b4270..bc7fbe702cb2d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectFileServiceProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectFileServiceProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.utils; +package org.apache.iotdb.db.calc_commons.utils; public interface IObjectFileServiceProvider { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectPath.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectPath.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectPath.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectPath.java index 408eba7fb7f62..aba3142b52c29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/IObjectPath.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectPath.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.utils; +package org.apache.iotdb.db.calc_commons.utils; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/ObjectTypeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/ObjectTypeUtils.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/ObjectTypeUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/ObjectTypeUtils.java index c3e4340240015..7735920e3904e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/ObjectTypeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/ObjectTypeUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.utils; +package org.apache.iotdb.db.calc_commons.utils; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionAINodeService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionAINodeService.java new file mode 100644 index 0000000000000..db2ed961f2d31 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionAINodeService.java @@ -0,0 +1,28 @@ +/* + * 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.node_commons.plan.relational.function; + +import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; +import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; + +public interface ITableFunctionAINodeService { + + TForecastResp forecast(TForecastReq req); +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionAINodeServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionAINodeServiceProvider.java new file mode 100644 index 0000000000000..c3bc47844f4e9 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionAINodeServiceProvider.java @@ -0,0 +1,25 @@ +/* + * 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.node_commons.plan.relational.function; + +public interface ITableFunctionAINodeServiceProvider { + + ITableFunctionAINodeService getTableFunctionAINodeService(); +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableFunctionFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableFunctionFactory.java index 75d34ec46e281..69d7b8ac12cc4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableFunctionFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableFunctionFactory.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.node_commons.plan.relational.function; -import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.udf.api.relational.TableFunction; public class TableFunctionFactory { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java index 576acacf292a7..5e51d34767bf9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java @@ -21,14 +21,10 @@ import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; -import org.apache.iotdb.commons.client.IClientManager; -import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.utils.ResultColumnAppender; -import org.apache.iotdb.db.protocol.client.an.AINodeClient; -import org.apache.iotdb.db.protocol.client.an.AINodeClientManager; +import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.relational.TableFunction; @@ -46,7 +42,6 @@ import org.apache.iotdb.udf.api.relational.table.specification.TableParameterSpecification; import org.apache.iotdb.udf.api.type.Type; -import org.apache.thrift.TException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; @@ -260,8 +255,6 @@ public TableFunctionDataProcessor getDataProcessor() { private static class ClassifyDataProcessor implements TableFunctionDataProcessor { private static final TsBlockSerde SERDE = new TsBlockSerde(); - private static final IClientManager CLIENT_MANAGER = - AINodeClientManager.getInstance(); private final String modelId; private final int maxInputLength; @@ -366,11 +359,10 @@ private TsBlock classify() { TsBlock inputData = inputTsBlockBuilder.build(); TForecastResp resp; - try (AINodeClient client = - CLIENT_MANAGER.borrowClient(AINodeClientManager.AINODE_ID_PLACEHOLDER)) { - resp = client.forecast(new TForecastReq(modelId, SERDE.serialize(inputData), outputLength)); - } catch (ClientManagerException | TException e) { - throw new AINodeConnectionException(e); + try { + resp = + TableUDFUtils.getTableFunctionAINodeService() + .forecast(new TForecastReq(modelId, SERDE.serialize(inputData), outputLength)); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ForecastTableFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ForecastTableFunction.java index 3d55302d2ffae..46defa5c47ad1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ForecastTableFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ForecastTableFunction.java @@ -21,14 +21,10 @@ import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; -import org.apache.iotdb.commons.client.IClientManager; -import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.plan.relational.utils.ResultColumnAppender; -import org.apache.iotdb.db.protocol.client.an.AINodeClient; -import org.apache.iotdb.db.protocol.client.an.AINodeClientManager; +import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.access.Record; @@ -45,7 +41,6 @@ import org.apache.iotdb.udf.api.relational.table.specification.TableParameterSpecification; import org.apache.iotdb.udf.api.type.Type; -import org.apache.thrift.TException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; @@ -359,8 +354,6 @@ public TableFunctionDataProcessor getDataProcessor() { protected static class ForecastDataProcessor implements TableFunctionDataProcessor { protected static final TsBlockSerde SERDE = new TsBlockSerde(); - protected static final IClientManager CLIENT_MANAGER = - AINodeClientManager.getInstance(); protected final String modelId; private final int maxInputLength; @@ -517,14 +510,12 @@ protected TsBlock forecast() { TsBlock inputData = inputTsBlockBuilder.build(); TForecastResp resp; - try (AINodeClient client = - CLIENT_MANAGER.borrowClient(AINodeClientManager.AINODE_ID_PLACEHOLDER)) { + try { resp = - client.forecast( - new TForecastReq(modelId, SERDE.serialize(inputData), outputLength) - .setOptions(options)); - } catch (ClientManagerException | TException e) { - throw new AINodeConnectionException(e); + TableUDFUtils.getTableFunctionAINodeService() + .forecast( + new TForecastReq(modelId, SERDE.serialize(inputData), outputLength) + .setOptions(options)); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/Measure.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/Measure.java index 837b15cd23872..32b0238c21078 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/Measure.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/Measure.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.node_commons.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java index 18a55c38938f0..230628cb16018 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java @@ -27,9 +27,9 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationLabelSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/AggregationLabelSet.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationLabelSet.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/AggregationLabelSet.java index bca2655aa815e..ad0268b2d3219 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationLabelSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/AggregationLabelSet.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/AggregationValuePointer.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/AggregationValuePointer.java index 29372a802fe9c..9113c1eeffa1f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/AggregationValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/AggregationValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ClassifierValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ClassifierValuePointer.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ClassifierValuePointer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ClassifierValuePointer.java index 1afb334bdd41a..7f5f4a7705e9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ClassifierValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ClassifierValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ExpressionAndValuePointers.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ExpressionAndValuePointers.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java index 832c2ab07b623..a4e065528fd0f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ExpressionAndValuePointers.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrAlternation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrAlternation.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrAlternation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrAlternation.java index d2affb2b2d3c3..528ea1478ce73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrAlternation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrAlternation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrAnchor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrAnchor.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrAnchor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrAnchor.java index ec0d216c81ac5..bd426f7dcebc0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrAnchor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrAnchor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -27,7 +27,7 @@ import java.util.Objects; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAnchor.Type.PARTITION_START; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_START; public class IrAnchor extends IrRowPattern { public enum Type { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrConcatenation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrConcatenation.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrConcatenation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrConcatenation.java index 49d37c3ee23f3..9026b4319a2f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrConcatenation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrConcatenation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrEmpty.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrEmpty.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrEmpty.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrEmpty.java index 28edcf804951b..40c6e783e0d52 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrEmpty.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrEmpty.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrExclusion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrExclusion.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrExclusion.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrExclusion.java index 5c5cca9493bbd..a3ba52f47c33b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrExclusion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrExclusion.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrLabel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrLabel.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrLabel.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrLabel.java index 9534d054349fd..f1146f7d0f1c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrLabel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrLabel.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrPatternAlternationOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrPatternAlternationOptimizer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java index 9cad8c5bd6821..98260783d06c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrPatternAlternationOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import com.google.common.collect.ImmutableList; @@ -25,7 +25,7 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.toImmutableList; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.zeroOrOne; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; /** * Remove empty pattern from pattern alternation and replace it with quantification of a diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrPermutation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrPermutation.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrPermutation.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrPermutation.java index a781fab5e331c..1e580c570cac5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrPermutation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrPermutation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrQuantified.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrQuantified.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrQuantified.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrQuantified.java index 3ae19567096ef..0f5d0a352dfaf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrQuantified.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrQuantified.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrQuantifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrQuantifier.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrQuantifier.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrQuantifier.java index 1d8ff1b246fbf..0443255f062e8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrQuantifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrQuantifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPattern.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPattern.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPattern.java index fa60530eee84c..19c2b4fe940e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import org.apache.iotdb.db.exception.sql.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPatternFlattener.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPatternFlattener.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPatternFlattener.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPatternFlattener.java index 5fecb723f194e..4c2c13f2882f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPatternFlattener.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPatternFlattener.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPatternVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPatternVisitor.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPatternVisitor.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPatternVisitor.java index f4cdf024fea50..25f31e5b76650 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/IrRowPatternVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPatternVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/LogicalIndexPointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/LogicalIndexPointer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/LogicalIndexPointer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/LogicalIndexPointer.java index cc1d1c6fb308b..611794e0d51b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/LogicalIndexPointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/LogicalIndexPointer.java @@ -17,9 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; - -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -27,12 +25,10 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.HashSet; -import java.util.Map; import java.util.Objects; import java.util.Set; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.util.Objects.requireNonNull; public class LogicalIndexPointer { @@ -90,15 +86,6 @@ public int getPhysicalOffset() { return physicalOffset; } - public LogicalIndexNavigation toLogicalIndexNavigation(Map mapping) { - return new LogicalIndexNavigation( - labels.stream().map(mapping::get).collect(toImmutableSet()), - last, - running, - logicalOffset, - physicalOffset); - } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/MatchNumberValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/MatchNumberValuePointer.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/MatchNumberValuePointer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/MatchNumberValuePointer.java index eb4ee668c74a9..7b063ffa724b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/MatchNumberValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/MatchNumberValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/Patterns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/Patterns.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/Patterns.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/Patterns.java index 127bb1ea46d8b..61ec656c95459 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/Patterns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/Patterns.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import com.google.common.collect.ImmutableList; import java.util.Optional; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAnchor.Type.PARTITION_END; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAnchor.Type.PARTITION_START; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.oneOrMore; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.zeroOrMore; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.zeroOrOne; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_END; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_START; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.oneOrMore; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrMore; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; public class Patterns { private Patterns() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ScalarValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ScalarValuePointer.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ScalarValuePointer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ScalarValuePointer.java index f8b7c4538d5c6..275e5386e8907 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ScalarValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ScalarValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ValuePointer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ValuePointer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ValuePointer.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ValuePointer.java index 2f35d1e7406b0..9991f170248ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/rowpattern/ValuePointer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ValuePointer.java @@ -12,6 +12,6 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern; +package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; public interface ValuePointer {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinAggregationFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinAggregationFunction.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinAggregationFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinAggregationFunction.java index 8274e32bd30ff..b538a9b2373a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinAggregationFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinAggregationFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.udf; +package org.apache.iotdb.db.node_commons.plan.udf; import java.util.Arrays; import java.util.HashSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinScalarFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinScalarFunction.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinScalarFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinScalarFunction.java index 8db1027bd39b0..8b087577088a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinScalarFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinScalarFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.udf; +package org.apache.iotdb.db.node_commons.plan.udf; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java index f085a3a17f626..cbcee8b874e5f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.udf; +package org.apache.iotdb.db.node_commons.plan.udf; import org.apache.iotdb.commons.udf.builtin.String.UDTFConcat; import org.apache.iotdb.commons.udf.builtin.String.UDTFEndsWith; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/TableUDFUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/TableUDFUtils.java similarity index 65% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/TableUDFUtils.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/TableUDFUtils.java index bf907cd049b06..c247e864a1779 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/TableUDFUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/TableUDFUtils.java @@ -17,22 +17,52 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.udf; +package org.apache.iotdb.db.node_commons.plan.udf; +import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; +import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; import org.apache.iotdb.common.rpc.thrift.FunctionType; import org.apache.iotdb.common.rpc.thrift.Model; import org.apache.iotdb.commons.udf.UDFInformation; +import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeService; +import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.relational.AggregateFunction; import org.apache.iotdb.udf.api.relational.ScalarFunction; import org.apache.iotdb.udf.api.relational.TableFunction; +import java.util.ServiceLoader; + public class TableUDFUtils { + private static final ITableFunctionAINodeService EMPTY_AI_NODE_SERVICE = + req -> { + throw new UnsupportedOperationException( + "Table function AINode service is not available in current node"); + }; + private static final ITableFunctionAINodeService AI_NODE_SERVICE = loadAINodeService(); + private TableUDFUtils() { // private constructor } + private static ITableFunctionAINodeService loadAINodeService() { + ITableFunctionAINodeService aiNodeService = null; + ServiceLoader loader = + ServiceLoader.load(ITableFunctionAINodeServiceProvider.class); + for (ITableFunctionAINodeServiceProvider provider : loader) { + if (aiNodeService != null) { + throw new IllegalStateException("Multiple ITableFunctionAINodeServiceProvider found"); + } + aiNodeService = provider.getTableFunctionAINodeService(); + } + return aiNodeService == null ? EMPTY_AI_NODE_SERVICE : aiNodeService; + } + + public static ITableFunctionAINodeService getTableFunctionAINodeService() { + return AI_NODE_SERVICE; + } + public static boolean isScalarFunction(String functionName) { UDFInformation information = UDFManagementService.getInstance().getUDFInformation(Model.TABLE, functionName); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/UDFManagementService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/UDFManagementService.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/UDFManagementService.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/UDFManagementService.java index a3534b8c9c818..295546a596804 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/UDFManagementService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/UDFManagementService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.udf; +package org.apache.iotdb.db.node_commons.plan.udf; import org.apache.iotdb.common.rpc.thrift.Model; import org.apache.iotdb.commons.udf.UDFInformation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/UDTFForecast.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/UDTFForecast.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/UDTFForecast.java rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/UDTFForecast.java index 0b550d1573283..adf5b5c51112d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/udf/UDTFForecast.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/UDTFForecast.java @@ -17,16 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.udf; +package org.apache.iotdb.db.node_commons.plan.udf; import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; -import org.apache.iotdb.commons.client.IClientManager; -import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; -import org.apache.iotdb.db.protocol.client.an.AINodeClient; -import org.apache.iotdb.db.protocol.client.an.AINodeClientManager; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.UDTF; import org.apache.iotdb.udf.api.access.Row; @@ -36,7 +31,6 @@ import org.apache.iotdb.udf.api.customizer.strategy.RowByRowAccessStrategy; import org.apache.iotdb.udf.api.type.Type; -import org.apache.thrift.TException; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.read.common.block.TsBlockBuilder; @@ -54,8 +48,6 @@ public class UDTFForecast implements UDTF { private static final TsBlockSerde serde = new TsBlockSerde(); - private static final IClientManager CLIENT_MANAGER = - AINodeClientManager.getInstance(); private String model_id; private int maxInputLength; private int outputLength; @@ -209,16 +201,11 @@ private TsBlock forecast() throws Exception { TsBlock inputData = inputTsBlockBuilder.build(); - TForecastResp resp; - try (AINodeClient client = - CLIENT_MANAGER.borrowClient(AINodeClientManager.AINODE_ID_PLACEHOLDER)) { - resp = - client.forecast( - new TForecastReq(model_id, serde.serialize(inputData), outputLength) - .setOptions(options)); - } catch (ClientManagerException | TException e) { - throw new AINodeConnectionException(e); - } + TForecastResp resp = + TableUDFUtils.getTableFunctionAINodeService() + .forecast( + new TForecastReq(model_id, serde.serialize(inputData), outputLength) + .setOptions(options)); if (resp.getStatus().getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) { throw new IoTDBRuntimeException( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeService.java new file mode 100644 index 0000000000000..bb08fb537f991 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeService.java @@ -0,0 +1,50 @@ +/* + * 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.protocol.client.an; + +import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; +import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; +import org.apache.iotdb.commons.client.IClientManager; +import org.apache.iotdb.commons.client.exception.ClientManagerException; +import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; +import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeService; + +import org.apache.thrift.TException; + +public class DataNodeTableFunctionAINodeService implements ITableFunctionAINodeService { + + private static final IClientManager CLIENT_MANAGER = + AINodeClientManager.getInstance(); + + public static final DataNodeTableFunctionAINodeService INSTANCE = + new DataNodeTableFunctionAINodeService(); + + private DataNodeTableFunctionAINodeService() {} + + @Override + public TForecastResp forecast(TForecastReq req) { + try (AINodeClient client = + CLIENT_MANAGER.borrowClient(AINodeClientManager.AINODE_ID_PLACEHOLDER)) { + return client.forecast(req); + } catch (ClientManagerException | TException e) { + throw new AINodeConnectionException(e); + } + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeServiceProvider.java new file mode 100644 index 0000000000000..e6a459850210a --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeServiceProvider.java @@ -0,0 +1,32 @@ +/* + * 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.protocol.client.an; + +import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeService; +import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider; + +public class DataNodeTableFunctionAINodeServiceProvider + implements ITableFunctionAINodeServiceProvider { + + @Override + public ITableFunctionAINodeService getTableFunctionAINodeService() { + return DataNodeTableFunctionAINodeService.INSTANCE; + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java index 40f168aeee9f9..b9d519930dfac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -100,7 +100,6 @@ import org.apache.iotdb.consensus.exception.ConsensusGroupNotExistException; import org.apache.iotdb.db.audit.DNAuditLogger; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.DataRegionConsensusImpl; import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; @@ -110,6 +109,7 @@ import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.partition.DataPartitionTableGenerator; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.protocol.client.ConfigNodeInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java index 1a287b2e12dfb..0439bb3718275 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDFParametersFactory; +import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.udf.api.State; import org.apache.iotdb.udf.api.UDAF; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java index f40693cea6e5a..2de14e8037989 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.db.node_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.SingleTimeWindowIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java index 6c2bfe47d2d27..ade8e09f3384c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; 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 94f69d27cbdd8..5e2f73220e1c1 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 @@ -24,10 +24,10 @@ 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.db.calc_commons.plan.udf.BuiltinScalarFunction; -import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.udf.BuiltinScalarFunction; +import org.apache.iotdb.db.node_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.expression.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java index 976a3fd29a572..3b8e37943ab71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java @@ -173,7 +173,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TStopPipeReq; import org.apache.iotdb.confignode.rpc.thrift.TThrottleQuotaResp; import org.apache.iotdb.confignode.rpc.thrift.TUnsetSchemaTemplateReq; -import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.BatchProcessException; import org.apache.iotdb.db.exception.StorageEngineException; @@ -183,6 +182,7 @@ import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.common.SqlDialect; +import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.source.dataregion.DataRegionListeningFilter; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; 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 72bf03d56cb3f..0e47ee2522801 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 @@ -26,11 +26,11 @@ import org.apache.iotdb.commons.udf.UDFType; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; -import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinAggregationFunction; -import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinScalarFunction; -import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; -import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; +import org.apache.iotdb.db.node_commons.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.db.node_commons.plan.udf.BuiltinScalarFunction; +import org.apache.iotdb.db.node_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; +import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; 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/expression/ExpressionFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java index 2d362fdbb1c1a..fafea1a1f58ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java @@ -23,7 +23,7 @@ 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.db.calc_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; +import org.apache.iotdb.db.node_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java index 9b847c46dbeb6..5171f41f81fc8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java @@ -21,13 +21,13 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinAggregationFunction; -import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.expression.multi.FunctionType; import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.db.node_commons.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.db.node_commons.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; 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 b6edaf9e321db..1a3d64f43a303 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 @@ -25,12 +25,12 @@ 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.db.calc_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.db.node_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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/planner/plan/node/write/ObjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java index bda122a7249af..f1712460b3aba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.exception.ObjectFileNotExist; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; +import org.apache.iotdb.db.calc_commons.utils.IObjectPath; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.utils.IObjectPath; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java index 18a367b010fb0..bdecd30a76416 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; -import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultExpressionTraversalVisitor; import com.google.common.collect.ImmutableList; 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 0f1c616ee1c02..42e4b038a3ecd 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 @@ -29,7 +29,6 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; -import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.SemanticException; @@ -47,6 +46,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; 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 f28a3956b6442..faf93ea9d51e8 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 @@ -41,17 +41,17 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.AggregationLabelSet; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.AggregationValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ClassifierValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers.Assignment; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.MatchNumberValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.AggregationLabelSet; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.AggregationValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ClassifierValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers.Assignment; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.MatchNumberValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java index 1252cae1a116d..5f66068709220 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java @@ -27,8 +27,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java index a89b1930e6271..e3504f7a03570 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java @@ -22,9 +22,9 @@ import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrPatternAlternationOptimizer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPatternFlattener; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrPatternAlternationOptimizer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPatternFlattener; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.patternRecognition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java index d17c209a64c23..058d66dfdf74f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java @@ -24,7 +24,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java index b0e14bd14f207..65ace453e531a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java @@ -34,13 +34,13 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.AggregationValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ClassifierValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.MatchNumberValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.AggregationValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ClassifierValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.MatchNumberValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java index 41d74ae049741..2d7b407ad6260 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.rowpattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAlternation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAnchor; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrAnchor.Type; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrConcatenation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrEmpty; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrExclusion; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrPermutation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantified; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAlternation; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAnchor; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrConcatenation; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrEmpty; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrExclusion; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrPermutation; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantified; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AnchorPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.EmptyPattern; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExcludedPattern; @@ -52,10 +52,10 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.oneOrMore; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.range; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.zeroOrMore; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrQuantifier.zeroOrOne; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.oneOrMore; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.range; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrMore; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; public class RowPatternToIrRewriter implements AstVisitor { private final Analysis analysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java index c3bd93a215e79..66ab69870aaf5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.udf; -import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.udf.api.UDAF; import org.apache.iotdb.udf.api.UDTF; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java index f31e9dbdc355f..9b1dacb667b4e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.udf.api.UDAF; import org.apache.iotdb.udf.api.customizer.config.UDAFConfigurations; import org.apache.iotdb.udf.api.customizer.parameter.UDFParameterValidator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java index 5cd7c56a8b306..0d39d10b19452 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; +import org.apache.iotdb.db.calc_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.db.node_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java index b8d75f6ed6563..dd4b12e4980f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.udf.api.UDTF; import org.apache.iotdb.udf.api.customizer.config.UDTFConfigurations; import org.apache.iotdb.udf.api.customizer.parameter.UDFParameterValidator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java index 6d0fd2f789409..b9068ddce2914 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java @@ -70,7 +70,7 @@ import org.apache.iotdb.consensus.common.Peer; import org.apache.iotdb.db.audit.DNAuditLogger; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.db.calc_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.db.conf.DataNodeStartupCheck; import org.apache.iotdb.db.conf.DataNodeSystemPropertiesHandler; import org.apache.iotdb.db.conf.IoTDBConfig; @@ -78,7 +78,7 @@ import org.apache.iotdb.db.conf.IoTDBStartCheck; import org.apache.iotdb.db.consensus.DataRegionConsensusImpl; import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; -import org.apache.iotdb.db.node_commons.service.AbstractTemporaryQueryDataFileService; +import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java index ce4f49be03a21..241b95885084d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.service; -import org.apache.iotdb.db.node_commons.service.AbstractTemporaryQueryDataFileService; -import org.apache.iotdb.db.node_commons.service.ITemporaryQueryDataFileServiceProvider; +import org.apache.iotdb.db.calc_commons.service.AbstractTemporaryQueryDataFileService; +import org.apache.iotdb.db.calc_commons.service.ITemporaryQueryDataFileServiceProvider; public class DataNodeTemporaryQueryDataFileServiceProvider implements ITemporaryQueryDataFileServiceProvider { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java index d9e05143a89aa..886cf830531a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.service; +import org.apache.iotdb.db.calc_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.service.AbstractTemporaryQueryDataFileService; import java.io.File; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java index c8feafec22bef..86e31cd050fdf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java @@ -50,6 +50,7 @@ import org.apache.iotdb.consensus.iot.IoTConsensus; import org.apache.iotdb.consensus.iot.IoTConsensusServerImpl; import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.db.calc_commons.utils.ObjectTypeUtils; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.DataRegionConsensusImpl; @@ -67,7 +68,6 @@ import org.apache.iotdb.db.exception.runtime.TableLostRuntimeException; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; -import org.apache.iotdb.db.node_commons.utils.ObjectTypeUtils; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource.Status; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResourceManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java index ae867bb0babba..522a5598eb52b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.read.reader.chunk; -import org.apache.iotdb.db.node_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.db.calc_commons.utils.ObjectTypeUtils; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.metric.SeriesScanCostMetricSet; import org.apache.iotdb.db.storageengine.buffer.ChunkCache; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java index cdcb7e9c921c1..4db540cf85072 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.read.reader.chunk; +import org.apache.iotdb.db.calc_commons.utils.ObjectTypeUtils; import org.apache.iotdb.db.exception.ChunkTypeInconsistentException; -import org.apache.iotdb.db.node_commons.utils.ObjectTypeUtils; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.metric.SeriesScanCostMetricSet; import org.apache.iotdb.db.storageengine.buffer.ChunkCache; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java index 801b643deb9f8..1332aa4c03bc4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.ObjectFileNotExist; -import org.apache.iotdb.db.node_commons.utils.IObjectFileService; -import org.apache.iotdb.db.node_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.db.calc_commons.utils.IObjectFileService; +import org.apache.iotdb.db.calc_commons.utils.ObjectTypeUtils; import org.apache.iotdb.db.service.metrics.FileMetrics; import org.apache.iotdb.db.storageengine.rescon.disk.TierManager; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java index f6cd81ce21f43..d81f8a727a4a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.utils; -import org.apache.iotdb.db.node_commons.utils.IObjectFileService; -import org.apache.iotdb.db.node_commons.utils.IObjectFileServiceProvider; +import org.apache.iotdb.db.calc_commons.utils.IObjectFileService; +import org.apache.iotdb.db.calc_commons.utils.IObjectFileServiceProvider; public class DataNodeObjectFileServiceProvider implements IObjectFileServiceProvider { diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.service.ITemporaryQueryDataFileServiceProvider b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.calc_commons.service.ITemporaryQueryDataFileServiceProvider similarity index 100% rename from iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.service.ITemporaryQueryDataFileServiceProvider rename to iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.calc_commons.service.ITemporaryQueryDataFileServiceProvider diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.utils.IObjectFileServiceProvider b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.calc_commons.utils.IObjectFileServiceProvider similarity index 100% rename from iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.utils.IObjectFileServiceProvider rename to iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.calc_commons.utils.IObjectFileServiceProvider diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider new file mode 100644 index 0000000000000..5fb895cd1c9c0 --- /dev/null +++ b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider @@ -0,0 +1 @@ +org.apache.iotdb.db.protocol.client.an.DataNodeTableFunctionAINodeServiceProvider diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java index 2354030acb61c..e2e3ec475b1b9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWGroupWMoOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWGroupWMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java index b7ee9a98d3b8a..a04ef5f22e89d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWGroupWoMoOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java index 0f766b1f92518..1ef7a4b20d8c5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWMoOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java index 7c67543246cfe..9b9476bf2e7dd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java index 8af1e0e4ec191..7c4783677bbf9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java @@ -19,25 +19,25 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrPatternAlternationOptimizer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPatternFlattener; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrPatternAlternationOptimizer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPatternFlattener; import org.junit.Assert; import org.junit.Test; import java.util.Optional; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.alternation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.concatenation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.empty; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.excluded; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.label; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.permutation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.plusQuantified; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.questionMarkQuantified; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.rangeQuantified; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.starQuantified; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.alternation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.concatenation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.empty; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.excluded; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.label; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.permutation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.plusQuantified; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.questionMarkQuantified; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.rangeQuantified; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.starQuantified; public class IrRowPatternOptimizationTest { @Test diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java index 8132fff0ee78a..5a123e002ac52 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java @@ -27,8 +27,8 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Program; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -38,15 +38,15 @@ import java.util.Map; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.alternation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.concatenation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.end; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.excluded; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.label; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.permutation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.questionMarkQuantified; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.starQuantified; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.start; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.alternation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.concatenation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.end; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.excluded; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.label; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.permutation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.questionMarkQuantified; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.starQuantified; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.start; import static org.mockito.Mockito.mock; public class MatcherTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java index ccd20621f9381..0eec23bd9a38b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java @@ -26,7 +26,6 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnMetadata; @@ -37,6 +36,7 @@ import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.db.node_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index f9fa80addca41..a46d055f21018 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -27,8 +27,6 @@ import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.calc_commons.plan.udf.BuiltinAggregationFunction; -import org.apache.iotdb.db.calc_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; @@ -45,6 +43,8 @@ import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.db.node_commons.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.function.Exclude; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java index 59fb2d5c72938..b3217b85302e7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java @@ -30,11 +30,11 @@ import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.IrRowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.ScalarValuePointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; +import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; @@ -60,10 +60,10 @@ import java.util.Optional; import java.util.Set; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.concatenation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.excluded; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.label; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.rowpattern.Patterns.starQuantified; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.concatenation; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.excluded; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.label; +import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.starQuantified; import static org.junit.Assert.assertEquals; public class PatternRecognitionNodeSerdeTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java index a55017a14858d..246b1387ed341 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java @@ -22,11 +22,11 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.StartupException; -import org.apache.iotdb.db.calc_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.StorageEngineException; +import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.schemaengine.SchemaEngine; From c402ac68e64f055eda994eca7c7340e9aa3ceb4e Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Mon, 20 Apr 2026 18:05:44 +0800 Subject: [PATCH 40/45] fix --- .../node_commons/plan/udf/TableUDFUtils.java | 2 - .../executor/RegionWriteExecutor.java | 83 +++++++++++-------- .../assertions/PlanMatchingVisitor.java | 2 +- 3 files changed, 49 insertions(+), 38 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/TableUDFUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/TableUDFUtils.java index c247e864a1779..91822a9230c2d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/TableUDFUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/TableUDFUtils.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.node_commons.plan.udf; -import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; -import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; import org.apache.iotdb.common.rpc.thrift.FunctionType; import org.apache.iotdb.common.rpc.thrift.Model; import org.apache.iotdb.commons.udf.UDFInformation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java index b01cad4d377c3..2136db2a24d7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java @@ -341,7 +341,7 @@ public RegionExecutionResult visitPipeEnrichedDeleteDataNode( // data deletion should block data insertion, especially when executed for deleting timeseries context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return visitPipeEnrichedDeleteDataNode(node, context); + return PlanVisitor.super.visitPipeEnrichedDeleteDataNode(node, context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } @@ -354,7 +354,7 @@ public RegionExecutionResult visitDeleteData( // require write lock on data region. context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return visitDeleteData(node, context); + return PlanVisitor.super.visitDeleteData(node, context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } @@ -367,7 +367,7 @@ public RegionExecutionResult visitDeleteData( // require write lock on data region. context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return visitDeleteData(node, context); + return PlanVisitor.super.visitDeleteData(node, context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } @@ -380,7 +380,7 @@ public RegionExecutionResult visitWriteObjectFile( // require write lock on data region. context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return visitWriteObjectFile(node, context); + return PlanVisitor.super.visitWriteObjectFile(node, context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } @@ -391,7 +391,7 @@ public RegionExecutionResult visitDeleteTimeseries( final DeleteTimeSeriesNode node, final WritePlanNodeExecutionContext context) { context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return visitDeleteTimeseries(node, context); + return PlanVisitor.super.visitDeleteTimeseries(node, context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } @@ -402,7 +402,7 @@ public RegionExecutionResult visitDeleteLogicalView( final DeleteLogicalViewNode node, final WritePlanNodeExecutionContext context) { context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return visitDeleteLogicalView(node, context); + return PlanVisitor.super.visitDeleteLogicalView(node, context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } @@ -440,7 +440,7 @@ private RegionExecutionResult executeCreateTimeSeries( Collections.singletonList(node.getPath().getMeasurement()), Collections.singletonList(node.getAlias())); if (failingMeasurementMap.isEmpty()) { - return visitCreateTimeSeries(node, context); + return PlanVisitor.super.visitCreateTimeSeries(node, context); } else { final MetadataException metadataException = failingMeasurementMap.get(0); LOGGER.info(METADATA_ERROR_MSG, metadataException.getMessage()); @@ -457,12 +457,13 @@ private RegionExecutionResult executeCreateTimeSeries( if (receivedFromPipe) { context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context); + return PlanVisitor.super.visitPipeEnrichedWritePlanNode( + new PipeEnrichedWritePlanNode(node), context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } } else { - return visitCreateTimeSeries(node, context); + return PlanVisitor.super.visitCreateTimeSeries(node, context); } } } @@ -497,7 +498,7 @@ private RegionExecutionResult executeCreateAlignedTimeSeries( schemaRegion.checkMeasurementExistence( node.getDevicePath(), node.getMeasurements(), node.getAliasList()); if (failingMeasurementMap.isEmpty()) { - return visitCreateAlignedTimeSeries(node, context); + return PlanVisitor.super.visitCreateAlignedTimeSeries(node, context); } else { final MetadataException metadataException = failingMeasurementMap.values().iterator().next(); @@ -515,12 +516,13 @@ private RegionExecutionResult executeCreateAlignedTimeSeries( if (receivedFromPipe) { context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context); + return PlanVisitor.super.visitPipeEnrichedWritePlanNode( + new PipeEnrichedWritePlanNode(node), context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } } else { - return visitCreateAlignedTimeSeries(node, context); + return PlanVisitor.super.visitCreateAlignedTimeSeries(node, context); } } } @@ -583,12 +585,13 @@ private RegionExecutionResult executeCreateMultiTimeSeries( if (receivedFromPipe) { context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context); + return PlanVisitor.super.visitPipeEnrichedWritePlanNode( + new PipeEnrichedWritePlanNode(node), context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } } else { - return visitCreateMultiTimeSeries(node, context); + return PlanVisitor.super.visitCreateMultiTimeSeries(node, context); } } } @@ -631,7 +634,8 @@ private RegionExecutionResult registerTimeSeries( final List failingStatus) { if (!measurementGroupMap.isEmpty()) { // try registering the rest timeseries - final RegionExecutionResult executionResult = visitCreateMultiTimeSeries(node, context); + final RegionExecutionResult executionResult = + PlanVisitor.super.visitCreateMultiTimeSeries(node, context); if (failingStatus.isEmpty()) { return executionResult; } @@ -709,7 +713,7 @@ private RegionExecutionResult executeInternalCreateTimeSeries( return processExecutionResultOfInternalCreateSchema( !measurementGroup.isEmpty() - ? visitInternalCreateTimeSeries(node, context) + ? PlanVisitor.super.visitInternalCreateTimeSeries(node, context) : RegionExecutionResult.create( true, "Execute successfully", @@ -723,12 +727,13 @@ private RegionExecutionResult executeInternalCreateTimeSeries( if (receivedFromPipe) { context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context); + return PlanVisitor.super.visitPipeEnrichedWritePlanNode( + new PipeEnrichedWritePlanNode(node), context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } } else { - return visitInternalCreateTimeSeries(node, context); + return PlanVisitor.super.visitInternalCreateTimeSeries(node, context); } } } @@ -810,7 +815,7 @@ private RegionExecutionResult executeInternalCreateMultiTimeSeries( return processExecutionResultOfInternalCreateSchema( !node.getDeviceMap().isEmpty() - ? visitInternalCreateMultiTimeSeries(node, context) + ? PlanVisitor.super.visitInternalCreateMultiTimeSeries(node, context) : RegionExecutionResult.create( true, "Execute successfully", @@ -824,12 +829,13 @@ private RegionExecutionResult executeInternalCreateMultiTimeSeries( if (receivedFromPipe) { context.getRegionWriteValidationRWLock().writeLock().lock(); try { - return visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context); + return PlanVisitor.super.visitPipeEnrichedWritePlanNode( + new PipeEnrichedWritePlanNode(node), context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } } else { - return visitInternalCreateMultiTimeSeries(node, context); + return PlanVisitor.super.visitInternalCreateMultiTimeSeries(node, context); } } } @@ -943,8 +949,9 @@ private RegionExecutionResult executeAlterTimeSeries( measurementPath.getMeasurementSchema().getType())); } return receivedFromPipe - ? visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) - : visitAlterTimeSeries(node, context); + ? PlanVisitor.super.visitPipeEnrichedWritePlanNode( + new PipeEnrichedWritePlanNode(node), context) + : PlanVisitor.super.visitAlterTimeSeries(node, context); } catch (MetadataException e) { return RegionExecutionResult.create( true, e.getMessage(), RpcUtils.getStatus(e.getErrorCode(), e.getMessage())); @@ -987,8 +994,9 @@ private RegionExecutionResult executeActivateTemplate( Collections.emptyList()); if (result == null) { return receivedFromPipe - ? visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) - : visitActivateTemplate(node, context); + ? PlanVisitor.super.visitPipeEnrichedWritePlanNode( + new PipeEnrichedWritePlanNode(node), context) + : PlanVisitor.super.visitActivateTemplate(node, context); } else { return result; } @@ -1038,8 +1046,9 @@ private RegionExecutionResult executeBatchActivateTemplate( } return receivedFromPipe - ? visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) - : visitBatchActivateTemplate(node, context); + ? PlanVisitor.super.visitPipeEnrichedWritePlanNode( + new PipeEnrichedWritePlanNode(node), context) + : PlanVisitor.super.visitBatchActivateTemplate(node, context); } finally { context.getRegionWriteValidationRWLock().readLock().unlock(); } @@ -1089,8 +1098,9 @@ private RegionExecutionResult executeInternalBatchActivateTemplate( } return receivedFromPipe - ? visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) - : visitInternalBatchActivateTemplate(node, context); + ? PlanVisitor.super.visitPipeEnrichedWritePlanNode( + new PipeEnrichedWritePlanNode(node), context) + : PlanVisitor.super.visitInternalBatchActivateTemplate(node, context); } finally { context.getRegionWriteValidationRWLock().readLock().unlock(); } @@ -1139,15 +1149,17 @@ private RegionExecutionResult executeCreateLogicalView( } // step 2. make sure all source paths exist. return receivedFromPipe - ? visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) - : visitCreateLogicalView(node, context); + ? PlanVisitor.super.visitPipeEnrichedWritePlanNode( + new PipeEnrichedWritePlanNode(node), context) + : PlanVisitor.super.visitCreateLogicalView(node, context); } finally { context.getRegionWriteValidationRWLock().writeLock().unlock(); } } else { return receivedFromPipe - ? visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) - : visitCreateLogicalView(node, context); + ? PlanVisitor.super.visitPipeEnrichedWritePlanNode( + new PipeEnrichedWritePlanNode(node), context) + : PlanVisitor.super.visitCreateLogicalView(node, context); } // end of visitCreateLogicalView } @@ -1171,8 +1183,9 @@ private RegionExecutionResult executeCreateOrUpdateTableDevice( false, e.getMessage(), RpcUtils.getStatus(e.getErrorCode(), e.getMessage())); } return receivedFromPipe - ? visitPipeEnrichedWritePlanNode(new PipeEnrichedWritePlanNode(node), context) - : visitCreateOrUpdateTableDevice(node, context); + ? PlanVisitor.super.visitPipeEnrichedWritePlanNode( + new PipeEnrichedWritePlanNode(node), context) + : PlanVisitor.super.visitCreateOrUpdateTableDevice(node, context); } @Override diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java index 36fe9ac1e00f8..9d4d63528f084 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java @@ -60,7 +60,7 @@ public MatchResult visitTableExchange(ExchangeNode node, PlanMatchPattern patter @Override public MatchResult visitProject(ProjectNode node, PlanMatchPattern pattern) { - MatchResult result = visitSingleChildProcess(node, pattern); + MatchResult result = PlanVisitor.super.visitProject(node, pattern); if (!result.isMatch()) { return result; From cbac473b4870b7ceb4e7826dfe808f698fac1cd2 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Tue, 21 Apr 2026 09:56:13 +0800 Subject: [PATCH 41/45] move node_commons --- .../consensus/request/ConfigPhysicalPlan.java | 2 +- .../response/pipe/task/PipeTableResp.java | 2 +- .../ConfigRegionStateMachine.java | 2 +- .../payload/PipeTransferConfigPlanReq.java | 2 +- .../PipeConfigTreePatternParseVisitor.java | 2 +- .../persistence/schema/ClusterSchemaInfo.java | 2 +- .../persistence/schema/ConfigMTree.java | 2 +- .../impl/region/AddRegionPeerProcedure.java | 2 +- .../region/ReconstructRegionProcedure.java | 2 +- .../impl/region/RegionMigrateProcedure.java | 2 +- .../region/RemoveRegionPeerProcedure.java | 2 +- .../apache/iotdb/consensus/IConsensus.java | 2 +- .../apache/iotdb/consensus/IStateMachine.java | 2 +- .../request/BatchIndexedConsensusRequest.java | 3 +- .../request/ByteBufferConsensusRequest.java | 3 +- ...erializedBatchIndexedConsensusRequest.java | 9 +- .../request/IndexedConsensusRequest.java | 13 +- .../common/request/IoTConsensusRequest.java | 2 +- .../iotdb/consensus/iot/IoTConsensus.java | 2 +- .../consensus/iot/IoTConsensusServerImpl.java | 2 +- .../iot/log/GetConsensusReqReaderPlan.java | 2 +- .../IoTConsensusRPCServiceProcessor.java | 2 +- .../iotdb/consensus/pipe/IoTConsensusV2.java | 2 +- .../pipe/IoTConsensusV2ServerImpl.java | 2 +- .../ratis/ApplicationStateMachineProxy.java | 2 +- .../iotdb/consensus/ratis/RatisConsensus.java | 2 +- .../iotdb/consensus/ratis/RequestMessage.java | 2 +- .../consensus/simple/SimpleConsensus.java | 2 +- .../simple/SimpleConsensusServerImpl.java | 2 +- .../iotdb/consensus/EmptyStateMachine.java | 2 +- .../consensus/iot/util/TestStateMachine.java | 2 +- .../consensus/ratis/RecoverReadTest.java | 2 +- .../iotdb/consensus/ratis/TestUtils.java | 2 +- .../consensus/simple/SimpleConsensusTest.java | 2 +- .../ArithmeticBinaryColumnTransformer.ftl | 6 +- .../ArithmeticColumnTransformerApi.ftl | 10 +- .../operator/CommonOperatorContext.java | 2 +- .../operator/GroupedTopNRowNumberBuilder.java | 2 +- .../SimpleTsBlockWithPositionComparator.java | 2 +- .../process/AbstractFillOperator.java | 2 +- .../process/AbstractLinearFillOperator.java | 2 +- .../process/AggregationMergeSortOperator.java | 2 +- .../process/AssignUniqueIdOperator.java | 2 +- .../operator/process/CollectOperator.java | 2 +- .../process/EnforceSingleRowOperator.java | 4 +- .../process/FilterAndProjectOperator.java | 2 +- .../operator/process/LimitOperator.java | 2 +- .../operator/process/MergeSortOperator.java | 2 +- .../operator/process/OffsetOperator.java | 2 +- .../process/PatternRecognitionOperator.java | 6 +- .../PreviousFillWithGroupOperator.java | 2 +- .../operator/process/SortOperator.java | 2 +- .../process/TableStreamSortOperator.java | 2 +- .../operator/process/TopKOperator.java | 2 +- .../operator/process/ValuesOperator.java | 2 +- .../process/function/PartitionRecognizer.java | 2 +- .../function/TableFunctionOperator.java | 2 +- .../gapfill/AbstractGapFillOperator.java | 2 +- .../SimpleNestedLoopCrossJoinOperator.java | 2 +- .../join/merge/MergeSortComparator.java | 2 +- .../rowpattern/LogicalIndexNavigation.java | 4 +- .../process/rowpattern/PatternAggregator.java | 4 +- .../rowpattern/PatternPartitionExecutor.java | 6 +- .../expression/ArithmeticOperator.java | 2 +- .../expression/CastComputation.java | 4 +- .../expression/ComparisonOperator.java | 2 +- .../rowpattern/expression/Computation.java | 34 +-- .../expression/LogicalOperator.java | 2 +- .../PatternExpressionComputation.java | 2 +- .../IrRowPatternToProgramRewriter.java | 22 +- .../process/window/RowNumberOperator.java | 10 +- .../process/window/TableWindowOperator.java | 2 +- .../process/window/TopKRankingOperator.java | 14 +- .../window/partition/frame/FrameInfo.java | 6 +- .../window/partition/frame/GroupsFrame.java | 2 +- .../window/partition/frame/RangeFrame.java | 2 +- .../window/partition/frame/RowsFrame.java | 2 +- .../AsofMergeSortInnerJoinOperator.java | 2 +- .../AsofMergeSortLeftJoinOperator.java | 2 +- .../relational/MarkDistinctOperator.java | 6 +- .../MergeSortFullOuterJoinOperator.java | 2 +- .../MergeSortInnerJoinOperator.java | 2 +- .../relational/MergeSortLeftJoinOperator.java | 2 +- .../relational/MergeSortSemiJoinOperator.java | 2 +- .../AbstractApproxPercentileAccumulator.java | 2 +- .../aggregation/AccumulatorFactory.java | 10 +- .../aggregation/AggregationOperator.java | 2 +- ...ApproxPercentileWithWeightAccumulator.java | 2 +- .../BinaryApproxMostFrequentAccumulator.java | 2 +- .../BooleanApproxMostFrequentAccumulator.java | 2 +- .../DoubleApproxMostFrequentAccumulator.java | 2 +- .../FloatApproxMostFrequentAccumulator.java | 2 +- .../IntApproxMostFrequentAccumulator.java | 2 +- .../LongApproxMostFrequentAccumulator.java | 2 +- .../aggregation/TableAggregator.java | 2 +- .../aggregation/approximate/TDigest.java | 2 +- ...yGroupedApproxMostFrequentAccumulator.java | 2 +- ...nGroupedApproxMostFrequentAccumulator.java | 2 +- ...eGroupedApproxMostFrequentAccumulator.java | 2 +- ...tGroupedApproxMostFrequentAccumulator.java | 2 +- .../grouped/GroupedAggregator.java | 2 +- ...ApproxPercentileWithWeightAccumulator.java | 2 +- .../grouped/HashAggregationOperator.java | 6 +- ...tGroupedApproxMostFrequentAccumulator.java | 2 +- ...gGroupedApproxMostFrequentAccumulator.java | 2 +- .../grouped/StreamingAggregationOperator.java | 4 +- .../StreamingHashAggregationOperator.java | 6 +- .../InMemoryHashAggregationBuilder.java | 10 +- .../relational/ColumnTransformerBuilder.java | 104 +++---- .../plan/planner/CommonOperatorUtils.java | 2 +- .../ITableOperatorGeneratorContext.java | 2 +- .../plan/planner/TableOperatorGenerator.java | 136 ++++----- .../metadata/CommonMetadataUtils.java | 2 +- .../relational/metadata/ITypeMetadata.java | 4 +- .../planner/CastToBlobLiteralVisitor.java | 20 +- .../planner/CastToBooleanLiteralVisitor.java | 20 +- .../planner/CastToDateLiteralVisitor.java | 20 +- .../planner/CastToDoubleLiteralVisitor.java | 20 +- .../planner/CastToFloatLiteralVisitor.java | 20 +- .../planner/CastToInt32LiteralVisitor.java | 20 +- .../planner/CastToInt64LiteralVisitor.java | 20 +- .../planner/CastToStringLiteralVisitor.java | 20 +- .../CastToTimestampLiteralVisitor.java | 22 +- .../ir/GlobalTimePredicateExtractVisitor.java | 44 +-- .../column/FailFunctionColumnTransformer.java | 2 +- .../column/binary/HmacColumnTransformer.java | 2 +- .../binary/factory/HmacStrategiesFactory.java | 2 +- .../ternary/utils/BytePaddingUtils.java | 2 +- .../dag/column/unary/InColumnTransformer.java | 2 +- ...AbstractCastFunctionColumnTransformer.java | 4 +- .../BytesToDoubleColumnTransformer.java | 2 +- .../scalar/BytesToFloatColumnTransformer.java | 2 +- .../scalar/BytesToIntColumnTransformer.java | 2 +- .../scalar/BytesToLongColumnTransformer.java | 2 +- .../unary/scalar/ExtractTransformer.java | 10 +- .../unary/scalar/FormatColumnTransformer.java | 4 +- .../scalar/GenericCodecColumnTransformer.java | 2 +- .../scalar/SubString2ColumnTransformer.java | 2 +- .../scalar/SubString3ColumnTransformer.java | 2 +- .../scalar/SubStringColumnTransformer.java | 2 +- .../factory/CodecStrategiesFactory.java | 2 +- .../NumericCodecStrategiesFactory.java | 2 +- .../unary/scalar/inteface/CodecStrategy.java | 2 +- .../scalar/util/TransformerDebugUtils.java | 2 +- .../transformation/dag/udf/UDTFExecutor.java | 2 +- .../transformation/dag/util/BitwiseUtils.java | 2 +- .../dag/util/CastFunctionUtils.java | 6 +- .../dag/util/CommonTransformUtils.java | 6 +- .../calc_commons/utils/ObjectTypeUtils.java | 2 +- .../statemachine/BaseStateMachine.java | 6 +- .../dataregion/DataExecutionVisitor.java | 4 +- .../dataregion/DataRegionStateMachine.java | 4 +- .../IoTConsensusDataRegionStateMachine.java | 6 +- .../schemaregion/SchemaExecutionVisitor.java | 2 +- .../SchemaRegionStateMachine.java | 4 +- ...adAnalyzeTableColumnDisorderException.java | 2 +- .../db/exception/query/OutOfTTLException.java | 2 +- .../sql/ColumnCreationFailException.java | 3 +- .../agent/task/PipeDataNodeTaskAgent.java | 2 +- .../task/subtask/sink/PipeSinkSubtask.java | 2 +- .../deletion/PipeDeleteDataNodeEvent.java | 2 +- .../common/heartbeat/PipeHeartbeatEvent.java | 2 +- .../schema/PipeSchemaRegionSnapshotEvent.java | 2 +- .../PipeSchemaRegionWritePlanEvent.java | 4 +- .../processor/TumblingWindowingProcessor.java | 4 +- .../TumblingTimeSamplingProcessor.java | 2 +- .../legacy/IoTDBLegacyPipeReceiverAgent.java | 2 +- .../legacy/loader/DeletionLoader.java | 2 +- .../protocol/legacy/loader/TsFileLoader.java | 2 +- .../thrift/IoTDBDataNodeReceiver.java | 13 +- .../transform/converter/ValueConverter.java | 2 +- .../visitor/PipePlanToStatementVisitor.java | 6 +- .../PipeStatementExceptionVisitor.java | 2 +- ...PipeStatementTablePatternParseVisitor.java | 2 +- .../request/PipeTransferPlanNodeReq.java | 4 +- .../request/PipeTransferTabletBinaryReq.java | 2 +- .../request/IoTConsensusV2DeleteNodeReq.java | 2 +- .../IoTConsensusV2TabletBinaryReq.java | 2 +- .../IoTConsensusV2TabletInsertNodeReq.java | 2 +- .../protocol/opcua/server/OpcUaNameSpace.java | 4 +- .../protocol/writeback/WriteBackSink.java | 2 +- .../PipeTableModelTsFileBuilderV2.java | 2 +- .../builder/PipeTreeModelTsFileBuilderV2.java | 2 +- .../dataregion/IoTDBDataRegionSource.java | 2 +- ...icalDataRegionTsFileAndDeletionSource.java | 2 +- .../PipeRealtimeDataRegionSource.java | 2 +- .../schemaregion/IoTDBSchemaRegionSource.java | 10 +- .../PipePlanTablePatternParseVisitor.java | 2 +- .../PipePlanTablePrivilegeParseVisitor.java | 2 +- .../PipePlanTreePatternParseVisitor.java | 2 +- .../PipePlanTreePrivilegeParseVisitor.java | 2 +- .../PipeTableStatementToPlanVisitor.java | 6 +- .../PipeTreeStatementToPlanVisitor.java | 4 +- .../SchemaRegionListeningFilter.java | 4 +- .../SchemaRegionListeningQueue.java | 2 +- .../client/DataNodeInternalClient.java | 2 +- .../DataNodeTableFunctionAINodeService.java | 2 +- ...odeTableFunctionAINodeServiceProvider.java | 4 +- .../db/protocol/session/IClientSession.java | 4 +- .../session/PreparedStatementInfo.java | 2 +- .../db/protocol/session/SessionManager.java | 6 +- .../thrift/impl/ClientRPCServiceImpl.java | 46 +-- .../impl/DataNodeInternalRPCServiceImpl.java | 10 +- .../thrift/impl/NativeStatementRequest.java | 2 +- .../queryengine/common/MPPQueryContext.java | 12 +- .../iotdb/db/queryengine/common/QueryId.java | 2 +- .../queryengine/common/ResultNodeContext.java | 2 +- .../common/header/DatasetHeader.java | 4 +- .../common/schematree/ClusterSchemaTree.java | 2 +- .../execution/aggregation/TreeAggregator.java | 2 +- .../aggregation/UDAFAccumulator.java | 2 +- .../EmptyQueueSlidingWindowAggregator.java | 2 +- ...MonotonicQueueSlidingWindowAggregator.java | 2 +- .../NormalQueueSlidingWindowAggregator.java | 2 +- .../SlidingWindowAggregator.java | 2 +- .../SlidingWindowAggregatorFactory.java | 4 +- .../SmoothQueueSlidingWindowAggregator.java | 2 +- .../timerangeiterator/AggrWindowIterator.java | 4 +- .../TimeRangeIteratorFactory.java | 2 +- .../execution/driver/DriverContext.java | 2 +- .../executor/RegionWriteExecutor.java | 2 +- .../fragment/FragmentInstanceContext.java | 4 +- .../fragment/FragmentInstanceManager.java | 2 +- .../INodeCommonFragmentInstanceContext.java | 27 ++ .../execution/operator/AggregationUtil.java | 2 +- .../execution/operator/EmptyDataOperator.java | 2 +- .../operator/ExplainAnalyzeOperator.java | 6 +- .../execution/operator/OperatorContext.java | 6 +- .../process/AbstractTreeIntoOperator.java | 2 +- .../ActiveRegionScanMergeOperator.java | 2 +- .../operator/process/AggregationOperator.java | 2 +- .../process/ColumnInjectOperator.java | 2 +- .../process/DeviceViewIntoOperator.java | 4 +- .../operator/process/DeviceViewOperator.java | 2 +- .../InsertTabletStatementGenerator.java | 2 +- .../operator/process/ProjectOperator.java | 2 +- .../process/RawDataAggregationOperator.java | 2 +- .../process/SingleDeviceViewOperator.java | 2 +- .../SlidingWindowAggregationOperator.java | 2 +- .../TableInsertTabletStatementGenerator.java | 2 +- .../operator/process/TableIntoOperator.java | 6 +- .../process/TagAggregationOperator.java | 2 +- .../operator/process/TransformOperator.java | 8 +- .../TreeInsertTabletStatementGenerator.java | 2 +- .../operator/process/TreeIntoOperator.java | 4 +- .../process/ai/InferenceOperator.java | 4 +- .../process/copyto/CopyToOptions.java | 4 +- .../process/copyto/TableCopyToOperator.java | 2 +- .../copyto/tsfile/CopyToTsFileOptions.java | 8 +- .../join/FullOuterTimeJoinOperator.java | 2 +- .../join/HorizontallyConcatOperator.java | 2 +- .../process/join/InnerTimeJoinOperator.java | 4 +- .../join/LeftOuterTimeJoinOperator.java | 2 +- .../join/TableLeftOuterTimeJoinOperator.java | 2 +- .../process/join/merge/MultiColumnMerger.java | 2 +- .../merge/NonOverlappedMultiColumnMerger.java | 2 +- .../join/merge/SingleColumnMerger.java | 2 +- .../last/AlignedUpdateLastCacheOperator.java | 2 +- .../last/LastQueryCollectOperator.java | 2 +- .../process/last/LastQueryMergeOperator.java | 2 +- .../process/last/LastQueryOperator.java | 2 +- .../process/last/LastQuerySortOperator.java | 2 +- .../last/LastQueryTransformOperator.java | 2 +- .../operator/process/last/LastQueryUtil.java | 2 +- .../process/last/UpdateLastCacheOperator.java | 2 +- .../CountGroupByLevelMergeOperator.java | 2 +- .../schema/CountGroupByLevelScanOperator.java | 4 +- .../operator/schema/CountMergeOperator.java | 2 +- .../schema/NodeManageMemoryMergeOperator.java | 2 +- .../schema/NodePathsConvertOperator.java | 2 +- .../schema/NodePathsCountOperator.java | 2 +- .../operator/schema/SchemaCountOperator.java | 4 +- .../schema/SchemaFetchMergeOperator.java | 2 +- .../schema/SchemaFetchScanOperator.java | 4 +- .../schema/SchemaQueryMergeOperator.java | 2 +- .../SchemaQueryOrderByHeatOperator.java | 2 +- .../schema/SchemaQueryScanOperator.java | 4 +- .../operator/sink/IdentitySinkOperator.java | 2 +- .../operator/sink/ShuffleHelperOperator.java | 2 +- .../AbstractRegionScanDataSourceOperator.java | 2 +- ...AbstractSeriesAggregationScanOperator.java | 2 +- .../source/AbstractSourceOperator.java | 2 +- .../ActiveDeviceRegionScanOperator.java | 2 +- .../ActiveTimeSeriesRegionScanOperator.java | 2 +- .../AlignedSeriesAggregationScanOperator.java | 4 +- .../source/AlignedSeriesScanOperator.java | 4 +- .../operator/source/ExchangeOperator.java | 4 +- .../source/LastCacheScanOperator.java | 4 +- .../source/SeriesAggregationScanOperator.java | 4 +- .../operator/source/SeriesScanOperator.java | 4 +- .../source/ShowDiskUsageOperator.java | 4 +- .../operator/source/ShowQueriesOperator.java | 8 +- .../operator/source/SourceOperator.java | 2 +- .../AbstractAggTableScanOperator.java | 6 +- .../AbstractDefaultAggTableScanOperator.java | 2 +- .../relational/AbstractTableScanOperator.java | 8 +- .../source/relational/CteScanOperator.java | 6 +- .../DeviceIteratorScanOperator.java | 2 +- ...formationSchemaContentSupplierFactory.java | 16 +- .../InformationSchemaTableScanOperator.java | 4 +- .../LastQueryAggTableScanOperator.java | 6 +- .../MeasurementToTableViewAdaptorUtils.java | 2 +- ...gnedDeviceViewAggregationScanOperator.java | 2 +- .../TreeToTableViewAdaptorOperator.java | 4 +- .../ainode/InferenceWindowParameter.java | 2 +- .../execution/schedule/DriverScheduler.java | 2 +- .../execution/schedule/IDriverScheduler.java | 2 +- .../db/queryengine/plan/Coordinator.java | 38 +-- .../db/queryengine/plan/analyze/Analysis.java | 2 +- .../plan/analyze/AnalyzeUtils.java | 20 +- .../plan/analyze/AnalyzeVisitor.java | 2 +- .../plan/analyze/ExpressionAnalyzer.java | 6 +- .../plan/analyze/ExpressionTypeAnalyzer.java | 4 +- .../plan/analyze/GroupByLevelHelper.java | 2 +- .../plan/analyze/PredicateUtils.java | 12 +- .../plan/analyze/SelectIntoUtils.java | 2 +- .../analyze/TemplatedAggregationAnalyze.java | 4 +- .../plan/analyze/TemplatedAnalyze.java | 2 +- .../plan/analyze/TemplatedInfo.java | 2 +- .../plan/analyze/TypeProvider.java | 6 +- .../plan/analyze/load/LoadTsFileAnalyzer.java | 8 +- .../load/LoadTsFileTableSchemaCache.java | 6 +- .../TreeSchemaAutoCreatorAndVerifier.java | 2 +- .../schema/AutoCreateSchemaExecutor.java | 2 +- .../plan/analyze/schema/SchemaValidator.java | 2 +- .../plan/execution/IQueryExecution.java | 2 +- .../plan/execution/QueryExecution.java | 2 +- .../execution/config/ConfigExecution.java | 2 +- .../config/TableConfigTaskVisitor.java | 22 +- .../config/TreeConfigTaskVisitor.java | 2 +- .../executor/ClusterConfigTaskExecutor.java | 8 +- .../config/executor/IConfigTaskExecutor.java | 4 +- .../config/metadata/GetTimeSlotListTask.java | 2 +- .../config/metadata/ShowFunctionsTask.java | 10 +- .../config/metadata/ShowRegionTask.java | 2 +- .../metadata/relational/DeleteDeviceTask.java | 2 +- .../relational/ShowCreateViewTask.java | 2 +- .../execution/config/session/PrepareTask.java | 2 +- .../session/PreparedStatementHelper.java | 4 +- .../PreparedStatementMemoryManager.java | 2 +- .../config/session/SetSqlDialectTask.java | 2 +- .../config/sys/pipe/ShowPipeTask.java | 2 +- .../memory/StatementMemorySourceVisitor.java | 2 +- ...ableModelStatementMemorySourceVisitor.java | 8 +- .../plan/expression/Expression.java | 4 +- .../plan/expression/ExpressionFactory.java | 2 +- .../expression/binary/BinaryExpression.java | 6 +- .../plan/expression/leaf/ConstantOperand.java | 2 +- .../plan/expression/leaf/LeafOperand.java | 2 +- .../plan/expression/leaf/NullOperand.java | 2 +- .../expression/leaf/TimeSeriesOperand.java | 4 +- .../expression/leaf/TimestampOperand.java | 2 +- .../expression/multi/FunctionExpression.java | 12 +- .../builtin/BuiltInScalarFunctionHelper.java | 2 +- .../builtin/helper/CastFunctionHelper.java | 2 +- .../builtin/helper/DiffFunctionHelper.java | 2 +- .../builtin/helper/ReplaceFunctionHelper.java | 2 +- .../builtin/helper/RoundFunctionHelper.java | 2 +- .../helper/SubStringFunctionHelper.java | 2 +- .../other/CaseWhenThenExpression.java | 6 +- .../other/GroupByTimeExpression.java | 4 +- .../expression/ternary/BetweenExpression.java | 2 +- .../expression/ternary/TernaryExpression.java | 4 +- .../plan/expression/unary/InExpression.java | 2 +- .../expression/unary/IsNullExpression.java | 2 +- .../plan/expression/unary/LikeExpression.java | 2 +- .../expression/unary/LogicNotExpression.java | 2 +- .../expression/unary/NegationExpression.java | 2 +- .../expression/unary/RegularExpression.java | 2 +- .../expression/unary/UnaryExpression.java | 4 +- .../BindTypeForTimeSeriesOperandVisitor.java | 2 +- .../visitor/ColumnTransformerVisitor.java | 4 +- .../CompleteMeasurementSchemaVisitor.java | 2 +- .../CountTimeAggregationAmountVisitor.java | 2 +- .../visitor/IntermediateLayerVisitor.java | 2 +- ...viceAndBindSchemaForExpressionVisitor.java | 2 +- ...atDeviceAndBindSchemaForHavingVisitor.java | 2 +- ...eviceAndBindSchemaForPredicateVisitor.java | 2 +- .../ConvertPredicateToFilterVisitor.java | 2 +- .../ConvertPredicateToTimeFilterVisitor.java | 2 +- .../optimization/AggregationPushDown.java | 12 +- .../optimization/ColumnInjectionPushDown.java | 8 +- .../optimization/LimitOffsetPushDown.java | 10 +- ...rderByExpressionWithLimitChangeToTopK.java | 8 +- .../plan/optimization/PlanOptimizer.java | 2 +- .../plan/optimization/PredicatePushDown.java | 8 +- .../queryengine/plan/parser/ASTVisitor.java | 36 +-- .../plan/parser/StatementGenerator.java | 2 +- .../DataNodeTableOperatorGenerator.java | 28 +- .../planner/LocalExecutionPlanContext.java | 6 +- .../plan/planner/LocalExecutionPlanner.java | 6 +- .../plan/planner/LogicalPlanBuilder.java | 8 +- .../plan/planner/LogicalPlanVisitor.java | 2 +- .../plan/planner/LogicalPlanner.java | 2 +- .../plan/planner/OperatorTreeGenerator.java | 14 +- .../plan/planner/SubPlanTypeExtractor.java | 2 +- .../plan/planner/TemplatedLogicalPlan.java | 4 +- .../planner/TemplatedLogicalPlanBuilder.java | 2 +- .../distribution/DistributionPlanner.java | 4 +- .../distribution/ExchangeNodeAdder.java | 6 +- .../distribution/NodeGroupContext.java | 6 +- .../SimpleFragmentParallelPlanner.java | 4 +- .../planner/distribution/SourceRewriter.java | 12 +- .../WriteFragmentParallelPlanner.java | 2 +- .../PipelineMemoryEstimatorFactory.java | 2 +- .../plan/AbstractFragmentParallelPlanner.java | 4 +- .../plan/planner/plan/FragmentInstance.java | 4 +- .../plan/planner/plan/LogicalQueryPlan.java | 2 +- .../plan/planner/plan/PlanFragment.java | 8 +- .../planner/plan/TableModelTimePredicate.java | 2 +- .../plan/planner/plan/TimePredicate.java | 2 +- .../planner/plan/node/BaseSourceRewriter.java | 2 +- .../node/DataNodePlanNodeDeserializer.java | 4 +- .../DataNodePlanNodeDeserializerProvider.java | 4 +- .../planner/plan/node/ExplainAnalyzeNode.java | 8 +- .../planner/plan/node/PlanGraphPrinter.java | 74 ++--- .../plan/planner/plan/node/PlanNodeUtil.java | 2 +- .../plan/planner/plan/node/PlanVisitor.java | 2 +- .../planner/plan/node/SimplePlanVisitor.java | 2 +- .../plan/planner/plan/node/WritePlanNode.java | 6 +- .../plan/node/load/LoadSingleTsFileNode.java | 4 +- .../plan/node/load/LoadTsFileNode.java | 4 +- .../plan/node/load/LoadTsFilePieceNode.java | 6 +- .../read/AbstractSchemaMergeNode.java | 6 +- .../metadata/read/CountSchemaMergeNode.java | 8 +- .../read/DeviceSchemaFetchScanNode.java | 8 +- .../node/metadata/read/DevicesCountNode.java | 6 +- .../metadata/read/DevicesSchemaScanNode.java | 6 +- .../read/LevelTimeSeriesCountNode.java | 6 +- .../read/LogicalViewSchemaScanNode.java | 6 +- .../read/NodeManagementMemoryMergeNode.java | 10 +- .../metadata/read/NodePathsConvertNode.java | 10 +- .../metadata/read/NodePathsCountNode.java | 10 +- .../read/NodePathsSchemaScanNode.java | 6 +- .../read/PathsUsingTemplateScanNode.java | 6 +- .../metadata/read/SchemaFetchMergeNode.java | 8 +- .../metadata/read/SchemaFetchScanNode.java | 6 +- .../metadata/read/SchemaQueryMergeNode.java | 8 +- .../read/SchemaQueryOrderByHeatNode.java | 10 +- .../metadata/read/SchemaQueryScanNode.java | 8 +- .../read/SeriesSchemaFetchScanNode.java | 8 +- .../metadata/read/TableDeviceSourceNode.java | 8 +- .../metadata/read/TimeSeriesCountNode.java | 6 +- .../read/TimeSeriesSchemaScanNode.java | 6 +- .../metadata/write/ActivateTemplateNode.java | 8 +- .../write/AlterEncodingCompressorNode.java | 8 +- .../metadata/write/AlterTimeSeriesNode.java | 8 +- .../write/BatchActivateTemplateNode.java | 8 +- .../write/ConstructSchemaBlackListNode.java | 8 +- .../write/CreateAlignedTimeSeriesNode.java | 8 +- .../write/CreateMultiTimeSeriesNode.java | 8 +- .../metadata/write/CreateTimeSeriesNode.java | 8 +- .../write/DeactivateTemplateNode.java | 8 +- .../metadata/write/DeleteTimeSeriesNode.java | 8 +- .../InternalBatchActivateTemplateNode.java | 8 +- .../InternalCreateMultiTimeSeriesNode.java | 8 +- .../write/InternalCreateTimeSeriesNode.java | 8 +- .../write/PreDeactivateTemplateNode.java | 8 +- .../RollbackPreDeactivateTemplateNode.java | 8 +- .../write/RollbackSchemaBlackListNode.java | 8 +- .../write/view/AlterLogicalViewNode.java | 8 +- .../ConstructLogicalViewBlackListNode.java | 8 +- .../write/view/CreateLogicalViewNode.java | 8 +- .../write/view/DeleteLogicalViewNode.java | 8 +- .../RollbackLogicalViewBlackListNode.java | 8 +- .../node/pipe/PipeEnrichedDeleteDataNode.java | 8 +- .../node/pipe/PipeEnrichedInsertNode.java | 8 +- .../pipe/PipeEnrichedNonWritePlanNode.java | 8 +- .../node/pipe/PipeEnrichedWritePlanNode.java | 8 +- .../node/pipe/PipeOperateSchemaQueueNode.java | 8 +- .../plan/node/process/AI/InferenceNode.java | 10 +- .../process/ActiveRegionScanMergeNode.java | 10 +- .../process/AggregationMergeSortNode.java | 10 +- .../plan/node/process/AggregationNode.java | 10 +- .../plan/node/process/CollectNode.java | 10 +- .../plan/node/process/ColumnInjectNode.java | 10 +- .../plan/node/process/DeviceMergeNode.java | 10 +- .../plan/node/process/DeviceViewIntoNode.java | 10 +- .../plan/node/process/DeviceViewNode.java | 10 +- .../plan/node/process/ExchangeNode.java | 12 +- .../planner/plan/node/process/FillNode.java | 10 +- .../planner/plan/node/process/FilterNode.java | 8 +- .../plan/node/process/GroupByLevelNode.java | 10 +- .../plan/node/process/GroupByTagNode.java | 10 +- .../node/process/HorizontallyConcatNode.java | 10 +- .../planner/plan/node/process/IntoNode.java | 10 +- .../planner/plan/node/process/LimitNode.java | 10 +- .../plan/node/process/MergeSortNode.java | 10 +- .../planner/plan/node/process/OffsetNode.java | 10 +- .../plan/node/process/ProjectNode.java | 10 +- .../node/process/RawDataAggregationNode.java | 10 +- .../node/process/SingleDeviceViewNode.java | 10 +- .../process/SlidingWindowAggregationNode.java | 10 +- .../planner/plan/node/process/SortNode.java | 10 +- .../planner/plan/node/process/TopKNode.java | 10 +- .../plan/node/process/TransformNode.java | 10 +- .../process/join/FullOuterTimeJoinNode.java | 10 +- .../node/process/join/InnerTimeJoinNode.java | 10 +- .../process/join/LeftOuterTimeJoinNode.java | 10 +- .../process/last/LastQueryCollectNode.java | 10 +- .../node/process/last/LastQueryMergeNode.java | 10 +- .../plan/node/process/last/LastQueryNode.java | 12 +- .../process/last/LastQueryTransformNode.java | 10 +- .../plan/node/sink/IdentitySinkNode.java | 8 +- .../plan/node/sink/MultiChildrenSinkNode.java | 4 +- .../plan/node/sink/ShuffleSinkNode.java | 8 +- .../plan/planner/plan/node/sink/SinkNode.java | 4 +- .../AlignedSeriesAggregationScanNode.java | 10 +- .../node/source/AlignedSeriesScanNode.java | 10 +- .../node/source/DeviceRegionScanNode.java | 8 +- .../plan/node/source/LastQueryScanNode.java | 10 +- .../node/source/LastSeriesSourceNode.java | 2 +- .../plan/node/source/RegionScanNode.java | 6 +- .../source/SeriesAggregationScanNode.java | 10 +- .../source/SeriesAggregationSourceNode.java | 4 +- .../plan/node/source/SeriesScanNode.java | 10 +- .../node/source/SeriesScanSourceNode.java | 6 +- .../plan/node/source/SeriesSourceNode.java | 4 +- .../plan/node/source/ShowDiskUsageNode.java | 8 +- .../plan/node/source/ShowQueriesNode.java | 8 +- .../node/source/TimeseriesRegionScanNode.java | 8 +- .../plan/node/source/VirtualSourceNode.java | 4 +- .../node/write/AbstractDeleteDataNode.java | 4 +- ...ontinuousSameSearchIndexSeparatorNode.java | 6 +- .../plan/node/write/DeleteDataNode.java | 8 +- .../node/write/InsertMultiTabletsNode.java | 8 +- .../planner/plan/node/write/InsertNode.java | 4 +- .../plan/node/write/InsertRowNode.java | 8 +- .../plan/node/write/InsertRowsNode.java | 8 +- .../node/write/InsertRowsOfOneDeviceNode.java | 8 +- .../plan/node/write/InsertTabletNode.java | 10 +- .../planner/plan/node/write/ObjectNode.java | 8 +- .../node/write/RelationalDeleteDataNode.java | 8 +- .../node/write/RelationalInsertRowNode.java | 6 +- .../node/write/RelationalInsertRowsNode.java | 6 +- .../write/RelationalInsertTabletNode.java | 6 +- .../planner/plan/node/write/SearchNode.java | 2 +- .../DeviceViewIntoPathDescriptor.java | 2 +- .../plan/parameter/FillDescriptor.java | 2 +- .../plan/parameter/GroupByParameter.java | 2 +- .../plan/parameter/GroupByTimeParameter.java | 2 +- .../plan/parameter/IntoPathDescriptor.java | 2 +- .../planner/plan/parameter/OutputColumn.java | 2 +- .../analyzer/AggregationAnalyzer.java | 70 ++--- .../plan/relational/analyzer/Analysis.java | 72 ++--- .../plan/relational/analyzer/Analyzer.java | 12 +- .../analyzer/CanonicalizationAware.java | 4 +- .../analyzer/ExpressionAnalysis.java | 14 +- .../analyzer/ExpressionAnalyzer.java | 150 +++++----- .../analyzer/ExpressionTreeUtils.java | 14 +- .../plan/relational/analyzer/Field.java | 2 +- .../analyzer/PatternRecognitionAnalysis.java | 10 +- .../analyzer/PatternRecognitionAnalyzer.java | 32 +-- .../plan/relational/analyzer/RelationId.java | 4 +- .../relational/analyzer/RelationType.java | 2 +- .../plan/relational/analyzer/Scope.java | 14 +- .../analyzer/ScopeReferenceExtractor.java | 6 +- .../analyzer/StatementAnalyzer.java | 202 ++++++------- .../analyzer/StatementAnalyzerFactory.java | 4 +- .../ConvertPredicateToFilterVisitor.java | 56 ++-- .../ConvertPredicateToTimeFilterVisitor.java | 34 +-- .../PredicateCombineIntoTableScanChecker.java | 34 +-- .../PredicatePushIntoMetadataChecker.java | 68 ++--- .../PredicatePushIntoScanChecker.java | 30 +- .../analyzer/predicate/PredicateVisitor.java | 26 +- .../schema/CheckSchemaPredicateVisitor.java | 18 +- ...ConvertSchemaPredicateToFilterVisitor.java | 34 +-- .../ExtractPredicateColumnNameVisitor.java | 30 +- .../tablefunction/TableArgumentAnalysis.java | 8 +- .../plan/relational/metadata/Metadata.java | 16 +- .../relational/metadata/MetadataUtil.java | 8 +- .../metadata/OperatorNotFoundException.java | 4 +- .../relational/metadata/TableMetadata.java | 4 +- .../metadata/TableMetadataImpl.java | 32 +-- .../metadata/TreeDeviceViewSchema.java | 4 +- .../metadata/fetcher/SchemaPredicateUtil.java | 8 +- .../fetcher/TableDeviceSchemaFetcher.java | 2 +- .../fetcher/TableDeviceSchemaValidator.java | 2 +- .../fetcher/TableHeaderSchemaValidator.java | 10 +- .../relational/planner/CteMaterializer.java | 16 +- .../relational/planner/EqualityInference.java | 8 +- .../planner/ExpressionExtractor.java | 14 +- .../planner/ExpressionSymbolInliner.java | 6 +- .../planner/IrExpressionInterpreter.java | 64 ++--- .../relational/planner/IrTypeAnalyzer.java | 80 +++--- .../relational/planner/LiteralEncoder.java | 22 +- .../planner/LiteralInterpreter.java | 24 +- .../planner/NoOpSymbolResolver.java | 2 +- .../relational/planner/NodeAndMappings.java | 4 +- .../planner/OrderingTranslator.java | 4 +- .../plan/relational/planner/PlanBuilder.java | 12 +- .../relational/planner/PlanNodeSearcher.java | 2 +- .../relational/planner/PlannerContext.java | 2 +- .../relational/planner/PredicateUtils.java | 22 +- .../plan/relational/planner/QueryPlanner.java | 104 +++---- .../plan/relational/planner/RelationPlan.java | 4 +- .../relational/planner/RelationPlanner.java | 152 +++++----- .../plan/relational/planner/ScopeAware.java | 6 +- .../planner/SimplePlanRewriter.java | 2 +- .../relational/planner/SubqueryPlanner.java | 48 ++-- .../relational/planner/SymbolAllocator.java | 10 +- .../relational/planner/SymbolResolver.java | 2 +- .../relational/planner/SymbolsExtractor.java | 22 +- .../planner/TableLogicalPlanner.java | 36 +-- .../relational/planner/TableModelPlanner.java | 10 +- .../relational/planner/TranslationMap.java | 30 +- .../planner/distribute/AddExchangeNodes.java | 6 +- .../planner/distribute/SubPlanGenerator.java | 4 +- .../TableDistributedPlanGenerator.java | 94 +++---- .../distribute/TableDistributedPlanner.java | 8 +- .../TableModelQueryFragmentPlanner.java | 6 +- .../TableModelTypeProviderExtractor.java | 36 +-- .../planner/ir/DefaultTraversalVisitor.java | 32 +-- .../planner/ir/DeterminismEvaluator.java | 4 +- .../planner/ir/ExpressionNodeInliner.java | 2 +- .../planner/ir/ExpressionRewriter.java | 70 ++--- .../planner/ir/ExpressionTreeRewriter.java | 78 ++--- ...actCommonPredicatesExpressionRewriter.java | 6 +- .../GapFillStartAndEndTimeExtractVisitor.java | 30 +- .../plan/relational/planner/ir/IrUtils.java | 24 +- .../ir/NormalizeOrExpressionRewriter.java | 14 +- ...correlatedScalarSubqueryReconstructor.java | 36 +-- .../planner/ir/ReplaceSymbolInExpression.java | 8 +- .../planner/ir/SubExpressionExtractor.java | 4 +- .../planner/iterative/IterativeOptimizer.java | 8 +- .../relational/planner/iterative/Lookup.java | 4 +- .../relational/planner/iterative/Memo.java | 4 +- .../relational/planner/iterative/Plans.java | 4 +- .../relational/planner/iterative/Rule.java | 4 +- .../rule/AggregationDecorrelation.java | 6 +- .../rule/CanonicalizeExpressionRewriter.java | 28 +- .../EliminateLimitProjectWithTableScan.java | 4 +- .../rule/EliminateLimitWithTableScan.java | 2 +- .../rule/EvaluateEmptyIntersect.java | 8 +- .../rule/ExpressionRewriteRuleSet.java | 18 +- .../iterative/rule/GatherAndMergeWindows.java | 14 +- .../iterative/rule/ImplementExceptAll.java | 22 +- .../rule/ImplementExceptDistinctAsUnion.java | 16 +- .../iterative/rule/ImplementIntersectAll.java | 16 +- .../ImplementIntersectDistinctAsUnion.java | 16 +- .../rule/ImplementPatternRecognition.java | 12 +- .../rule/ImplementTableFunctionSource.java | 16 +- .../iterative/rule/InlineProjections.java | 14 +- .../planner/iterative/rule/MergeExcept.java | 4 +- .../planner/iterative/rule/MergeFilters.java | 2 +- .../iterative/rule/MergeIntersect.java | 4 +- .../MergeLimitOverProjectWithMergeSort.java | 10 +- .../rule/MergeLimitOverProjectWithSort.java | 10 +- .../rule/MergeLimitWithMergeSort.java | 8 +- .../iterative/rule/MergeLimitWithSort.java | 8 +- .../planner/iterative/rule/MergeLimits.java | 2 +- .../planner/iterative/rule/MergeUnion.java | 4 +- ...ipleDistinctAggregationToMarkDistinct.java | 8 +- .../iterative/rule/OptimizeRowPattern.java | 8 +- .../rule/ProjectOffPushDownRule.java | 6 +- .../rule/PruneAggregationColumns.java | 6 +- .../rule/PruneAggregationSourceColumns.java | 4 +- .../iterative/rule/PruneApplyColumns.java | 6 +- .../iterative/rule/PruneApplyCorrelation.java | 4 +- .../rule/PruneApplySourceColumns.java | 6 +- .../rule/PruneAssignUniqueIdColumns.java | 6 +- .../rule/PruneCorrelatedJoinColumns.java | 10 +- .../rule/PruneCorrelatedJoinCorrelation.java | 4 +- .../rule/PruneDistinctAggregation.java | 10 +- .../rule/PruneEnforceSingleRowColumns.java | 6 +- .../rule/PruneExceptSourceColumns.java | 4 +- .../iterative/rule/PruneFillColumns.java | 6 +- .../iterative/rule/PruneFilterColumns.java | 6 +- .../iterative/rule/PruneGapFillColumns.java | 6 +- .../rule/PruneIntersectSourceColumns.java | 4 +- .../rule/PruneJoinChildrenColumns.java | 4 +- .../iterative/rule/PruneJoinColumns.java | 6 +- .../iterative/rule/PruneLimitColumns.java | 6 +- .../rule/PruneMarkDistinctColumns.java | 6 +- .../iterative/rule/PruneOffsetColumns.java | 6 +- .../rule/PruneOutputSourceColumns.java | 2 +- .../PrunePatternRecognitionSourceColumns.java | 10 +- .../iterative/rule/PruneProjectColumns.java | 6 +- .../iterative/rule/PruneSortColumns.java | 6 +- .../PruneTableFunctionProcessorColumns.java | 8 +- ...neTableFunctionProcessorSourceColumns.java | 6 +- .../iterative/rule/PruneTableScanColumns.java | 6 +- .../iterative/rule/PruneTopKColumns.java | 6 +- .../iterative/rule/PruneUnionColumns.java | 6 +- .../rule/PruneUnionSourceColumns.java | 4 +- .../iterative/rule/PruneWindowColumns.java | 6 +- .../rule/PushDownFilterIntoWindow.java | 18 +- .../rule/PushDownLimitIntoWindow.java | 10 +- .../PushDownNegationsExpressionRewriter.java | 20 +- .../rule/PushDownOffsetIntoTableScan.java | 2 +- .../rule/PushLimitThroughOffset.java | 4 +- .../rule/PushLimitThroughProject.java | 6 +- .../iterative/rule/PushLimitThroughUnion.java | 6 +- .../rule/PushProjectionThroughUnion.java | 14 +- .../iterative/rule/PushTopKThroughUnion.java | 8 +- .../rule/RemoveDuplicateConditions.java | 4 +- .../rule/RemoveEmptyExceptBranches.java | 14 +- .../rule/RemoveEmptyUnionBranches.java | 10 +- .../RemoveRedundantEnforceSingleRowNode.java | 2 +- .../iterative/rule/RemoveRedundantExists.java | 14 +- .../RemoveRedundantIdentityProjections.java | 2 +- .../iterative/rule/RemoveRedundantWindow.java | 4 +- .../iterative/rule/RemoveTrivialFilters.java | 8 +- .../RemoveUnreferencedScalarApplyNodes.java | 2 +- .../RemoveUnreferencedScalarSubqueries.java | 10 +- .../rule/ReplaceWindowWithRowNumber.java | 6 +- .../iterative/rule/SetOperationMerge.java | 12 +- .../rule/SetOperationNodeTranslator.java | 50 ++-- .../rule/SimplifyCountOverConstant.java | 22 +- .../iterative/rule/SimplifyExpressions.java | 8 +- .../SingleDistinctAggregationToGroupBy.java | 10 +- ...atedDistinctAggregationWithProjection.java | 22 +- ...dDistinctAggregationWithoutProjection.java | 18 +- ...elatedGlobalAggregationWithProjection.java | 26 +- ...tedGlobalAggregationWithoutProjection.java | 26 +- ...latedGroupedAggregationWithProjection.java | 22 +- ...edGroupedAggregationWithoutProjection.java | 18 +- .../rule/TransformCorrelatedJoinToJoin.java | 14 +- .../TransformCorrelatedScalarSubquery.java | 38 +-- .../TransformExistsApplyToCorrelatedJoin.java | 42 +-- ...TransformFilteringSemiJoinToInnerJoin.java | 24 +- ...rrelatedInPredicateSubqueryToSemiJoin.java | 6 +- .../TransformUncorrelatedSubqueryToJoin.java | 22 +- .../planner/iterative/rule/Util.java | 20 +- .../node/AggregationTableScanNode.java | 24 +- .../AggregationTreeDeviceViewScanNode.java | 16 +- ...gnedAggregationTreeDeviceViewScanNode.java | 16 +- .../planner/node/ChildReplacer.java | 2 +- .../relational/planner/node/CopyToNode.java | 10 +- .../relational/planner/node/CteScanNode.java | 14 +- .../planner/node/DeviceTableScanNode.java | 12 +- .../relational/planner/node/ExchangeNode.java | 12 +- .../planner/node/ExplainAnalyzeNode.java | 10 +- .../node/InformationSchemaTableScanNode.java | 14 +- .../relational/planner/node/IntoNode.java | 14 +- ...gnedAggregationTreeDeviceViewScanNode.java | 16 +- .../relational/planner/node/Patterns.java | 64 ++--- ...skUsageInformationSchemaTableScanNode.java | 12 +- .../planner/node/TableScanNode.java | 16 +- .../node/TreeAlignedDeviceViewScanNode.java | 12 +- .../planner/node/TreeDeviceViewScanNode.java | 10 +- .../TreeNonAlignedDeviceViewScanNode.java | 12 +- .../schema/AbstractTableDeviceQueryNode.java | 6 +- .../AbstractTableDevicesDeletionNode.java | 4 +- ...leSchemaQueryAttributeSecurityVisitor.java | 2 +- .../ConstructTableDevicesBlackListNode.java | 8 +- .../schema/CreateOrUpdateTableDeviceNode.java | 8 +- .../node/schema/DeleteTableDeviceNode.java | 8 +- .../DeleteTableDevicesInBlackListNode.java | 8 +- .../RollbackTableDevicesBlackListNode.java | 8 +- .../schema/TableAttributeColumnDropNode.java | 8 +- .../TableDeviceAttributeCommitUpdateNode.java | 8 +- .../TableDeviceAttributeUpdateNode.java | 14 +- .../node/schema/TableDeviceFetchNode.java | 8 +- .../schema/TableDeviceQueryCountNode.java | 10 +- .../node/schema/TableDeviceQueryScanNode.java | 10 +- .../node/schema/TableNodeLocationAddNode.java | 8 +- .../schema/TableSchemaQueryWriteVisitor.java | 2 +- .../optimizations/AdaptivePlanOptimizer.java | 4 +- .../CheckSubqueryNodesAreRewritten.java | 10 +- .../planner/optimizations/JoinUtils.java | 10 +- .../optimizations/ParallelizeGrouping.java | 30 +- .../optimizations/PlanNodeDecorrelator.java | 38 +-- .../planner/optimizations/PlanOptimizer.java | 4 +- .../PushAggregationIntoTableScan.java | 16 +- .../PushLimitOffsetIntoTableScan.java | 36 +-- .../PushPredicateIntoTableScan.java | 68 ++--- .../optimizations/QueryCardinalityUtil.java | 18 +- .../optimizations/SortElimination.java | 20 +- .../planner/optimizations/SymbolMapper.java | 50 ++-- .../TransformAggregationToStreamable.java | 26 +- ...tifiedComparisonApplyToCorrelatedJoin.java | 60 ++-- .../TransformSortToStreamSort.java | 18 +- .../UnaliasSymbolReferences.java | 78 ++--- .../planner/optimizations/Util.java | 22 +- .../rowpattern/RowPatternToIrRewriter.java | 58 ++-- .../relational/sql/ParameterExtractor.java | 14 +- .../sql/ast/AbstractQueryDeviceWithCache.java | 8 +- .../sql/ast/AbstractTraverseDevice.java | 16 +- .../plan/relational/sql/ast/AddColumn.java | 12 +- .../sql/ast/AlterColumnDataType.java | 16 +- .../plan/relational/sql/ast/AlterDB.java | 4 +- .../plan/relational/sql/ast/AlterPipe.java | 4 +- .../plan/relational/sql/ast/AsofJoinOn.java | 22 +- .../plan/relational/sql/ast/AstVisitor.java | 2 +- .../plan/relational/sql/ast/ClearCache.java | 8 +- .../relational/sql/ast/ColumnDefinition.java | 14 +- .../plan/relational/sql/ast/CopyTo.java | 10 +- .../plan/relational/sql/ast/CountDevice.java | 8 +- .../relational/sql/ast/CountStatement.java | 12 +- .../plan/relational/sql/ast/CreateDB.java | 4 +- .../sql/ast/CreateExternalService.java | 10 +- .../relational/sql/ast/CreateFunction.java | 10 +- .../plan/relational/sql/ast/CreateIndex.java | 14 +- .../plan/relational/sql/ast/CreateModel.java | 8 +- .../sql/ast/CreateOrUpdateDevice.java | 8 +- .../plan/relational/sql/ast/CreatePipe.java | 4 +- .../relational/sql/ast/CreatePipePlugin.java | 4 +- .../plan/relational/sql/ast/CreateTable.java | 12 +- .../plan/relational/sql/ast/CreateTopic.java | 4 +- .../relational/sql/ast/CreateTraining.java | 8 +- .../plan/relational/sql/ast/CreateView.java | 8 +- .../relational/sql/ast/DatabaseStatement.java | 8 +- .../plan/relational/sql/ast/Deallocate.java | 12 +- .../DefaultExpressionTraversalVisitor.java | 2 +- .../sql/ast/DefaultTraversalVisitor.java | 118 ++++---- .../plan/relational/sql/ast/Delete.java | 14 +- .../plan/relational/sql/ast/DeleteDevice.java | 14 +- .../relational/sql/ast/DescribeTable.java | 12 +- .../plan/relational/sql/ast/DropColumn.java | 14 +- .../plan/relational/sql/ast/DropDB.java | 12 +- .../sql/ast/DropExternalService.java | 10 +- .../plan/relational/sql/ast/DropFunction.java | 10 +- .../plan/relational/sql/ast/DropIndex.java | 14 +- .../plan/relational/sql/ast/DropModel.java | 8 +- .../plan/relational/sql/ast/DropPipe.java | 4 +- .../relational/sql/ast/DropPipePlugin.java | 4 +- .../relational/sql/ast/DropSubscription.java | 4 +- .../plan/relational/sql/ast/DropTable.java | 12 +- .../plan/relational/sql/ast/DropTopic.java | 4 +- .../plan/relational/sql/ast/Execute.java | 14 +- .../relational/sql/ast/ExecuteImmediate.java | 14 +- .../plan/relational/sql/ast/Explain.java | 10 +- .../relational/sql/ast/ExplainAnalyze.java | 10 +- .../plan/relational/sql/ast/ExtendRegion.java | 8 +- .../plan/relational/sql/ast/FetchDevice.java | 8 +- .../plan/relational/sql/ast/Flush.java | 2 +- .../plan/relational/sql/ast/Insert.java | 16 +- .../plan/relational/sql/ast/InsertRow.java | 2 +- .../plan/relational/sql/ast/InsertRows.java | 2 +- .../plan/relational/sql/ast/InsertTablet.java | 2 +- .../plan/relational/sql/ast/KillQuery.java | 10 +- .../relational/sql/ast/LoadConfiguration.java | 2 +- .../plan/relational/sql/ast/LoadModel.java | 8 +- .../plan/relational/sql/ast/LoadTsFile.java | 12 +- .../relational/sql/ast/MigrateRegion.java | 10 +- .../plan/relational/sql/ast/PipeEnriched.java | 8 +- .../relational/sql/ast/PipeStatement.java | 4 +- .../plan/relational/sql/ast/Prepare.java | 12 +- .../plan/relational/sql/ast/Property.java | 12 +- .../relational/sql/ast/ReconstructRegion.java | 8 +- .../sql/ast/RelationalAuthorStatement.java | 8 +- .../plan/relational/sql/ast/RemoveAINode.java | 8 +- .../relational/sql/ast/RemoveConfigNode.java | 8 +- .../relational/sql/ast/RemoveDataNode.java | 8 +- .../plan/relational/sql/ast/RemoveRegion.java | 8 +- .../plan/relational/sql/ast/RenameColumn.java | 16 +- .../plan/relational/sql/ast/RenameTable.java | 16 +- .../relational/sql/ast/SetColumnComment.java | 14 +- .../relational/sql/ast/SetConfiguration.java | 2 +- .../relational/sql/ast/SetProperties.java | 12 +- .../relational/sql/ast/SetSqlDialect.java | 12 +- .../relational/sql/ast/SetSystemStatus.java | 2 +- .../relational/sql/ast/SetTableComment.java | 12 +- .../relational/sql/ast/ShowAIDevices.java | 8 +- .../plan/relational/sql/ast/ShowAINodes.java | 10 +- .../relational/sql/ast/ShowAvailableUrls.java | 8 +- .../plan/relational/sql/ast/ShowCluster.java | 10 +- .../relational/sql/ast/ShowClusterId.java | 10 +- .../relational/sql/ast/ShowConfigNodes.java | 10 +- .../relational/sql/ast/ShowConfiguration.java | 2 +- .../sql/ast/ShowCurrentDatabase.java | 10 +- .../sql/ast/ShowCurrentSqlDialect.java | 10 +- .../sql/ast/ShowCurrentTimestamp.java | 10 +- .../relational/sql/ast/ShowCurrentUser.java | 10 +- .../plan/relational/sql/ast/ShowDB.java | 10 +- .../relational/sql/ast/ShowDataNodes.java | 10 +- .../plan/relational/sql/ast/ShowDevice.java | 14 +- .../sql/ast/ShowExternalService.java | 12 +- .../relational/sql/ast/ShowFunctions.java | 10 +- .../plan/relational/sql/ast/ShowIndex.java | 12 +- .../relational/sql/ast/ShowLoadedModels.java | 8 +- .../plan/relational/sql/ast/ShowModels.java | 8 +- .../relational/sql/ast/ShowPipePlugins.java | 4 +- .../plan/relational/sql/ast/ShowPipes.java | 4 +- .../sql/ast/ShowQueriesStatement.java | 12 +- .../plan/relational/sql/ast/ShowRegions.java | 8 +- .../relational/sql/ast/ShowStatement.java | 16 +- .../relational/sql/ast/ShowSubscriptions.java | 4 +- .../plan/relational/sql/ast/ShowTables.java | 12 +- .../plan/relational/sql/ast/ShowTopics.java | 4 +- .../relational/sql/ast/ShowVariables.java | 10 +- .../plan/relational/sql/ast/ShowVersion.java | 10 +- .../sql/ast/StackableAstVisitor.java | 2 +- .../sql/ast/StartExternalService.java | 10 +- .../plan/relational/sql/ast/StartPipe.java | 4 +- .../relational/sql/ast/StartRepairData.java | 2 +- .../sql/ast/StopExternalService.java | 10 +- .../plan/relational/sql/ast/StopPipe.java | 4 +- .../relational/sql/ast/StopRepairData.java | 2 +- .../sql/ast/SubscriptionStatement.java | 4 +- .../plan/relational/sql/ast/TimeRange.java | 6 +- .../plan/relational/sql/ast/UnloadModel.java | 8 +- .../plan/relational/sql/ast/Update.java | 12 +- .../relational/sql/ast/UpdateAssignment.java | 10 +- .../plan/relational/sql/ast/Use.java | 12 +- .../sql/ast/ViewFieldDefinition.java | 10 +- .../sql/ast/WrappedInsertStatement.java | 6 +- .../relational/sql/ast/WrappedStatement.java | 4 +- .../relational/sql/parser/AstBuilder.java | 266 +++++++++--------- .../relational/sql/parser/ErrorHandler.java | 2 +- .../plan/relational/sql/parser/SqlParser.java | 14 +- .../relational/sql/rewrite/ShowRewrite.java | 26 +- .../sql/rewrite/StatementRewrite.java | 10 +- .../plan/relational/sql/util/AstUtil.java | 16 +- .../sql/util/DataNodeSqlFormatter.java | 12 +- .../plan/relational/sql/util/QueryUtil.java | 56 ++-- .../plan/relational/type/TypeCoercion.java | 2 +- .../plan/relational/utils/NodeUtils.java | 4 +- .../FragmentInstanceDispatcherImpl.java | 2 +- .../load/LoadTsFileDispatcherImpl.java | 4 +- .../queryengine/plan/statement/Statement.java | 4 +- .../statement/component/FillComponent.java | 2 +- .../statement/component/IntoComponent.java | 2 +- .../statement/crud/InsertBaseStatement.java | 8 +- .../crud/InsertMultiTabletsStatement.java | 2 +- .../statement/crud/InsertRowStatement.java | 6 +- .../crud/InsertRowsOfOneDeviceStatement.java | 2 +- .../statement/crud/InsertRowsStatement.java | 4 +- .../statement/crud/InsertTabletStatement.java | 8 +- .../statement/crud/LoadTsFileStatement.java | 4 +- .../plan/statement/crud/QueryStatement.java | 2 +- .../plan/statement/literal/BinaryLiteral.java | 2 +- .../CreateContinuousQueryStatement.java | 2 +- .../view/CreateLogicalViewStatement.java | 2 +- .../statement/pipe/PipeEnrichedStatement.java | 4 +- .../sys/SetConfigurationStatement.java | 2 +- .../statement/sys/SetSqlDialectStatement.java | 2 +- .../db/queryengine/plan/udf/TreeUDFUtils.java | 2 +- .../FragmentInstanceStatisticsDrawer.java | 2 +- .../dag/builder/EvaluationDAGBuilder.java | 4 +- .../dag/udf/UDAFInformationInferrer.java | 4 +- .../dag/udf/UDTFInformationInferrer.java | 4 +- ...GeneralRegionAttributeSecurityService.java | 2 +- .../impl/SchemaRegionMemoryImpl.java | 10 +- .../visitor/SchemaRegionPlanDeserializer.java | 2 +- .../visitor/SchemaRegionPlanSerializer.java | 2 +- .../impl/TimeseriesReaderWithViewFetch.java | 2 +- .../table/DataNodeTreeViewSchemaUtils.java | 2 +- .../table/InformationSchemaUtils.java | 2 +- .../org/apache/iotdb/db/service/DataNode.java | 4 +- .../metrics/IoTDBInternalLocalReporter.java | 2 +- .../storageengine/dataregion/DataRegion.java | 4 +- .../modification/TableDeletionEntry.java | 2 +- .../modification/TreeDeletionEntry.java | 2 +- .../dataregion/wal/buffer/WALEntry.java | 4 +- .../dataregion/wal/node/WALNode.java | 4 +- .../load/active/ActiveLoadPathHelper.java | 2 +- .../load/config/LoadTsFileConfigurator.java | 2 +- ...InsertTabletStatementExceptionVisitor.java | 4 +- ...InsertTabletStatementExceptionVisitor.java | 2 +- .../LoadTsFileDataTypeConverter.java | 2 +- .../iotdb/db/tools/IoTDBDataDirViewer.java | 2 +- .../iotdb/db/tools/TsFileResourcePrinter.java | 2 +- .../trigger/executor/TriggerFireVisitor.java | 2 +- .../apache/iotdb/db/utils/CommonUtils.java | 4 +- .../iotdb/db/utils/DataNodeAuthUtils.java | 4 +- .../iotdb/db/utils/DataNodeDateTimeUtils.java | 2 +- .../iotdb/db/utils/ErrorHandlingUtils.java | 2 +- .../iotdb/db/utils/TypeInferenceUtils.java | 2 +- .../iotdb/db/utils/cte/MemoryReader.java | 2 +- ...r.plan.node.IPlanNodeDeserializerProvider} | 0 ...ction.ITableFunctionAINodeServiceProvider} | 0 .../DataRegionStateMachineTest.java | 2 +- .../SchemaRegionSimpleRecoverTest.java | 8 +- .../schemaRegion/SchemaRegionTestUtil.java | 2 +- .../pipe/consensus/DeletionRecoverTest.java | 2 +- .../pipe/consensus/DeletionResourceTest.java | 2 +- .../event/PipeTabletInsertionEventTest.java | 2 +- .../sink/PipeDataNodeThriftRequestTest.java | 2 +- .../PipePlanTablePatternParseVisitorTest.java | 4 +- .../PipePlanTreePatternParseVisitorTest.java | 2 +- .../pipe/source/PipeRealtimeExtractTest.java | 2 +- .../SchemaRegionListeningQueueTest.java | 2 +- .../iotdb/db/qp/sql/ASTVisitorTest.java | 2 +- .../common/schematree/NodeRefTest.java | 2 +- .../queryengine/execution/DataDriverTest.java | 4 +- .../executor/RegionWriteExecutorTest.java | 2 +- .../AggregationMergeSortOperatorTest.java | 2 +- .../operator/AggregationOperatorTest.java | 4 +- ...gnedSeriesAggregationScanOperatorTest.java | 4 +- .../AlignedSeriesScanOperatorTest.java | 4 +- .../operator/CteScanOperatorTest.java | 8 +- .../DeviceIteratorScanOperatorTest.java | 2 +- .../operator/DeviceViewIntoOperatorTest.java | 4 +- .../operator/DeviceViewOperatorTest.java | 2 +- .../operator/ExchangeOperatorTest.java | 2 +- .../execution/operator/FillOperatorTest.java | 2 +- .../HorizontallyConcatOperatorTest.java | 2 +- .../operator/LastQueryMergeOperatorTest.java | 2 +- .../operator/LastQueryOperatorTest.java | 2 +- .../LastQueryTreeSortOperatorTest.java | 2 +- .../execution/operator/LimitOperatorTest.java | 4 +- .../operator/MergeTreeSortOperatorTest.java | 6 +- .../operator/MultiColumnMergerTest.java | 2 +- ...nedTreeDeviceViewScanOperatorTreeTest.java | 14 +- .../NonOverlappedMultiColumnMergerTest.java | 2 +- .../operator/OffsetOperatorTest.java | 4 +- .../operator/OperatorMemoryTest.java | 2 +- .../RawDataAggregationOperatorTest.java | 4 +- .../SeriesAggregationScanOperatorTest.java | 2 +- .../operator/SeriesScanOperatorTest.java | 2 +- .../operator/SingleColumnMergerTest.java | 2 +- .../SingleDeviceViewOperatorTest.java | 4 +- .../SlidingWindowAggregationOperatorTest.java | 4 +- .../operator/SortOperatorSortBranchTest.java | 2 +- .../operator/TransformOperatorTest.java | 6 +- .../operator/TreeIntoOperatorTest.java | 4 +- .../operator/TreeLinearFillOperatorTest.java | 2 +- .../operator/TreeSortOperatorTest.java | 4 +- .../operator/TreeTopKOperatorTest.java | 4 +- .../operator/UpdateLastCacheOperatorTest.java | 2 +- .../ViewFromTreeAdaptorOperatorTest.java | 4 +- .../process/TableStreamSortOperatorTest.java | 4 +- .../operator/process/ValuesOperatorTest.java | 2 +- .../gapfill/GapFillWGroupWMoOperatorTest.java | 4 +- .../GapFillWGroupWoMoOperatorTest.java | 4 +- .../GapFillWoGroupWMoOperatorTest.java | 2 +- .../GapFillWoGroupWoMoOperatorTest.java | 2 +- .../join/InnerTimeJoinOperatorTest.java | 2 +- .../IrRowPatternOptimizationTest.java | 26 +- .../process/rowpattern/MatcherTest.java | 22 +- .../process/window/RowNumberOperatorTest.java | 2 +- .../window/TableWindowOperatorTest.java | 2 +- .../window/TopKRankingOperatorTest.java | 6 +- .../AggregationWindowFunctionTest.java | 2 +- .../partition/frame/RangeFrameTest.java | 2 +- .../CountGroupByLevelMergeOperatorTest.java | 2 +- .../schema/SchemaCountOperatorTest.java | 2 +- .../schema/SchemaQueryScanOperatorTest.java | 2 +- .../sink/IdentitySinkOperatorTest.java | 2 +- .../SinkOperatorDownStreamNodeIdTest.java | 4 +- .../relational/TableScanOperatorTest.java | 4 +- .../ConvertPredicateToTimeFilterTest.java | 2 +- .../plan/analyze/AnalyzeFailTest.java | 2 +- .../queryengine/plan/analyze/AnalyzeTest.java | 2 +- .../optimization/AggregationPushDownTest.java | 2 +- .../ColumnInjectionPushDownTest.java | 4 +- .../optimization/LimitOffsetPushDownTest.java | 6 +- .../optimization/OptimizationTestUtil.java | 2 +- .../optimization/PredicatePushDownTest.java | 2 +- .../plan/optimization/TestPlanBuilder.java | 6 +- .../plan/parser/StatementGeneratorTest.java | 6 +- .../plan/planner/ExpressionTest.java | 2 +- .../planner/FragmentInstanceSerdeTest.java | 6 +- .../plan/planner/PipelineBuilderTest.java | 4 +- .../AggregationAlignByDeviceTest.java | 2 +- .../AggregationDistributionTest.java | 4 +- .../AggregationTableScanTest.java | 4 +- .../AlignByDeviceOrderByLimitOffsetTest.java | 2 +- .../AlignByTimeOrderByLimitOffsetTest.java | 2 +- .../distribution/AlignedByDeviceTest.java | 2 +- .../DistributionPlannerBasicTest.java | 6 +- .../DistributionPlannerCycleTest.java | 2 +- .../planner/distribution/LastQueryTest.java | 4 +- .../NoDataRegionPlanningTest.java | 2 +- .../distribution/RegionScanPlanningTest.java | 2 +- .../plan/planner/distribution/Util.java | 2 +- .../plan/planner/distribution/Util2.java | 2 +- .../logical/DataQueryLogicalPlannerTest.java | 2 +- .../logical/LogicalPlannerTestUtil.java | 4 +- .../logical/RegionScanLogicalPlannerTest.java | 6 +- .../SchemaQueryLogicalPlannerTest.java | 4 +- .../planner/node/PlanGraphPrinterTest.java | 2 +- .../node/PlanNodeDeserializeHelper.java | 4 +- .../planner/node/load/LoadTsFileNodeTest.java | 2 +- .../read/DeviceSchemaFetchScanNodeTest.java | 4 +- .../read/DeviceSchemaScanNodeSerdeTest.java | 2 +- ...odeManagementMemoryMergeNodeSerdeTest.java | 2 +- .../read/PathsUsingTemplateScanNodeTest.java | 4 +- .../read/SchemaCountNodeSerdeTest.java | 2 +- .../read/SchemaFetchMergeNodeTest.java | 4 +- .../read/SeriesSchemaFetchScanNodeTest.java | 4 +- .../TimeSeriesSchemaScanNodeSerdeTest.java | 2 +- .../write/MetadataWriteNodeSerDeTest.java | 6 +- .../PipeEnrichedDeleteDataNodeSerdeTest.java | 6 +- .../pipe/PipeEnrichedInsertNodeSerdeTest.java | 4 +- ...PipeEnrichedNonWritePlanNodeSerdeTest.java | 6 +- .../PipeEnrichedWritePlanNodeSerdeTest.java | 6 +- .../process/AggregationNodeSerdeTest.java | 2 +- .../node/process/DeviceViewNodeSerdeTest.java | 2 +- .../node/process/ExchangeNodeSerdeTest.java | 2 +- .../node/process/FillNodeSerdeTest.java | 4 +- .../node/process/FilterNodeSerdeTest.java | 2 +- .../process/GroupByLevelNodeSerdeTest.java | 2 +- .../node/process/GroupByTagNodeSerdeTest.java | 2 +- .../node/process/IntoNodeSerdeTest.java | 6 +- .../node/process/LimitNodeSerdeTest.java | 2 +- .../node/process/OffsetNodeSerdeTest.java | 2 +- .../SingleDeviceViewNodeSerdeTest.java | 2 +- .../node/process/SortNodeSerdeTest.java | 2 +- .../node/process/TimeJoinNodeSerdeTest.java | 4 +- .../node/process/WindowNodeSerdeTest.java | 28 +- .../node/sink/IdentitySinkNodeSerdeTest.java | 2 +- .../sink/ShuffleSinkHandleNodeSerdeTest.java | 2 +- .../SeriesAggregationScanNodeSerdeTest.java | 2 +- .../node/source/SeriesScanNodeSerdeTest.java | 2 +- .../node/source/SourceNodeSerdeTest.java | 6 +- ...SameSearchIndexSeparatorNodeSerDeTest.java | 4 +- .../node/write/DeleteDataNodeSerdeTest.java | 6 +- .../InsertMultiTabletsNodeSerdeTest.java | 4 +- .../node/write/InsertRowNodeSerdeTest.java | 4 +- .../node/write/InsertRowsNodeSerdeTest.java | 4 +- .../InsertRowsOfOneDeviceNodeSerdeTest.java | 4 +- .../node/write/InsertTabletNodeSerdeTest.java | 4 +- .../node/write/WritePlanNodeSplitTest.java | 2 +- .../write/RelationalDeleteDataNodeTest.java | 6 +- .../analyzer/AggregationCornerCaseTest.java | 8 +- .../relational/analyzer/AggregationTest.java | 26 +- .../relational/analyzer/AnalyzerTest.java | 34 +-- .../relational/analyzer/AsofJoinTest.java | 16 +- .../plan/relational/analyzer/AuthTest.java | 8 +- .../relational/analyzer/DistinctTest.java | 2 +- .../analyzer/ExtractExpressionTest.java | 4 +- .../analyzer/InsertIntoQueryTest.java | 10 +- .../plan/relational/analyzer/JoinTest.java | 38 +-- .../analyzer/LimitOffsetPushDownTest.java | 16 +- .../PushAggregationThroughUnionTest.java | 6 +- .../analyzer/RowPatternRecognitionTest.java | 8 +- .../plan/relational/analyzer/SortTest.java | 18 +- .../relational/analyzer/SubQueryTest.java | 16 +- .../relational/analyzer/TSBSMetadata.java | 22 +- .../plan/relational/analyzer/TSBSTest.java | 34 +-- .../analyzer/TableFunctionTest.java | 18 +- .../relational/analyzer/TestMetadata.java | 36 +-- .../relational/analyzer/TestPlanBuilder.java | 22 +- .../plan/relational/analyzer/TestUtils.java | 16 +- .../relational/analyzer/TreeViewTest.java | 6 +- .../planner/CorrelatedSubqueryTest.java | 14 +- .../planner/CteMaterializerTest.java | 16 +- .../relational/planner/CteSubqueryTest.java | 8 +- .../plan/relational/planner/ExampleTest.java | 28 +- .../PatternRecognitionNodeSerdeTest.java | 44 +-- .../plan/relational/planner/PlanTester.java | 10 +- .../planner/PredicateUtilsTest.java | 6 +- .../planner/UncorrelatedSubqueryTest.java | 24 +- .../AggregationDeviceTableScanMatcher.java | 8 +- .../assertions/AggregationFunction.java | 6 +- .../AggregationFunctionMatcher.java | 8 +- .../AggregationFunctionProvider.java | 8 +- .../assertions/AggregationMatcher.java | 8 +- .../assertions/AggregationStepMatcher.java | 6 +- .../planner/assertions/AliasMatcher.java | 8 +- .../planner/assertions/AliasPresent.java | 6 +- .../assertions/AsofJoinClauseProvider.java | 6 +- .../assertions/AssignUniqueIdMatcher.java | 8 +- .../assertions/BaseStrictSymbolsMatcher.java | 6 +- .../planner/assertions/ColumnReference.java | 10 +- .../planner/assertions/CteScanMatcher.java | 6 +- .../assertions/DeviceTableScanMatcher.java | 4 +- .../assertions/EquiJoinClauseProvider.java | 2 +- .../assertions/ExchangeNodeMatcher.java | 8 +- .../planner/assertions/ExpressionMatcher.java | 10 +- .../assertions/ExpressionVerifier.java | 60 ++-- .../planner/assertions/FilterMatcher.java | 8 +- .../planner/assertions/GroupMatcher.java | 6 +- .../assertions/IdentityProjectionMatcher.java | 6 +- .../InformationSchemaTableScanMatcher.java | 4 +- .../planner/assertions/JoinMatcher.java | 10 +- .../planner/assertions/LimitMatcher.java | 8 +- .../assertions/MarkDistinctMatcher.java | 6 +- .../planner/assertions/MatchResult.java | 2 +- .../planner/assertions/Matcher.java | 4 +- .../assertions/NotPlanNodeMatcher.java | 4 +- .../planner/assertions/OffsetMatcher.java | 6 +- .../planner/assertions/OutputMatcher.java | 8 +- .../planner/assertions/PlanAssert.java | 8 +- .../planner/assertions/PlanMatchPattern.java | 80 +++--- .../assertions/PlanMatchingVisitor.java | 10 +- .../planner/assertions/PlanNodeMatcher.java | 4 +- .../planner/assertions/PlanTestSymbol.java | 2 +- .../planner/assertions/PredicateMatcher.java | 4 +- .../planner/assertions/RvalueMatcher.java | 8 +- .../planner/assertions/SemiJoinMatcher.java | 6 +- .../planner/assertions/SortMatcher.java | 6 +- .../assertions/SpecificationProvider.java | 6 +- .../StrictAssignedSymbolsMatcher.java | 8 +- .../assertions/StrictSymbolsMatcher.java | 6 +- .../planner/assertions/SymbolAlias.java | 2 +- .../planner/assertions/SymbolAliases.java | 8 +- .../TableFunctionProcessorMatcher.java | 10 +- .../planner/assertions/TableScanMatcher.java | 8 +- .../planner/assertions/TopKMatcher.java | 6 +- .../relational/planner/assertions/Util.java | 4 +- .../assertions/WindowFunctionMatcher.java | 10 +- .../informationschema/CurrentQueriesTest.java | 8 +- .../TablePredicateConversionTest.java | 14 +- .../sql/AstMemoryEstimatorTest.java | 2 +- .../sql/ast/SqlParserErrorHandlerTest.java | 2 +- .../sql/parser/AuthorStatementTest.java | 4 +- .../plan/statement/InsertStatementTest.java | 10 +- .../plan/statement/QueryStatementTest.java | 2 +- .../plan/statement/StatementTestUtils.java | 6 +- .../builder/EvaluationDAGBuilderTest.java | 4 +- .../hmac/HmacMd5ColumnTransformerTest.java | 2 +- .../hmac/HmacSha1ColumnTransformerTest.java | 2 +- .../hmac/HmacSha256ColumnTransformerTest.java | 2 +- .../hmac/HmacSha512ColumnTransformerTest.java | 2 +- .../ternary/LpadColumnTransformerTest.java | 2 +- .../ternary/RpadColumnTransformerTest.java | 2 +- .../FromBigEndian32ColumnTransformerTest.java | 2 +- .../FromBigEndian64ColumnTransformerTest.java | 2 +- ...E754_32BigEndianColumnTransformerTest.java | 2 +- ...E754_64BigEndianColumnTransformerTest.java | 2 +- ...omLittleEndian32ColumnTransformerTest.java | 2 +- ...omLittleEndian64ColumnTransformerTest.java | 2 +- .../FromBase32ColumnTransformerTest.java | 2 +- .../FromBase64ColumnTransformerTest.java | 2 +- .../FromBase64UrlColumnTransformerTest.java | 2 +- .../dag/util/BitwiseUtilsTest.java | 2 +- .../DataNodeInternalRPCServiceImplTest.java | 2 +- .../dataregion/DataRegionTest.java | 2 +- .../db/storageengine/dataregion/TTLTest.java | 2 +- ...sSpaceCompactionWithFastPerformerTest.java | 2 +- ...eCompactionWithReadPointPerformerTest.java | 2 +- ...nerSeqCompactionWithFastPerformerTest.java | 2 +- ...qCompactionWithReadChunkPerformerTest.java | 2 +- .../settle/SettleRequestHandlerTest.java | 2 +- .../memtable/MemTableTestUtils.java | 2 +- .../memtable/PrimitiveMemTableTest.java | 2 +- .../memtable/TsFileProcessorTest.java | 2 +- .../dataregion/wal/WALManagerTest.java | 2 +- .../dataregion/wal/WALTestUtils.java | 2 +- .../wal/allocation/ElasticStrategyTest.java | 2 +- .../allocation/FirstCreateStrategyTest.java | 2 +- .../allocation/RoundRobinStrategyTest.java | 2 +- .../wal/buffer/WALBufferCommonTest.java | 2 +- .../dataregion/wal/io/WALFileTest.java | 2 +- .../wal/node/ConsensusReqReaderTest.java | 6 +- .../dataregion/wal/node/WALFakeNodeTest.java | 2 +- .../dataregion/wal/node/WALNodeTest.java | 2 +- .../wal/node/WalDeleteOutdatedNewTest.java | 2 +- .../wal/recover/WALRecoverManagerTest.java | 2 +- .../wal/recover/WALRepairWriterTest.java | 2 +- .../recover/file/TsFilePlanRedoerTest.java | 2 +- .../UnsealedTsFileRecoverPerformerTest.java | 2 +- .../trigger/executor/TriggerExecuteTest.java | 2 +- .../iotdb/db/utils/DateTimeUtilsTest.java | 2 +- .../iotdb/db/utils/EnvironmentUtils.java | 2 +- .../db/utils/ErrorHandlingUtilsTest.java | 2 +- .../apache/iotdb/db/utils/MemUtilsTest.java | 2 +- .../db/utils/TimestampPrecisionUtilsTest.java | 2 +- iotdb-core/node-commons/pom.xml | 5 + .../commons/exception}/SemanticException.java | 3 +- .../node_commons/common/ConnectionInfo.java | 2 +- .../commons}/node_commons/common/NodeRef.java | 2 +- .../node_commons/common/SessionInfo.java | 4 +- .../node_commons/common/SqlDialect.java | 2 +- .../execution/MemoryEstimationHelper.java | 2 +- .../aggregation/grouped/UpdateMemory.java | 2 +- .../grouped/hash/CombineHashFunction.java | 2 +- .../grouped/hash/FlatGroupByHash.java | 8 +- .../aggregation/grouped/hash/FlatHash.java | 8 +- .../grouped/hash/FlatHashStrategy.java | 2 +- .../aggregation/grouped/hash/GroupByHash.java | 4 +- .../grouped/hash/HashStrategy.java | 8 +- .../grouped/hash/MarkDistinctHash.java | 8 +- .../grouped/hash/NoChannelGroupByHash.java | 2 +- .../grouped/hash/VariableWidthData.java | 8 +- .../aggregation/grouped/hash/XxHash64.java | 2 +- .../plan/analyze/ITableTypeProvider.java | 4 +- .../plan/expression/multi/FunctionType.java | 2 +- .../plan/node/CommonPlanNodeDeserializer.java | 74 ++--- .../plan/node/ICoreQueryPlanVisitor.java | 82 +++--- .../plan/node/IPartitionRelatedNode.java | 2 +- .../plan/node/IPlanNodeDeserializer.java | 2 +- .../node/IPlanNodeDeserializerProvider.java | 2 +- .../plan/planner/plan/node/IPlanVisitor.java | 2 +- .../plan/planner/plan/node/PlanNode.java | 6 +- .../plan/planner/plan/node/PlanNodeId.java | 2 +- .../plan/planner/plan/node/PlanNodeType.java | 2 +- .../node/process/MultiChildProcessNode.java | 6 +- .../plan/node/process/ProcessNode.java | 6 +- .../node/process/SingleChildProcessNode.java | 6 +- .../node/process/TwoChildProcessNode.java | 6 +- .../planner/plan/node/source/SourceNode.java | 8 +- .../planner/plan/parameter/InputLocation.java | 2 +- .../plan/relational/analyzer/NodeRef.java | 4 +- .../relational/function/BoundSignature.java | 4 +- .../plan/relational/function/FunctionId.java | 2 +- .../relational/function/FunctionKind.java | 2 +- .../function/ITableFunctionAINodeService.java | 2 +- .../ITableFunctionAINodeServiceProvider.java | 2 +- .../function/ITableFunctionFactory.java | 2 +- .../function/InterpretedFunctionInvoker.java | 4 +- .../function/LongVariableConstraint.java | 2 +- .../relational/function/OperatorType.java | 2 +- .../function/ResolvedFunctionCallBuilder.java | 8 +- .../plan/relational/function/Signature.java | 4 +- .../function/TableBuiltinTableFunction.java | 8 +- .../function/TableFunctionFactory.java | 6 +- .../function/TypeVariableConstraint.java | 4 +- .../function/arithmetic/AdditionResolver.java | 2 +- .../function/arithmetic/DivisionResolver.java | 2 +- .../function/arithmetic/ModulusResolver.java | 2 +- .../arithmetic/MultiplicationResolver.java | 2 +- .../arithmetic/SubtractionResolver.java | 2 +- .../function/tvf/ClassifyTableFunction.java | 10 +- .../function/tvf/ForecastTableFunction.java | 14 +- .../tvf/PatternMatchTableFunction.java | 12 +- .../function/tvf/TableFunctionUtils.java | 4 +- .../function/tvf/match/MatchConfig.java | 2 +- .../function/tvf/match/QetchAlgorithm.java | 18 +- .../function/tvf/match/model/MatchState.java | 4 +- .../tvf/match/model/PatternSegment.java | 4 +- .../function/tvf/match/model/Point.java | 2 +- .../tvf/match/model/RegexMatchState.java | 6 +- .../function/tvf/match/model/Section.java | 2 +- .../relational/metadata/ColumnMetadata.java | 2 +- .../relational/metadata/ColumnSchema.java | 4 +- .../metadata/FunctionNullability.java | 2 +- .../relational/metadata/ResolvedFunction.java | 10 +- .../plan/relational/metadata/TableSchema.java | 6 +- .../plan/relational/planner/Assignments.java | 6 +- .../DataOrganizationSpecification.java | 2 +- .../relational/planner/OrderingScheme.java | 2 +- .../plan/relational/planner/SortOrder.java | 2 +- .../plan/relational/planner/Symbol.java | 6 +- .../planner/iterative/GroupReference.java | 12 +- .../planner/node/AggregationNode.java | 28 +- .../relational/planner/node/ApplyNode.java | 18 +- .../planner/node/AssignUniqueId.java | 18 +- .../relational/planner/node/CollectNode.java | 18 +- .../planner/node/CorrelatedJoinNode.java | 22 +- .../planner/node/EnforceSingleRowNode.java | 16 +- .../relational/planner/node/ExceptNode.java | 12 +- .../relational/planner/node/FillNode.java | 16 +- .../relational/planner/node/FilterNode.java | 20 +- .../relational/planner/node/GapFillNode.java | 18 +- .../relational/planner/node/GroupNode.java | 14 +- .../planner/node/IntersectNode.java | 12 +- .../relational/planner/node/JoinNode.java | 28 +- .../relational/planner/node/LimitNode.java | 20 +- .../planner/node/LinearFillNode.java | 16 +- .../planner/node/MarkDistinctNode.java | 18 +- .../plan/relational/planner/node/Measure.java | 6 +- .../planner/node/MergeSortNode.java | 20 +- .../relational/planner/node/OffsetNode.java | 18 +- .../relational/planner/node/OutputNode.java | 18 +- .../planner/node/PatternRecognitionNode.java | 28 +- .../planner/node/PreviousFillNode.java | 16 +- .../relational/planner/node/ProjectNode.java | 22 +- .../planner/node/RowNumberNode.java | 18 +- .../relational/planner/node/RowsPerMatch.java | 2 +- .../relational/planner/node/SemiJoinNode.java | 18 +- .../planner/node/SetOperationNode.java | 12 +- .../planner/node/SkipToPosition.java | 2 +- .../relational/planner/node/SortNode.java | 20 +- .../planner/node/StreamSortNode.java | 16 +- .../planner/node/TableFunctionNode.java | 22 +- .../node/TableFunctionProcessorNode.java | 22 +- .../relational/planner/node/TopKNode.java | 20 +- .../planner/node/TopKRankingNode.java | 20 +- .../relational/planner/node/UnionNode.java | 14 +- .../planner/node/ValueFillNode.java | 18 +- .../relational/planner/node/ValuesNode.java | 20 +- .../relational/planner/node/WindowNode.java | 36 +-- .../rowpattern/AggregationLabelSet.java | 2 +- .../rowpattern/AggregationValuePointer.java | 8 +- .../rowpattern/ClassifierValuePointer.java | 2 +- .../ExpressionAndValuePointers.java | 8 +- .../planner/rowpattern/IrAlternation.java | 2 +- .../planner/rowpattern/IrAnchor.java | 4 +- .../planner/rowpattern/IrConcatenation.java | 2 +- .../planner/rowpattern/IrEmpty.java | 2 +- .../planner/rowpattern/IrExclusion.java | 2 +- .../planner/rowpattern/IrLabel.java | 2 +- .../IrPatternAlternationOptimizer.java | 4 +- .../planner/rowpattern/IrPermutation.java | 2 +- .../planner/rowpattern/IrQuantified.java | 2 +- .../planner/rowpattern/IrQuantifier.java | 2 +- .../planner/rowpattern/IrRowPattern.java | 4 +- .../rowpattern/IrRowPatternFlattener.java | 2 +- .../rowpattern/IrRowPatternVisitor.java | 2 +- .../rowpattern/LogicalIndexPointer.java | 2 +- .../rowpattern/MatchNumberValuePointer.java | 2 +- .../planner/rowpattern/Patterns.java | 12 +- .../rowpattern/ScalarValuePointer.java | 4 +- .../planner/rowpattern/ValuePointer.java | 2 +- .../plan/relational/security/Identity.java | 2 +- .../relational/sql/ast/AliasedRelation.java | 2 +- .../plan/relational/sql/ast/AllColumns.java | 2 +- .../plan/relational/sql/ast/AllRows.java | 2 +- .../relational/sql/ast/AnchorPattern.java | 2 +- .../sql/ast/ArithmeticBinaryExpression.java | 2 +- .../sql/ast/ArithmeticUnaryExpression.java | 2 +- .../sql/ast/AstMemoryEstimationHelper.java | 2 +- .../relational/sql/ast/BetweenPredicate.java | 2 +- .../relational/sql/ast/BinaryLiteral.java | 4 +- .../relational/sql/ast/BooleanLiteral.java | 2 +- .../plan/relational/sql/ast/Cast.java | 2 +- .../sql/ast/CoalesceExpression.java | 2 +- .../plan/relational/sql/ast/Columns.java | 2 +- .../sql/ast/CommonQueryAstVisitor.java | 4 +- .../sql/ast/ComparisonExpression.java | 2 +- .../relational/sql/ast/CurrentDatabase.java | 2 +- .../plan/relational/sql/ast/CurrentTime.java | 2 +- .../plan/relational/sql/ast/CurrentUser.java | 2 +- .../plan/relational/sql/ast/DataType.java | 2 +- .../relational/sql/ast/DataTypeParameter.java | 2 +- .../relational/sql/ast/DecimalLiteral.java | 2 +- .../sql/ast/DereferenceExpression.java | 2 +- .../relational/sql/ast/DoubleLiteral.java | 2 +- .../plan/relational/sql/ast/EmptyPattern.java | 2 +- .../plan/relational/sql/ast/Except.java | 2 +- .../relational/sql/ast/ExcludedPattern.java | 2 +- .../relational/sql/ast/ExistsPredicate.java | 2 +- .../plan/relational/sql/ast/Expression.java | 4 +- .../plan/relational/sql/ast/Extract.java | 2 +- .../relational/sql/ast/FieldReference.java | 2 +- .../plan/relational/sql/ast/Fill.java | 4 +- .../plan/relational/sql/ast/FloatLiteral.java | 4 +- .../plan/relational/sql/ast/FrameBound.java | 2 +- .../plan/relational/sql/ast/FunctionCall.java | 2 +- .../relational/sql/ast/GenericDataType.java | 2 +- .../relational/sql/ast/GenericLiteral.java | 4 +- .../plan/relational/sql/ast/GroupBy.java | 2 +- .../relational/sql/ast/GroupingElement.java | 2 +- .../plan/relational/sql/ast/GroupingSets.java | 2 +- .../plan/relational/sql/ast/IAstVisitor.java | 2 +- .../plan/relational/sql/ast/Identifier.java | 2 +- .../plan/relational/sql/ast/IfExpression.java | 2 +- .../relational/sql/ast/InListExpression.java | 2 +- .../plan/relational/sql/ast/InPredicate.java | 2 +- .../plan/relational/sql/ast/Intersect.java | 2 +- .../sql/ast/IsNotNullPredicate.java | 2 +- .../relational/sql/ast/IsNullPredicate.java | 2 +- .../plan/relational/sql/ast/Join.java | 2 +- .../plan/relational/sql/ast/JoinCriteria.java | 2 +- .../plan/relational/sql/ast/JoinOn.java | 2 +- .../plan/relational/sql/ast/JoinUsing.java | 2 +- .../relational/sql/ast/LikePredicate.java | 2 +- .../plan/relational/sql/ast/Limit.java | 2 +- .../plan/relational/sql/ast/Literal.java | 2 +- .../relational/sql/ast/LogicalExpression.java | 2 +- .../plan/relational/sql/ast/LongLiteral.java | 4 +- .../relational/sql/ast/MeasureDefinition.java | 2 +- .../plan/relational/sql/ast/NaturalJoin.java | 2 +- .../plan/relational/sql/ast/Node.java | 2 +- .../plan/relational/sql/ast/NodeLocation.java | 2 +- .../relational/sql/ast/NotExpression.java | 2 +- .../relational/sql/ast/NullIfExpression.java | 2 +- .../plan/relational/sql/ast/NullLiteral.java | 2 +- .../relational/sql/ast/NumericParameter.java | 2 +- .../plan/relational/sql/ast/Offset.java | 2 +- .../sql/ast/OneOrMoreQuantifier.java | 2 +- .../plan/relational/sql/ast/OrderBy.java | 2 +- .../plan/relational/sql/ast/Parameter.java | 2 +- .../sql/ast/PatternAlternation.java | 2 +- .../sql/ast/PatternConcatenation.java | 2 +- .../sql/ast/PatternPermutation.java | 2 +- .../relational/sql/ast/PatternQuantifier.java | 2 +- .../sql/ast/PatternRecognitionRelation.java | 2 +- .../relational/sql/ast/PatternVariable.java | 2 +- .../relational/sql/ast/ProcessingMode.java | 2 +- .../relational/sql/ast/QualifiedName.java | 2 +- .../ast/QuantifiedComparisonExpression.java | 2 +- .../relational/sql/ast/QuantifiedPattern.java | 2 +- .../plan/relational/sql/ast/Query.java | 4 +- .../plan/relational/sql/ast/QueryBody.java | 2 +- .../sql/ast/QuerySpecification.java | 2 +- .../relational/sql/ast/RangeQuantifier.java | 2 +- .../plan/relational/sql/ast/Relation.java | 2 +- .../plan/relational/sql/ast/Row.java | 2 +- .../plan/relational/sql/ast/RowPattern.java | 2 +- .../sql/ast/SearchedCaseExpression.java | 2 +- .../plan/relational/sql/ast/Select.java | 2 +- .../plan/relational/sql/ast/SelectItem.java | 2 +- .../plan/relational/sql/ast/SetOperation.java | 2 +- .../sql/ast/SimpleCaseExpression.java | 2 +- .../relational/sql/ast/SimpleGroupBy.java | 2 +- .../plan/relational/sql/ast/SingleColumn.java | 2 +- .../plan/relational/sql/ast/SkipTo.java | 10 +- .../plan/relational/sql/ast/SortItem.java | 2 +- .../plan/relational/sql/ast/Statement.java | 2 +- .../relational/sql/ast/StringLiteral.java | 2 +- .../sql/ast/SubqueryExpression.java | 2 +- .../relational/sql/ast/SubsetDefinition.java | 2 +- .../relational/sql/ast/SymbolReference.java | 2 +- .../plan/relational/sql/ast/Table.java | 2 +- .../sql/ast/TableExpressionType.java | 2 +- .../sql/ast/TableFunctionArgument.java | 2 +- .../sql/ast/TableFunctionInvocation.java | 2 +- .../sql/ast/TableFunctionTableArgument.java | 4 +- .../relational/sql/ast/TableSubquery.java | 2 +- .../plan/relational/sql/ast/Trim.java | 2 +- .../relational/sql/ast/TypeParameter.java | 2 +- .../plan/relational/sql/ast/Union.java | 2 +- .../plan/relational/sql/ast/Values.java | 2 +- .../sql/ast/VariableDefinition.java | 2 +- .../plan/relational/sql/ast/WhenClause.java | 2 +- .../plan/relational/sql/ast/Window.java | 2 +- .../relational/sql/ast/WindowDefinition.java | 2 +- .../plan/relational/sql/ast/WindowFrame.java | 2 +- .../relational/sql/ast/WindowReference.java | 2 +- .../sql/ast/WindowSpecification.java | 2 +- .../plan/relational/sql/ast/With.java | 2 +- .../plan/relational/sql/ast/WithQuery.java | 2 +- .../sql/ast/ZeroOrMoreQuantifier.java | 2 +- .../sql/ast/ZeroOrOneQuantifier.java | 2 +- .../sql/parser/CaseInsensitiveStream.java | 2 +- .../sql/parser/ParsingException.java | 4 +- .../sql/util/CommonQuerySqlFormatter.java | 87 +++--- .../sql/util/ExpressionFormatter.java | 134 ++++----- .../sql/util/ReservedIdentifiers.java | 6 +- .../sql/util/RowPatternFormatter.java | 34 +-- .../relational/type/InternalTypeManager.java | 2 +- .../relational/type/NamedTypeSignature.java | 2 +- .../plan/relational/type/ParameterKind.java | 2 +- .../plan/relational/type/RowFieldName.java | 2 +- .../plan/relational/type/StandardTypes.java | 2 +- .../plan/relational/type/TypeId.java | 2 +- .../plan/relational/type/TypeManager.java | 4 +- .../type/TypeNotFoundException.java | 2 +- .../plan/relational/type/TypeSignature.java | 6 +- .../type/TypeSignatureParameter.java | 2 +- .../type/TypeSignatureTranslator.java | 22 +- .../utils/ResultColumnAppender.java | 2 +- .../plan/relational/utils/TypeUtil.java | 12 +- .../plan/statement/component/FillPolicy.java | 2 +- .../plan/udf/BuiltinAggregationFunction.java | 2 +- .../plan/udf/BuiltinScalarFunction.java | 2 +- .../BuiltinTimeSeriesGeneratingFunction.java | 2 +- .../node_commons/plan/udf/TableUDFUtils.java | 6 +- .../plan/udf/UDFManagementService.java | 4 +- .../node_commons/plan/udf/UDTFForecast.java | 2 +- .../node_commons/utils/DateTimeUtils.java | 2 +- .../utils/TimestampPrecisionUtils.java | 4 +- .../node_commons/utils/cte/CteDataStore.java | 4 +- .../commons}/request/IConsensusRequest.java | 2 +- 1530 files changed, 6302 insertions(+), 6258 deletions(-) create mode 100644 iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/INodeCommonFragmentInstanceContext.java rename iotdb-core/datanode/src/main/resources/META-INF/services/{org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider => org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider} (100%) rename iotdb-core/datanode/src/main/resources/META-INF/services/{org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider => org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider} (100%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db/exception/sql => node-commons/src/main/java/org/apache/iotdb/commons/exception}/SemanticException.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/common/ConnectionInfo.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/common/NodeRef.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/common/SessionInfo.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/common/SqlDialect.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/execution/MemoryEstimationHelper.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/analyze/ITableTypeProvider.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/expression/multi/FunctionType.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java (52%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java (61%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/node/IPartitionRelatedNode.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/node/IPlanNodeDeserializerProvider.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/node/IPlanVisitor.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/node/PlanNode.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/node/PlanNodeId.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/node/PlanNodeType.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/node/process/ProcessNode.java (79%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/node/process/TwoChildProcessNode.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/node/source/SourceNode.java (78%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/planner/plan/parameter/InputLocation.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/analyzer/NodeRef.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/BoundSignature.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/FunctionId.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/FunctionKind.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/ITableFunctionAINodeService.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/ITableFunctionAINodeServiceProvider.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/ITableFunctionFactory.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/InterpretedFunctionInvoker.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/LongVariableConstraint.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/OperatorType.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/Signature.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/TableBuiltinTableFunction.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/TableFunctionFactory.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/TypeVariableConstraint.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/arithmetic/AdditionResolver.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/arithmetic/DivisionResolver.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/arithmetic/ModulusResolver.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/tvf/ForecastTableFunction.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/tvf/TableFunctionUtils.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/tvf/match/MatchConfig.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/tvf/match/model/MatchState.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/tvf/match/model/Point.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/function/tvf/match/model/Section.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/metadata/ColumnMetadata.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/metadata/ColumnSchema.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/metadata/FunctionNullability.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/metadata/ResolvedFunction.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/metadata/TableSchema.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/Assignments.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/DataOrganizationSpecification.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/OrderingScheme.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/SortOrder.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/Symbol.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/iterative/GroupReference.java (82%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/AggregationNode.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/ApplyNode.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/AssignUniqueId.java (81%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/CollectNode.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/CorrelatedJoinNode.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java (78%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/ExceptNode.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/FillNode.java (69%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/FilterNode.java (80%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/GapFillNode.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/GroupNode.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/IntersectNode.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/JoinNode.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/LimitNode.java (82%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/LinearFillNode.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/MarkDistinctNode.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/Measure.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/MergeSortNode.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/OffsetNode.java (81%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/OutputNode.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/PatternRecognitionNode.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/PreviousFillNode.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/ProjectNode.java (82%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/RowNumberNode.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/RowsPerMatch.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/SemiJoinNode.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/SetOperationNode.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/SkipToPosition.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/SortNode.java (83%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/StreamSortNode.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/TableFunctionNode.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/TopKNode.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/TopKRankingNode.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/UnionNode.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/ValueFillNode.java (81%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/ValuesNode.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/node/WindowNode.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/AggregationLabelSet.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/AggregationValuePointer.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/ClassifierValuePointer.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/IrAlternation.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/IrAnchor.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/IrConcatenation.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/IrEmpty.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/IrExclusion.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/IrLabel.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/IrPermutation.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/IrQuantified.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/IrQuantifier.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/IrRowPattern.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/IrRowPatternFlattener.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/IrRowPatternVisitor.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/LogicalIndexPointer.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/MatchNumberValuePointer.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/Patterns.java (78%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/ScalarValuePointer.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/planner/rowpattern/ValuePointer.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/security/Identity.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/AliasedRelation.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/AllColumns.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/AllRows.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/AnchorPattern.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/AstMemoryEstimationHelper.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/BetweenPredicate.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/BinaryLiteral.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/BooleanLiteral.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Cast.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/CoalesceExpression.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Columns.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/ComparisonExpression.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/CurrentDatabase.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/CurrentTime.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/CurrentUser.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/DataType.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/DataTypeParameter.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/DecimalLiteral.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/DereferenceExpression.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/DoubleLiteral.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/EmptyPattern.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Except.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/ExcludedPattern.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/ExistsPredicate.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Expression.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Extract.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/FieldReference.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Fill.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/FloatLiteral.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/FrameBound.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/FunctionCall.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/GenericDataType.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/GenericLiteral.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/GroupBy.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/GroupingElement.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/GroupingSets.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/IAstVisitor.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Identifier.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/IfExpression.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/InListExpression.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/InPredicate.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Intersect.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/IsNullPredicate.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Join.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/JoinCriteria.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/JoinOn.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/JoinUsing.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/LikePredicate.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Limit.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Literal.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/LogicalExpression.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/LongLiteral.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/MeasureDefinition.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/NaturalJoin.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Node.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/NodeLocation.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/NotExpression.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/NullIfExpression.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/NullLiteral.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/NumericParameter.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Offset.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/OneOrMoreQuantifier.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/OrderBy.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Parameter.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/PatternAlternation.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/PatternConcatenation.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/PatternPermutation.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/PatternQuantifier.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/PatternRecognitionRelation.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/PatternVariable.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/ProcessingMode.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/QualifiedName.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/QuantifiedComparisonExpression.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/QuantifiedPattern.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Query.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/QueryBody.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/QuerySpecification.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/RangeQuantifier.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Relation.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Row.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/RowPattern.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Select.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/SelectItem.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/SetOperation.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/SimpleGroupBy.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/SingleColumn.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/SkipTo.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/SortItem.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Statement.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/StringLiteral.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/SubqueryExpression.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/SubsetDefinition.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/SymbolReference.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Table.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/TableExpressionType.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/TableFunctionArgument.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/TableFunctionInvocation.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/TableFunctionTableArgument.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/TableSubquery.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Trim.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/TypeParameter.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Union.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Values.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/VariableDefinition.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/WhenClause.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/Window.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/WindowDefinition.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/WindowFrame.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/WindowReference.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/WindowSpecification.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/With.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/WithQuery.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/ZeroOrMoreQuantifier.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/ast/ZeroOrOneQuantifier.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/parser/CaseInsensitiveStream.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/parser/ParsingException.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/util/CommonQuerySqlFormatter.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/util/ExpressionFormatter.java (81%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/util/ReservedIdentifiers.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/sql/util/RowPatternFormatter.java (75%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/type/InternalTypeManager.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/type/NamedTypeSignature.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/type/ParameterKind.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/type/RowFieldName.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/type/StandardTypes.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/type/TypeId.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/type/TypeManager.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/type/TypeNotFoundException.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/type/TypeSignature.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/type/TypeSignatureParameter.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/type/TypeSignatureTranslator.java (80%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/utils/ResultColumnAppender.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/relational/utils/TypeUtil.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/statement/component/FillPolicy.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/udf/BuiltinAggregationFunction.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/udf/BuiltinScalarFunction.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/udf/TableUDFUtils.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/udf/UDFManagementService.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/plan/udf/UDTFForecast.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/utils/DateTimeUtils.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/utils/TimestampPrecisionUtils.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => node-commons/src/main/java/org/apache/iotdb/commons}/node_commons/utils/cte/CteDataStore.java (95%) rename iotdb-core/{consensus/src/main/java/org/apache/iotdb/consensus/common => node-commons/src/main/java/org/apache/iotdb/commons}/request/IConsensusRequest.java (96%) diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java index 7fd7cd029119a..e66dfe04473a2 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlan.java @@ -20,6 +20,7 @@ package org.apache.iotdb.confignode.consensus.request; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.confignode.consensus.request.read.ainode.GetAINodeConfigurationPlan; import org.apache.iotdb.confignode.consensus.request.read.subscription.ShowTopicPlan; import org.apache.iotdb.confignode.consensus.request.write.ainode.RegisterAINodePlan; @@ -138,7 +139,6 @@ import org.apache.iotdb.confignode.consensus.request.write.trigger.UpdateTriggerLocationPlan; import org.apache.iotdb.confignode.consensus.request.write.trigger.UpdateTriggerStateInTablePlan; import org.apache.iotdb.confignode.consensus.request.write.trigger.UpdateTriggersOnTransferNodesPlan; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.tsfile.utils.PublicBAOS; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java index 040636fbde57a..8dc18b9b70115 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.auth.entity.PrivilegeType; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeRuntimeMeta; @@ -39,7 +40,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowPipeResp; import org.apache.iotdb.confignode.service.ConfigNode; import org.apache.iotdb.consensus.common.DataSet; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; import java.io.IOException; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java index d4e61c22f75e1..effb1c466bab9 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java @@ -28,6 +28,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.file.SystemFileFactory; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.confignode.conf.ConfigNodeConfig; import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan; @@ -44,7 +45,6 @@ import org.apache.iotdb.consensus.IStateMachine; import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.db.utils.writelog.LogWriter; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigPlanReq.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigPlanReq.java index 4bbaf77da23c7..16153d97f2d2a 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigPlanReq.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/sink/payload/PipeTransferConfigPlanReq.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion; import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq; import org.apache.tsfile.utils.BytesUtils; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTreePatternParseVisitor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTreePatternParseVisitor.java index d7e275ab3426e..95ecd0d7890b2 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTreePatternParseVisitor.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTreePatternParseVisitor.java @@ -20,6 +20,7 @@ package org.apache.iotdb.confignode.manager.pipe.source; import org.apache.iotdb.commons.auth.entity.PrivilegeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; @@ -42,7 +43,6 @@ import org.apache.iotdb.confignode.consensus.request.write.template.CreateSchemaTemplatePlan; import org.apache.iotdb.confignode.consensus.request.write.template.ExtendSchemaTemplatePlan; import org.apache.iotdb.confignode.manager.pipe.event.PipeConfigRegionWritePlanEvent; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.schemaengine.template.alter.TemplateExtendInfo; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java index e3ce7d7c29db1..e243432a6f50b 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.table.TableNodeStatus; @@ -98,7 +99,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TTableInfo; import org.apache.iotdb.db.exception.metadata.DatabaseNotSetException; import org.apache.iotdb.db.exception.metadata.SchemaQuotaExceededException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.schemaengine.template.TemplateInternalRPCUtil; import org.apache.iotdb.db.schemaengine.template.alter.TemplateExtendInfo; import org.apache.iotdb.rpc.RpcUtils; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java index 6b47773813e31..5ec586552493b 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.exception.table.ColumnNotExistsException; import org.apache.iotdb.commons.exception.table.TableAlreadyExistsException; import org.apache.iotdb.commons.exception.table.TableNotExistsException; @@ -49,7 +50,6 @@ import org.apache.iotdb.db.exception.metadata.DatabaseNotSetException; import org.apache.iotdb.db.exception.metadata.PathAlreadyExistException; import org.apache.iotdb.db.exception.metadata.PathNotExistException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.traverser.collector.DatabaseCollector; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.traverser.collector.MNodeAboveDBCollector; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.traverser.collector.MNodeCollector; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java index 1ee0af25c9964..019c722a216bc 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java @@ -24,6 +24,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.cluster.RegionStatus; import org.apache.iotdb.commons.exception.runtime.ThriftSerDeException; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; @@ -31,7 +32,6 @@ import org.apache.iotdb.confignode.procedure.exception.ProcedureException; import org.apache.iotdb.confignode.procedure.state.AddRegionPeerState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.mpp.rpc.thrift.TRegionMigrateResult; import org.slf4j.Logger; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java index a08d753abf584..8c29105368d6f 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java @@ -22,13 +22,13 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.exception.runtime.ThriftSerDeException; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; import org.apache.iotdb.confignode.procedure.exception.ProcedureException; import org.apache.iotdb.confignode.procedure.state.ReconstructRegionState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RegionMigrateProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RegionMigrateProcedure.java index 55baab2ee7eaf..8b8c217f383bb 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RegionMigrateProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RegionMigrateProcedure.java @@ -22,6 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.exception.runtime.ThriftSerDeException; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; @@ -29,7 +30,6 @@ import org.apache.iotdb.confignode.procedure.exception.ProcedureException; import org.apache.iotdb.confignode.procedure.state.RegionTransitionState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java index 04eb72b05c44e..8c3cb95df5c9e 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java @@ -25,6 +25,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.cluster.RegionStatus; import org.apache.iotdb.commons.exception.runtime.ThriftSerDeException; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; @@ -32,7 +33,6 @@ import org.apache.iotdb.confignode.procedure.exception.ProcedureException; import org.apache.iotdb.confignode.procedure.state.RemoveRegionPeerState; import org.apache.iotdb.confignode.procedure.store.ProcedureType; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.mpp.rpc.thrift.TRegionMigrateResult; import org.slf4j.Logger; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/IConsensus.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/IConsensus.java index 8f49af524bc01..c462aa3a046e1 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/IConsensus.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/IConsensus.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.ConsensusGroupId; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.Peer; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.config.ConsensusConfig; import org.apache.iotdb.consensus.exception.ConsensusException; import org.apache.iotdb.consensus.exception.ConsensusGroupAlreadyExistException; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/IStateMachine.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/IStateMachine.java index 692b60beb2a2d..6d115cb81618a 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/IStateMachine.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/IStateMachine.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.ConsensusGroupId; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.Peer; import org.apache.iotdb.consensus.common.Utils; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import javax.annotation.concurrent.ThreadSafe; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/BatchIndexedConsensusRequest.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/BatchIndexedConsensusRequest.java index 658dc69d24e4e..d47e69a48130f 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/BatchIndexedConsensusRequest.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/BatchIndexedConsensusRequest.java @@ -23,7 +23,8 @@ import java.util.LinkedList; import java.util.List; -public class BatchIndexedConsensusRequest implements IConsensusRequest { +public class BatchIndexedConsensusRequest + implements org.apache.iotdb.commons.request.IConsensusRequest { private boolean isStartSyncIndexInitialized; private long startSyncIndex; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/ByteBufferConsensusRequest.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/ByteBufferConsensusRequest.java index 6ce31cc18597d..978fe3dcf0346 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/ByteBufferConsensusRequest.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/ByteBufferConsensusRequest.java @@ -27,7 +27,8 @@ * received by the followers, the responsibility of deserialization can generally be transferred to * the state machine layer */ -public class ByteBufferConsensusRequest implements IConsensusRequest { +public class ByteBufferConsensusRequest + implements org.apache.iotdb.commons.request.IConsensusRequest { private final ByteBuffer byteBuffer; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/DeserializedBatchIndexedConsensusRequest.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/DeserializedBatchIndexedConsensusRequest.java index 9cdeaf60c3029..acb3b78d17c51 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/DeserializedBatchIndexedConsensusRequest.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/DeserializedBatchIndexedConsensusRequest.java @@ -25,10 +25,11 @@ import java.util.Objects; public class DeserializedBatchIndexedConsensusRequest - implements IConsensusRequest, Comparable { + implements org.apache.iotdb.commons.request.IConsensusRequest, + Comparable { private final long startSyncIndex; private final long endSyncIndex; - private final List insertNodes; + private final List insertNodes; private long memorySize; public DeserializedBatchIndexedConsensusRequest( @@ -47,11 +48,11 @@ public long getEndSyncIndex() { return endSyncIndex; } - public List getInsertNodes() { + public List getInsertNodes() { return insertNodes; } - public void add(IConsensusRequest insertNode) { + public void add(org.apache.iotdb.commons.request.IConsensusRequest insertNode) { this.insertNodes.add(insertNode); this.memorySize += insertNode.getMemorySize(); } diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IndexedConsensusRequest.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IndexedConsensusRequest.java index 2bf01d4ef868c..a6b5f98e83a84 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IndexedConsensusRequest.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IndexedConsensusRequest.java @@ -26,18 +26,19 @@ import java.util.concurrent.atomic.AtomicLong; /** only used for iot consensus. */ -public class IndexedConsensusRequest implements IConsensusRequest { +public class IndexedConsensusRequest implements org.apache.iotdb.commons.request.IConsensusRequest { /** we do not need to serialize these two fields as they are useless in other nodes. */ private final long searchIndex; private final long syncIndex; - private final List requests; + private final List requests; private final List serializedRequests; private long memorySize = 0; private AtomicLong referenceCnt = new AtomicLong(); - public IndexedConsensusRequest(long searchIndex, List requests) { + public IndexedConsensusRequest( + long searchIndex, List requests) { this.searchIndex = searchIndex; this.requests = requests; this.syncIndex = -1L; @@ -45,7 +46,9 @@ public IndexedConsensusRequest(long searchIndex, List request } public IndexedConsensusRequest( - long searchIndex, long syncIndex, List requests) { + long searchIndex, + long syncIndex, + List requests) { this.searchIndex = searchIndex; this.requests = requests; this.syncIndex = syncIndex; @@ -66,7 +69,7 @@ public ByteBuffer serializeToByteBuffer() { throw new UnsupportedOperationException(); } - public List getRequests() { + public List getRequests() { return requests; } diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IoTConsensusRequest.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IoTConsensusRequest.java index 3b55016d8b648..728260230a6db 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IoTConsensusRequest.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IoTConsensusRequest.java @@ -27,7 +27,7 @@ * these two classes. And we need to separate them in DataRegionStateMachine when deserialize the * PlanNode from ByteBuffer */ -public class IoTConsensusRequest implements IConsensusRequest { +public class IoTConsensusRequest implements org.apache.iotdb.commons.request.IConsensusRequest { private final ByteBuffer byteBuffer; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/IoTConsensus.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/IoTConsensus.java index 959191ca2d6d3..a34102178688b 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/IoTConsensus.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/IoTConsensus.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil; import org.apache.iotdb.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.exception.StartupException; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.commons.service.RegisterManager; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.commons.utils.KillPoint.DataNodeKillPoints; @@ -39,7 +40,6 @@ import org.apache.iotdb.consensus.IStateMachine.Registry; import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.Peer; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.config.ConsensusConfig; import org.apache.iotdb.consensus.config.IoTConsensusConfig; import org.apache.iotdb.consensus.exception.ConsensusException; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/IoTConsensusServerImpl.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/IoTConsensusServerImpl.java index 567261efffffa..d8fa9fc8f635b 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/IoTConsensusServerImpl.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/IoTConsensusServerImpl.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.consensus.index.ComparableConsensusRequest; import org.apache.iotdb.commons.consensus.index.impl.IoTProgressIndex; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.commons.service.metric.MetricService; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; @@ -35,7 +36,6 @@ import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.Peer; import org.apache.iotdb.consensus.common.request.DeserializedBatchIndexedConsensusRequest; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.common.request.IndexedConsensusRequest; import org.apache.iotdb.consensus.config.IoTConsensusConfig; import org.apache.iotdb.consensus.exception.ConsensusGroupModifyPeerException; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/log/GetConsensusReqReaderPlan.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/log/GetConsensusReqReaderPlan.java index 377b8954e6da1..fd3a459162c23 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/log/GetConsensusReqReaderPlan.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/log/GetConsensusReqReaderPlan.java @@ -19,7 +19,7 @@ package org.apache.iotdb.consensus.iot.log; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; +import org.apache.iotdb.commons.request.IConsensusRequest; import java.nio.ByteBuffer; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/service/IoTConsensusRPCServiceProcessor.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/service/IoTConsensusRPCServiceProcessor.java index 71c14aebaa139..9038753063b6e 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/service/IoTConsensusRPCServiceProcessor.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/service/IoTConsensusRPCServiceProcessor.java @@ -21,13 +21,13 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.ConsensusGroupId; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.commons.utils.KillPoint.DataNodeKillPoints; import org.apache.iotdb.commons.utils.KillPoint.IoTConsensusInactivatePeerKillPoints; import org.apache.iotdb.commons.utils.KillPoint.KillPoint; import org.apache.iotdb.consensus.common.Peer; import org.apache.iotdb.consensus.common.request.BatchIndexedConsensusRequest; import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.common.request.IoTConsensusRequest; import org.apache.iotdb.consensus.exception.ConsensusGroupModifyPeerException; import org.apache.iotdb.consensus.iot.IoTConsensus; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/IoTConsensusV2.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/IoTConsensusV2.java index 4ed1e7f1731be..11d53f9c56410 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/IoTConsensusV2.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/IoTConsensusV2.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.consensus.iotv2.container.IoTV2GlobalComponentContainer; import org.apache.iotdb.commons.exception.StartupException; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.commons.service.RegisterManager; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.commons.utils.KillPoint.DataNodeKillPoints; @@ -38,7 +39,6 @@ import org.apache.iotdb.consensus.IStateMachine; import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.Peer; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.config.ConsensusConfig; import org.apache.iotdb.consensus.config.IoTConsensusV2Config; import org.apache.iotdb.consensus.exception.ConsensusException; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/IoTConsensusV2ServerImpl.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/IoTConsensusV2ServerImpl.java index 66001c40b5d2f..778ea51213306 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/IoTConsensusV2ServerImpl.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/pipe/IoTConsensusV2ServerImpl.java @@ -28,6 +28,7 @@ import org.apache.iotdb.commons.consensus.index.ComparableConsensusRequest; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.commons.service.metric.MetricService; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.commons.utils.KillPoint.DataNodeKillPoints; @@ -35,7 +36,6 @@ import org.apache.iotdb.consensus.IStateMachine; import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.Peer; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.config.IoTConsensusV2Config; import org.apache.iotdb.consensus.config.IoTConsensusV2Config.ReplicateMode; import org.apache.iotdb.consensus.exception.ConsensusGroupModifyPeerException; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/ApplicationStateMachineProxy.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/ApplicationStateMachineProxy.java index 12095189c522d..63c8bbf0c7b01 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/ApplicationStateMachineProxy.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/ApplicationStateMachineProxy.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.consensus.IStateMachine; import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.ratis.metrics.RatisMetricsManager; import org.apache.iotdb.consensus.ratis.utils.Retriable; import org.apache.iotdb.consensus.ratis.utils.Utils; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java index 265192858bf97..fc2515484b2f8 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java @@ -29,6 +29,7 @@ import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.client.property.ClientPoolProperty; import org.apache.iotdb.commons.consensus.ConsensusGroupId; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.commons.service.metric.MetricService; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.commons.utils.TestOnly; @@ -36,7 +37,6 @@ import org.apache.iotdb.consensus.IStateMachine; import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.Peer; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.config.ConsensusConfig; import org.apache.iotdb.consensus.config.RatisConfig; import org.apache.iotdb.consensus.exception.ConsensusException; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RequestMessage.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RequestMessage.java index 3c02ca42e2f03..5926fadaf293f 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RequestMessage.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RequestMessage.java @@ -19,7 +19,7 @@ package org.apache.iotdb.consensus.ratis; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.ratis.protocol.Message; import org.apache.ratis.thirdparty.com.google.protobuf.ByteString; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/simple/SimpleConsensus.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/simple/SimpleConsensus.java index f7fcba1a597b2..c0f006c5aacd1 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/simple/SimpleConsensus.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/simple/SimpleConsensus.java @@ -23,6 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.consensus.DataRegionId; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.commons.utils.StatusUtils; @@ -31,7 +32,6 @@ import org.apache.iotdb.consensus.IStateMachine.Registry; import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.Peer; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.config.ConsensusConfig; import org.apache.iotdb.consensus.exception.ConsensusException; import org.apache.iotdb.consensus.exception.ConsensusGroupAlreadyExistException; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/simple/SimpleConsensusServerImpl.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/simple/SimpleConsensusServerImpl.java index fa3c9dff37b2f..4ed4a7b41ce41 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/simple/SimpleConsensusServerImpl.java +++ b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/simple/SimpleConsensusServerImpl.java @@ -20,10 +20,10 @@ package org.apache.iotdb.consensus.simple; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.IStateMachine; import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.Peer; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import java.io.File; diff --git a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/EmptyStateMachine.java b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/EmptyStateMachine.java index 79b825670a50d..aafa0be5bb5ff 100644 --- a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/EmptyStateMachine.java +++ b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/EmptyStateMachine.java @@ -20,8 +20,8 @@ package org.apache.iotdb.consensus; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.common.DataSet; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import java.io.File; diff --git a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/util/TestStateMachine.java b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/util/TestStateMachine.java index a515010a3497a..54acdec30bbc7 100644 --- a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/util/TestStateMachine.java +++ b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/util/TestStateMachine.java @@ -20,12 +20,12 @@ package org.apache.iotdb.consensus.iot.util; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.IStateMachine; import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.Peer; import org.apache.iotdb.consensus.common.request.BatchIndexedConsensusRequest; import org.apache.iotdb.consensus.common.request.DeserializedBatchIndexedConsensusRequest; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.common.request.IndexedConsensusRequest; import org.apache.iotdb.consensus.iot.log.ConsensusReqReader; import org.apache.iotdb.consensus.iot.log.GetConsensusReqReaderPlan; diff --git a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RecoverReadTest.java b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RecoverReadTest.java index ac8115ced8555..c93cdc91af8ea 100644 --- a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RecoverReadTest.java +++ b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RecoverReadTest.java @@ -20,8 +20,8 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.ConsensusGroupId; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.common.Peer; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.config.RatisConfig; import org.apache.iotdb.consensus.exception.RatisReadUnavailableException; diff --git a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/ratis/TestUtils.java b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/ratis/TestUtils.java index f5997c261fdff..69725d68be6ee 100644 --- a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/ratis/TestUtils.java +++ b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/ratis/TestUtils.java @@ -24,6 +24,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.consensus.DataRegionId; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.consensus.IStateMachine; @@ -31,7 +32,6 @@ import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.Peer; import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.config.ConsensusConfig; import org.apache.iotdb.consensus.config.RatisConfig; import org.apache.iotdb.consensus.exception.ConsensusException; diff --git a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/simple/SimpleConsensusTest.java b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/simple/SimpleConsensusTest.java index 047465a3d4f69..d50ab992f6f9c 100644 --- a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/simple/SimpleConsensusTest.java +++ b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/simple/SimpleConsensusTest.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.consensus.SchemaRegionId; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.consensus.EmptyStateMachine; import org.apache.iotdb.consensus.IConsensus; @@ -33,7 +34,6 @@ import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.Peer; import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.config.ConsensusConfig; import org.apache.iotdb.consensus.exception.ConsensusException; import org.apache.iotdb.consensus.exception.ConsensusGroupAlreadyExistException; diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl index 805e28a4f2f5e..2b8f23b9d4723 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl @@ -32,7 +32,7 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -176,7 +176,7 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -292,7 +292,7 @@ public class ${className} extends BinaryColumnTransformer { package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl index e80aa6e79c9d2..d6ff9c9fdbdf2 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl +++ b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl @@ -23,11 +23,11 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; import org.apache.tsfile.read.common.type.Type; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.AdditionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.DivisionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.ModulusResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.AdditionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.DivisionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.ModulusResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.SubtractionResolver; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.DoubleNegationColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.FloatNegationColumnTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorContext.java index 9a874d51c07e5..d20edfe413716 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorContext.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import io.airlift.units.Duration; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java index 025877eddfede..0296a406c5520 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java index 7c08086a53775..55b9d5cfbc38f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator; import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractFillOperator.java index d643a8380cc77..999e845151c45 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractFillOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractLinearFillOperator.java index 5b9ed65a4aee3..d52ea2ee7b8ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractLinearFillOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java index 838595026e55e..b58da44cd339d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AssignUniqueIdOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AssignUniqueIdOperator.java index 34f7482363b96..c54ca5c951459 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AssignUniqueIdOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AssignUniqueIdOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/CollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/CollectOperator.java index 9f8627769d677..7da15b65ecdef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/CollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/CollectOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/EnforceSingleRowOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/EnforceSingleRowOperator.java index dd491a7a18918..a37c8075535f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/EnforceSingleRowOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/EnforceSingleRowOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/FilterAndProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/FilterAndProjectOperator.java index 174cb9705a2e7..beea21124f692 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/FilterAndProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/FilterAndProjectOperator.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.transformation.dag.column.AbstractCaseWhenThenColumnTransformer; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/LimitOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/LimitOperator.java index b987065e74f8f..f2f2c50428a20 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/LimitOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/LimitOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java index c1bcc4cc3ec8e..21f436225811c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/OffsetOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/OffsetOperator.java index 3c161ebafdfca..eff087c40c762 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/OffsetOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/OffsetOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java index bb309d8518341..8085ac508cefe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; @@ -29,9 +32,6 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java index 859f81512c920..f2f5550ba91d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java index 925f7deb4f042..f86bd9e86ab84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.calc_commons.utils.sort.DiskSpiller; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java index 580d8a31771c8..c06e4e3633336 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.calc_commons.utils.sort.TableDiskSpiller; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java index 24c42c4d58551..8609268301739 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortHeap; import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ValuesOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ValuesOperator.java index fb9e574b18d69..ec40100ebf53e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ValuesOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ValuesOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/PartitionRecognizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/PartitionRecognizer.java index b73ecc9cae986..040679c8d91ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/PartitionRecognizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/PartitionRecognizer.java @@ -32,8 +32,8 @@ import java.util.List; import java.util.stream.Collectors; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; public class PartitionRecognizer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java index 46c9b8d8a32dc..d86adbe6a5192 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.function; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.AggregationMergeSortOperator; @@ -27,7 +28,6 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; import org.apache.iotdb.udf.api.relational.table.processor.TableFunctionDataProcessor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java index bb764c51b8caa..15a70cd52796d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java index ce3a65080a90c..91efe049c1f80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.join; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java index 417c96f5c0fb0..74eb0e0a29e89 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.external.commons.collections4.comparators.ComparatorChain; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java index 0b3b39d8da3c3..6397fef28e1c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; import java.util.Collections; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java index 59210b07a0cff..1b7ab5b197756 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java index 0eea49975fd75..0b44cbcac437d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer.PatternVariableComputation; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; @@ -27,9 +30,6 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java index 86b83a80af8e5..efe70453e3a05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; public enum ArithmeticOperator implements BinaryOperator { ADD { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java index 0ec5d2374cb1d..bd50756b0b285 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java index 4142c1f419213..4637c50dc8534 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/Computation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/Computation.java index fc1c810690161..076ec07c045ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/Computation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/Computation.java @@ -19,23 +19,23 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers.Assignment; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers.Assignment; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import java.util.ArrayList; import java.util.HashMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java index 48b32a1351f57..91ed8e0593860 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java index b66db2c6efcd8..5ed6dc8275651 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregator; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalAggregationPointer; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValueAccessor; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.type.AbstractIntType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java index 0fc5bbcebcc31..081d8d9cdff6f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAlternation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAnchor; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrConcatenation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrEmpty; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrExclusion; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrPermutation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantified; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPatternVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAlternation; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAnchor; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrConcatenation; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrEmpty; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrExclusion; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrPermutation; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantified; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPatternVisitor; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java index 3cb47c8c572d1..27536d9e60dc9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java @@ -18,13 +18,13 @@ */ package org.apache.iotdb.db.calc_commons.execution.operator.process.window; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -44,8 +44,8 @@ import java.util.Map; import java.util.Optional; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; public class RowNumberOperator implements ProcessOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java index 7b8944a23ad18..b23ed420c9cae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.window; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; @@ -32,7 +33,6 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java index e093b8d8c427d..114e01d1e3b32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java @@ -19,6 +19,13 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.window; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.NoChannelGroupByHash; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.GroupedTopNBuilder; import org.apache.iotdb.db.calc_commons.execution.operator.GroupedTopNRowNumberBuilder; @@ -26,13 +33,6 @@ import org.apache.iotdb.db.calc_commons.execution.operator.SimpleTsBlockWithPositionComparator; import org.apache.iotdb.db.calc_commons.execution.operator.TsBlockWithPositionComparator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.NoChannelGroupByHash; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java index 36ce3b0900e98..f54115fa22d6b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java index 30dd01d08b91a..6ace83bd6ea86 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; -import org.apache.iotdb.db.exception.sql.SemanticException; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java index 09ad9f090b052..56cef77dfef26 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.write.UnSupportedDataTypeException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java index 24df0db346094..d94f931889308 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; -import org.apache.iotdb.db.exception.sql.SemanticException; import static com.google.common.base.Preconditions.checkArgument; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java index 8cbbba0026196..1e8b46e375e90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java index dd19fdafd6461..190d7844636f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java index 8e1c30c7e51a7..f57ce901e95c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java index 9e1f6b629d2c3..f21fc2dab6e3b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java index 133be3639c927..a6161ff4f567f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java index 550a54ca2827a..ddb13cbfa9cd8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java index c8659532c8758..89a9ee5edca3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java index 1fe167e1cc710..a2e47f6770b69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java @@ -14,8 +14,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java index 46a0b60568452..2e13be2f7af31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java @@ -20,6 +20,11 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.execution.aggregation.VarianceAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.BinaryGroupedApproxMostFrequentAccumulator; @@ -50,11 +55,6 @@ import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedVarianceAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.IntGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.AggregateFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java index ba639dc3f0e28..615d3d716fb12 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java index 5270e56d5fc31..5356d35f8c665 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java @@ -14,7 +14,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java index 3e3410083c2bd..d07a4a98574dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java @@ -14,10 +14,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java index 6effa8f8fc7c4..011ed7982da83 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java @@ -14,10 +14,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java index 434f755b45341..e0dcfa0ba48f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java @@ -14,10 +14,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java index 7814079616fab..1daddd80c9ef2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java @@ -14,10 +14,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java index 9149a1f23b8dd..f5fdec5940701 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java @@ -14,10 +14,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java index 072ca84bc8e98..c5571ed68b89e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java @@ -14,10 +14,10 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java index 67e2d2a7e2302..680182f0473c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java index d6e85d0ebe6a6..1a22cc791f821 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java @@ -14,7 +14,7 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java index 51c249df83938..0828e9bf3b622 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java @@ -14,11 +14,11 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.BinaryApproxMostFrequentAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java index 89093e271aac9..c50503438ada1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java @@ -14,11 +14,11 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.BooleanApproxMostFrequentAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java index 5eee963c441d5..03dd95897ca09 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java @@ -14,11 +14,11 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.DoubleApproxMostFrequentAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java index 0a2005a3ad503..211942dcd0b84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java @@ -14,11 +14,11 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.FloatApproxMostFrequentAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java index 030054508e713..b66624637e5d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java index a54cc656465a3..81dc0b79d4ac7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java @@ -14,9 +14,9 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java index 8080577a351b0..c04b8f34aeb23 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -38,8 +38,8 @@ import java.util.Optional; import static com.google.common.base.Preconditions.checkState; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; public class HashAggregationOperator extends AbstractOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java index 191730fd699f0..077018c612f7e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java @@ -14,11 +14,11 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.IntApproxMostFrequentAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java index 2a3155d6026db..5a5974872e247 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java @@ -14,11 +14,11 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LongApproxMostFrequentAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java index 42fe652ebce73..084de210e2e57 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java index 2abe5bab5dfc1..5fd9c8845fe63 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; @@ -26,8 +28,6 @@ import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; @@ -45,9 +45,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.MAX_USED_MEMORY; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; public class StreamingHashAggregationOperator extends AbstractOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java index 1e6a71ccaea1f..d3860b351e435 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; @@ -47,7 +47,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; public class InMemoryHashAggregationBuilder implements HashAggregationBuilder { private final int[] groupByChannels; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java index fdd5838af7028..8977030309af1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java @@ -20,6 +20,56 @@ package org.apache.iotdb.db.calc_commons.execution.relational; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.AdditionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.DivisionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.ModulusResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.plan.relational.metadata.ITypeMetadata; @@ -146,56 +196,6 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.UpperColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.analyze.ITableTypeProvider; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.AdditionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.DivisionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.ModulusResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DecimalLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.ScalarFunction; @@ -227,6 +227,8 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; import static org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; @@ -236,8 +238,6 @@ import static org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.isStringLiteral; -import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/CommonOperatorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/CommonOperatorUtils.java index 9a23d395b9e31..2ee3d2b520fa5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/CommonOperatorUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/CommonOperatorUtils.java @@ -48,7 +48,7 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; +import static org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; public class CommonOperatorUtils { public static final IdentityLinearFill IDENTITY_LINEAR_FILL = new IdentityLinearFill(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java index b79be7861b63b..701562f081db0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.plan.planner; -import org.apache.iotdb.db.node_commons.plan.analyze.ITableTypeProvider; +import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; import java.time.ZoneId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java index 60dd362f4f005..37e3a2dfbc7bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java @@ -19,6 +19,65 @@ package org.apache.iotdb.db.calc_commons.plan.planner; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind; +import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionFactory; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.AggregationLabelSet; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.AggregationValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ClassifierValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.MatchNumberValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.AssignUniqueIdOperator; @@ -105,65 +164,6 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.analyze.ITableTypeProvider; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind; -import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionFactory; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.AggregationLabelSet; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.AggregationValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ClassifierValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.MatchNumberValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; @@ -205,6 +205,15 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch.ONE; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition.LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; @@ -220,15 +229,6 @@ import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch.ONE; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition.LAST; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.tsfile.read.common.type.LongType.INT64; import static org.apache.tsfile.read.common.type.StringType.STRING; import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/CommonMetadataUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/CommonMetadataUtils.java index ff8d4eeaced97..2f5cce7cf0228 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/CommonMetadataUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/CommonMetadataUtils.java @@ -15,8 +15,8 @@ package org.apache.iotdb.db.calc_commons.plan.relational.metadata; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.exception.table.TableNotExistsException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.tsfile.read.common.type.ObjectType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/ITypeMetadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/ITypeMetadata.java index 251a343c8ed95..f3b0985a11c32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/ITypeMetadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/ITypeMetadata.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.plan.relational.metadata; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java index cf42b66085b4c..534d33a405d88 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.calc_commons.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java index 109cf0050536c..20f143c4d9940 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.calc_commons.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to boolean type public class CastToBooleanLiteralVisitor implements CommonQueryAstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java index dcb9e30da74db..8aa983cc9af5f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.calc_commons.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.tsfile.utils.DateUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java index bb384433cc2b6..ce4817abd633f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.calc_commons.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to double type public class CastToDoubleLiteralVisitor implements CommonQueryAstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java index c8e8c5c6b490c..2659a35266f84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.calc_commons.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to float type public class CastToFloatLiteralVisitor implements CommonQueryAstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java index a9e92f3438cf3..e3f3786596eb5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.calc_commons.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to INT32 type public class CastToInt32LiteralVisitor implements CommonQueryAstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java index a06d77d02ded7..4e9b48ea4734c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.calc_commons.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to INT64 type public class CastToInt64LiteralVisitor implements CommonQueryAstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java index 1b976f61e2736..04c5719fb2c2c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.calc_commons.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.BytesUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java index 0dfd9574d9aa8..02cc508240a39 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.calc_commons.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import java.time.ZoneId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java index 739ea869f6bf1..56ac9e747a5fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java @@ -19,25 +19,25 @@ package org.apache.iotdb.db.calc_commons.plan.relational.planner.ir; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.utils.Pair; @@ -46,9 +46,9 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; public class GlobalTimePredicateExtractVisitor implements CommonQueryAstVisitor< diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java index f8b186321653c..1cabc26309a22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.read.common.block.column.NullColumn; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java index 0ec8cba48a412..5b6ad581dc376 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java index 7f6ec9a162b99..13f181f3baf35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.exception.sql.SemanticException; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java index 855fe7b0de1c8..327e4d205a989 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.utils; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; public class BytePaddingUtils { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/InColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/InColumnTransformer.java index 1677dd0374515..6c7c9568b5a42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/InColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/InColumnTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java index c8f8247b3e711..0948ece3871bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.util.CastFunctionUtils; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java index 873cdacc328a0..23b22bdbc9da3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java index 5c52f3578afb8..c447c0034610c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java index 9c24539c3b6a1..49bf18f7ab830 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java index d90087c9c18c4..baf1e56ca19f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java index 638cb8aaa5375..87e768babc757 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -31,10 +31,10 @@ import java.util.function.Function; import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR; -import static org.apache.iotdb.db.node_commons.utils.DateTimeUtils.convertToZonedDateTime; -import static org.apache.iotdb.db.node_commons.utils.DateTimeUtils.getExtractTimestampMsPartFunction; -import static org.apache.iotdb.db.node_commons.utils.DateTimeUtils.getExtractTimestampNsPartFunction; -import static org.apache.iotdb.db.node_commons.utils.DateTimeUtils.getExtractTimestampUsPartFunction; +import static org.apache.iotdb.commons.node_commons.utils.DateTimeUtils.convertToZonedDateTime; +import static org.apache.iotdb.commons.node_commons.utils.DateTimeUtils.getExtractTimestampMsPartFunction; +import static org.apache.iotdb.commons.node_commons.utils.DateTimeUtils.getExtractTimestampNsPartFunction; +import static org.apache.iotdb.commons.node_commons.utils.DateTimeUtils.getExtractTimestampUsPartFunction; public class ExtractTransformer extends UnaryColumnTransformer { private final Function evaluateFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java index c3ef9dd261708..1317f0faf3364 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java @@ -14,10 +14,10 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java index 6d00611411c50..48a3d76d342ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.inteface.CodecStrategy; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java index 76ec24f8ba71c..5d3a1c1c03128 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java index 89ee4c235dabf..42c977656ab52 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java index 16476fc7513fe..e8c1fa6a63dff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java index ba1a7ab0d052e..50f5856d5b523 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.inteface.CodecStrategy; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.HexUtils; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.SpookyHashV2Utils; -import org.apache.iotdb.db.exception.sql.SemanticException; import com.google.common.hash.Hashing; import com.google.common.io.BaseEncoding; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java index 5b9fb4c19f996..9fc22062936c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java index c59ea014f61a3..7273a0d206fa1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.inteface; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; @FunctionalInterface public interface CodecStrategy { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java index aa3e642720b90..17037e6acf6b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDTFExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDTFExecutor.java index 8f48394d352bd..2df50e2794bda 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDTFExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDTFExecutor.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.udf; +import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.adapter.PointCollectorAdaptor; import org.apache.iotdb.db.calc_commons.transformation.dag.util.InputRowUtils; import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; -import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.udf.api.UDTF; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowWindow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/BitwiseUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/BitwiseUtils.java index 75c289c6cd425..18fd50af28c54 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/BitwiseUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/BitwiseUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.util; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; public class BitwiseUtils { private static final long TINYINT_MASK = 0b1111_1111L; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java index ec538381bca75..9b1268184b9ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java @@ -14,9 +14,9 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.util; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java index 92b282e9abc93..c9b02f62e4cc0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java @@ -14,9 +14,9 @@ package org.apache.iotdb.db.calc_commons.transformation.dag.util; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/ObjectTypeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/ObjectTypeUtils.java index 7735920e3904e..75251408a4798 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/ObjectTypeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/ObjectTypeUtils.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.calc_commons.utils; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.tsfile.encoding.decoder.Decoder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java index 68fe546d8add7..b63c899be6073 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.consensus.statemachine; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.IStateMachine; import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.slf4j.Logger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java index fcb00252e7226..25ff9408e7901 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java @@ -21,6 +21,8 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.db.exception.BatchProcessException; @@ -28,8 +30,6 @@ import org.apache.iotdb.db.exception.WriteProcessRejectException; import org.apache.iotdb.db.exception.query.OutOfTTLException; import org.apache.iotdb.db.exception.runtime.TableLostRuntimeException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedInsertNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachine.java index 89b090a05fc7b..c3e1dc6f9ff38 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachine.java @@ -23,13 +23,13 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.consensus.DataRegionId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.common.DataSet; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.common.request.IndexedConsensusRequest; import org.apache.iotdb.consensus.iot.log.GetConsensusReqReaderPlan; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.statemachine.BaseStateMachine; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java index 267c03b7ded64..49a9e0c3b4a37 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java @@ -22,14 +22,14 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.index.ComparableConsensusRequest; import org.apache.iotdb.commons.consensus.index.impl.IoTProgressIndex; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.common.request.BatchIndexedConsensusRequest; import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest; import org.apache.iotdb.consensus.common.request.DeserializedBatchIndexedConsensusRequest; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.common.request.IndexedConsensusRequest; import org.apache.iotdb.consensus.common.request.IoTConsensusRequest; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntry; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java index ad3f7b56e53cd..fac85531a51f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.template.Template; @@ -31,7 +32,6 @@ import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.exception.metadata.MeasurementAlreadyExistException; import org.apache.iotdb.db.exception.metadata.template.TemplateIsInUseException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningQueue; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java index 06653ad4dd8ee..daeba2f58d38d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java @@ -22,12 +22,12 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.ConsensusGroupId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.common.DataSet; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.ratis.utils.Utils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.statemachine.BaseStateMachine; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningQueue; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/load/LoadAnalyzeTableColumnDisorderException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/load/LoadAnalyzeTableColumnDisorderException.java index a34ecd12c1670..6ac06e8b71229 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/load/LoadAnalyzeTableColumnDisorderException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/load/LoadAnalyzeTableColumnDisorderException.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.exception.load; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.rpc.TSStatusCode; public class LoadAnalyzeTableColumnDisorderException extends SemanticException { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java index 3bddfc7c45b10..994ce8743512f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.exception.query; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.exception.WriteProcessException; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.rpc.TSStatusCode; public class OutOfTTLException extends WriteProcessException { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/sql/ColumnCreationFailException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/sql/ColumnCreationFailException.java index 3317befb643ac..227b7b522e4ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/sql/ColumnCreationFailException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/sql/ColumnCreationFailException.java @@ -19,7 +19,8 @@ package org.apache.iotdb.db.exception.sql; -public class ColumnCreationFailException extends SemanticException { +public class ColumnCreationFailException + extends org.apache.iotdb.commons.exception.SemanticException { public ColumnCreationFailException(String message) { super(message); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java index 053957bcbe85c..33e9465d3f365 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java @@ -31,6 +31,7 @@ import org.apache.iotdb.commons.consensus.index.impl.MetaProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.commons.pipe.agent.task.PipeTask; import org.apache.iotdb.commons.pipe.agent.task.PipeTaskAgent; @@ -48,7 +49,6 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.agent.task.builder.PipeDataNodeBuilder; import org.apache.iotdb.db.pipe.agent.task.builder.PipeDataNodeTaskBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java index dc6a1efc4df6e..5db4482c2cd1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.pipe.agent.task.subtask.sink; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.commons.pipe.agent.task.subtask.PipeAbstractSinkSubtask; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.sink.protocol.IoTDBSink; import org.apache.iotdb.commons.utils.ErrorHandlingCommonUtils; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.UserDefinedEnrichedEvent; import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/deletion/PipeDeleteDataNodeEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/deletion/PipeDeleteDataNodeEvent.java index cfb8b65af367a..243dfadbf3ffd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/deletion/PipeDeleteDataNodeEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/deletion/PipeDeleteDataNodeEvent.java @@ -22,13 +22,13 @@ import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.SerializableEvent; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.AbstractDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java index 1f2aa488b48d0..9c69e46cc9ce4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.pipe.metric.overview.PipeHeartbeatEventMetrics; import org.apache.iotdb.db.pipe.source.dataregion.realtime.disruptor.RingBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java index c521be63bb4bf..0e486cc3521b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.pipe.event.common.schema; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; @@ -26,7 +27,6 @@ import org.apache.iotdb.commons.pipe.event.PipeSnapshotEvent; import org.apache.iotdb.commons.pipe.resource.ref.PipePhantomReferenceManager.PipeEventResource; import org.apache.iotdb.commons.pipe.resource.snapshot.PipeSnapshotResourceManager; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.pipe.event.ReferenceTrackableEvent; import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java index cc777b73ca617..b4d723480cfe3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.pipe.event.common.schema; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.PipeWritePlanEvent; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/window/processor/TumblingWindowingProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/window/processor/TumblingWindowingProcessor.java index 363942d7471f0..3b27684a5e830 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/window/processor/TumblingWindowingProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/window/processor/TumblingWindowingProcessor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.processor.aggregate.window.processor; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.pipe.processor.aggregate.window.datastructure.TimeSeriesWindow; import org.apache.iotdb.db.pipe.processor.aggregate.window.datastructure.WindowOutput; import org.apache.iotdb.db.pipe.processor.aggregate.window.datastructure.WindowState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/downsampling/tumbling/TumblingTimeSamplingProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/downsampling/tumbling/TumblingTimeSamplingProcessor.java index ffe92db552d9a..2043d5a53cce4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/downsampling/tumbling/TumblingTimeSamplingProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/downsampling/tumbling/TumblingTimeSamplingProcessor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.pipe.processor.downsampling.tumbling; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.pipe.processor.downsampling.DownSamplingProcessor; import org.apache.iotdb.db.pipe.processor.downsampling.PartialPathLastObjectCache; import org.apache.iotdb.pipe.api.access.Row; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java index 5a276f29ccd49..fdb4143e6aaf2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java @@ -24,11 +24,11 @@ import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.pipe.sink.payload.legacy.PipeData; import org.apache.iotdb.db.pipe.sink.payload.legacy.TsFilePipeData; import org.apache.iotdb.db.protocol.session.SessionManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/DeletionLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/DeletionLoader.java index 7c94878d78f66..7d48a378bab7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/DeletionLoader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/DeletionLoader.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadFileException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/TsFileLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/TsFileLoader.java index 6875086aac585..cd7e85dfb0c53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/TsFileLoader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/TsFileLoader.java @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadFileException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult; 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 9ef6d29602322..4f4bfba136b28 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 @@ -647,10 +647,11 @@ private TSStatus loadSchemaSnapShot( .flatMap(parsedStatement -> batchVisitor.process(parsedStatement, null)) .ifPresent(statement -> results.add(executeStatementAndClassifyExceptions(statement))); } else if (treeOrTableStatement - instanceof org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement) { - final org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement originalStatement = - (org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement) - treeOrTableStatement; + instanceof org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement) { + final org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement + originalStatement = + (org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement) + treeOrTableStatement; if (!executionTypes.contains(StatementType.AUTO_CREATE_DEVICE_MNODE)) { continue; @@ -700,7 +701,7 @@ private TPipeTransferResp handleTransferSchemaPlan(final PipeTransferPlanNodeReq ? new TPipeTransferResp(executeStatementAndClassifyExceptions((Statement) statement)) : new TPipeTransferResp( executeStatementForTableModelWithPermissionCheck( - (org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement) statement, + (org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement) statement, null)); } @@ -1059,7 +1060,7 @@ private TSStatus executeStatementForTreeModel(final Statement statement) { } private TSStatus executeStatementForTableModelWithPermissionCheck( - final org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statement, + final org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statement, final String databaseName) { try { final TSStatus status = loginIfNecessary(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/converter/ValueConverter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/converter/ValueConverter.java index c1f59415d1939..3e8f39916859a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/converter/ValueConverter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/converter/ValueConverter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.pipe.receiver.transform.converter; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.utils.DataNodeDateTimeUtils; import org.apache.iotdb.db.utils.TypeInferenceUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java index 525418e5889f7..695a00834f3f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.pipe.receiver.visitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementExceptionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementExceptionVisitor.java index 5b57b24031465..42b1f0e5b1e3c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementExceptionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementExceptionVisitor.java @@ -22,9 +22,9 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; import org.apache.iotdb.db.exception.load.LoadRuntimeOutOfMemoryException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; import org.apache.iotdb.db.queryengine.plan.statement.Statement; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java index e7481fdda8ee9..c3b4950b20a40 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.receiver.visitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateOrUpdateDevice; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java index 0a1334d5047d8..e175113737a59 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.pipe.sink.payload.evolvable.request; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion; import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq; import org.apache.tsfile.utils.BytesUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java index 47c00bcf26510..145a4fe06f5d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.sink.payload.evolvable.request; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion; import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.receiver.protocol.thrift.IoTDBDataNodeReceiver; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2DeleteNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2DeleteNodeReq.java index c2fbd583d5805..c963322bece94 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2DeleteNodeReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2DeleteNodeReq.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.commons.consensus.index.ProgressIndex; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestType; import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestVersion; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TCommitId; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TIoTConsensusV2TransferReq; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.AbstractDeleteDataNode; import org.apache.tsfile.utils.PublicBAOS; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletBinaryReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletBinaryReq.java index de6c03b958d2c..1ce3f0b2a305d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletBinaryReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletBinaryReq.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.commons.consensus.index.ProgressIndex; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestType; import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestVersion; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TCommitId; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TIoTConsensusV2TransferReq; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletInsertNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletInsertNodeReq.java index 7484c46a47110..637560faee9cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletInsertNodeReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletInsertNodeReq.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.commons.consensus.index.ProgressIndex; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestType; import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestVersion; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TCommitId; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TIoTConsensusV2TransferReq; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.tsfile.utils.PublicBAOS; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java index dd5bc20ae1240..6133f33b94eea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.exception.pipe.PipeRuntimeCriticalException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeNonCriticalException; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.pipe.resource.log.PipeLogger; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.pipe.sink.protocol.opcua.OpcUaSink; import org.apache.iotdb.db.pipe.sink.util.sorter.PipeTableModelTabletEventSorter; import org.apache.iotdb.db.pipe.sink.util.sorter.PipeTreeModelTabletEventSorter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java index 44be8d5a31d2f..be01bb6f00a24 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java @@ -24,12 +24,12 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.pipe.resource.log.PipeLogger; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.pipe.event.common.statement.PipeStatementInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java index 3b98454fca154..91cf7f4b77f70 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.sink.util.builder; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; import org.apache.iotdb.db.storageengine.dataregion.flush.MemTableFlushTask; import org.apache.iotdb.db.storageengine.dataregion.memtable.IMemTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java index 71b1ba455f0bb..4e4b80a85c73a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.sink.util.builder; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.storageengine.dataregion.flush.MemTableFlushTask; import org.apache.iotdb.db.storageengine.dataregion.memtable.IMemTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java index 7aa311e7604ae..46b0785ab6aba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.consensus.DataRegionId; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.pipe.agent.task.PipeTaskAgent; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta; import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant; @@ -30,7 +31,6 @@ import org.apache.iotdb.commons.pipe.source.IoTDBSource; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.pipe.metric.overview.PipeTsFileToTabletsMetrics; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java index ccb84bf3216f1..c3467625fa98f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java @@ -27,6 +27,7 @@ import org.apache.iotdb.commons.consensus.index.impl.StateProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.TimeWindowStateProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.pipe.agent.task.PipeTaskAgent; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; @@ -41,7 +42,6 @@ import org.apache.iotdb.consensus.pipe.IoTConsensusV2; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.DataRegionConsensusImpl; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.pipe.consensus.ReplicateProgressDataNodeManager; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResourceManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java index 46290dbec03de..0124c46d2da1d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeNonCriticalException; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant; @@ -32,7 +33,6 @@ import org.apache.iotdb.commons.pipe.event.ProgressReportEvent; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent; import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java index 088f0f0467d2a..3faab85abf28b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java @@ -24,6 +24,11 @@ import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.queue.listening.AbstractPipeListeningQueue; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; @@ -36,11 +41,6 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionSnapshotEvent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java index ed60604a13b75..5aeb2aeca52b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.source.schemaregion; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java index 3a3b986097a9f..cddd26331b7ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.pipe.source.schemaregion; import org.apache.iotdb.commons.audit.IAuditEntity; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java index 9290779c86ba9..a5c7a6a4a8b9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.pipe.source.schemaregion; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePatternOperations; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java index de52db604e927..532547f7b1f0d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java @@ -22,12 +22,12 @@ import org.apache.iotdb.commons.audit.IAuditEntity; import org.apache.iotdb.commons.auth.entity.PrivilegeType; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePattern; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java index 5efef9e616693..99269d05cc9b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.source.schemaregion; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateOrUpdateDevice; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java index 112b4f447b5d4..470de5c8d811c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.source.schemaregion; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.BatchActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalCreateMultiTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java index e40d18045a7bd..a0d037b4d83ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.utils.PathUtils; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; import org.apache.iotdb.db.schemaengine.SchemaEngine; import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningQueue.java index 19099abbd007c..218ddf0a4a9e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningQueue.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningQueue.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.pipe.source.schemaregion; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.pipe.datastructure.queue.listening.AbstractPipeListeningQueue; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.SerializableEvent; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionSnapshotEvent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaSerializableEventType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/DataNodeInternalClient.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/DataNodeInternalClient.java index d520e94187599..0978337a96ea7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/DataNodeInternalClient.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/DataNodeInternalClient.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.IntoProcessException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeService.java index bb08fb537f991..5b4e3b128867f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeService.java @@ -23,8 +23,8 @@ import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; import org.apache.iotdb.commons.client.IClientManager; import org.apache.iotdb.commons.client.exception.ClientManagerException; +import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeService; import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; -import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeService; import org.apache.thrift.TException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeServiceProvider.java index e6a459850210a..8357d2e84cb76 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeServiceProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeServiceProvider.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.protocol.client.an; -import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeService; -import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider; +import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeService; +import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider; public class DataNodeTableFunctionAINodeServiceProvider implements ITableFunctionAINodeServiceProvider { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java index 4669530dda0a0..01a113eece5ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.protocol.session; import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion; +import org.apache.iotdb.commons.node_commons.common.ConnectionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; -import org.apache.iotdb.db.node_commons.common.ConnectionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.service.rpc.thrift.TSConnectionInfo; import org.apache.iotdb.service.rpc.thrift.TSConnectionType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/PreparedStatementInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/PreparedStatementInfo.java index 02fa32d57830c..bc68db61424ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/PreparedStatementInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/PreparedStatementInfo.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.protocol.session; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java index 4aa56cf0a74b0..ae6f03f03e6df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java @@ -26,6 +26,9 @@ import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.commons.node_commons.common.ConnectionInfo; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.service.JMXService; import org.apache.iotdb.commons.service.ServiceType; import org.apache.iotdb.commons.service.metric.MetricService; @@ -36,9 +39,6 @@ import org.apache.iotdb.db.audit.DNAuditLogger; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.auth.LoginLockManager; -import org.apache.iotdb.db.node_commons.common.ConnectionInfo; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.protocol.basic.BasicOpenSessionResp; import org.apache.iotdb.db.protocol.thrift.OperationType; import org.apache.iotdb.db.queryengine.plan.execution.config.session.PreparedStatementMemoryManager; 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 dadc5012ec384..65fe1d53aa7f7 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 @@ -35,6 +35,19 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.path.AlignedFullPath; @@ -47,19 +60,6 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.protocol.basic.BasicOpenSessionResp; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; @@ -417,7 +417,7 @@ private TSExecuteStatementResp executeStatementInternal( } } } else { - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement s = + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement s = request.getTableStatement(relationSqlParser, clientSession.getZoneId(), clientSession); if (s instanceof Use) { @@ -606,8 +606,8 @@ public Statement getTreeStatement(ZoneId zoneId) { } @Override - public org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement getTableStatement( - SqlParser parser, ZoneId zoneId, IClientSession clientSession) { + public org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement + getTableStatement(SqlParser parser, ZoneId zoneId, IClientSession clientSession) { return parser.createStatement(req.getStatement(), zoneId, clientSession); } @@ -650,8 +650,8 @@ public Statement getTreeStatement(ZoneId zoneId) { } @Override - public org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement getTableStatement( - SqlParser parser, ZoneId zoneId, IClientSession clientSession) { + public org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement + getTableStatement(SqlParser parser, ZoneId zoneId, IClientSession clientSession) { ensureParsed(); return executeStatement; } @@ -1690,7 +1690,7 @@ public TSPrepareResp prepareStatement(TSPrepareReq req) { String sql = req.getSql(); String statementName = req.getStatementName(); - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statement = + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statement = relationSqlParser.createStatement(sql, clientSession.getZoneId(), clientSession); if (statement == null) { @@ -2173,7 +2173,7 @@ public TSStatus executeBatchStatement(TSExecuteBatchStatementReq req) { } } else { - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement s = + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement s = relationSqlParser.createStatement( statement, clientSession.getZoneId(), clientSession); @@ -3624,7 +3624,7 @@ private ExecutionResult executeBatchStatement( * @return the execution result */ private ExecutionResult executeBatchTableStatement( - final org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statement, + final org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statement, final SqlParser relationSqlParser, final IClientSession clientSession, final long queryId, @@ -3635,7 +3635,7 @@ private ExecutionResult executeBatchTableStatement( final boolean userQuery) { ExecutionResult result = null; - List + List subStatements = statement.getSubStatements(); int totalSubStatements = subStatements.size(); LOGGER.info( @@ -3644,7 +3644,7 @@ private ExecutionResult executeBatchTableStatement( queryId); for (int i = 0; i < totalSubStatements; i++) { - final org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement subStatement = + final org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement subStatement = subStatements.get(i); LOGGER.info( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java index b9d519930dfac..fb5dfebab7857 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -64,6 +64,11 @@ import org.apache.iotdb.commons.enums.DataPartitionTableGeneratorState; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.partition.DataPartitionTable; import org.apache.iotdb.commons.partition.DatabaseScopedDataPartitionTable; import org.apache.iotdb.commons.path.ExtendedPartialPath; @@ -105,11 +110,6 @@ import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.partition.DataPartitionTableGenerator; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.protocol.client.ConfigNodeInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/NativeStatementRequest.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/NativeStatementRequest.java index 9ddd03471ca6d..7493e2684e660 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/NativeStatementRequest.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/NativeStatementRequest.java @@ -74,7 +74,7 @@ public interface NativeStatementRequest extends Supplier { * @param clientSession the client session * @return the parsed Table model Statement, or null if not supported */ - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement getTableStatement( + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement getTableStatement( SqlParser parser, ZoneId zoneId, IClientSession clientSession); /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java index 8231039748406..e298cd9c7d7d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java @@ -25,14 +25,14 @@ import org.apache.iotdb.commons.audit.AuditLogOperation; import org.apache.iotdb.commons.audit.IAuditEntity; import org.apache.iotdb.commons.auth.entity.PrivilegeType; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/QueryId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/QueryId.java index 0e78806e3e907..169ba3cd5cfb2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/QueryId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/QueryId.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.common; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ResultNodeContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ResultNodeContext.java index 648b322c764fc..0381fb3e870da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ResultNodeContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ResultNodeContext.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.common; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; public class ResultNodeContext { 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 f37fb5b731283..30fc7e6c516c8 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,9 +19,9 @@ package org.apache.iotdb.db.queryengine.common.header; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.commons.schema.column.ColumnHeader; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import com.google.common.primitives.Bytes; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTree.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTree.java index 54a7f6fc8c781..32abaf5bf16ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTree.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/ClusterSchemaTree.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.common.schematree; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.template.Template; @@ -26,7 +27,6 @@ import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.exception.metadata.PathNotExistException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.schematree.node.SchemaEntityNode; import org.apache.iotdb.db.queryengine.common.schematree.node.SchemaInternalNode; import org.apache.iotdb.db.queryengine.common.schematree.node.SchemaMeasurementNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java index f94a974e25c21..4eee8a0562fd7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java index 0439bb3718275..a5f915155eb0f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; +import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDFParametersFactory; -import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.udf.api.State; import org.apache.iotdb.udf.api.UDAF; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java index 65e7a499f70fe..a3c951b16a765 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java index bde7e1ee38a07..5eb38618154df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java index 693620b94652d..a3df0481ed908 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java index ceb691a4bdb04..73ebd4b9c5c61 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java index 55bd3d967dd58..688459ac016db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java index a1ad4f5ecb8a7..c651cecd08b81 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/AggrWindowIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/AggrWindowIterator.java index cc80c89921e8b..176ae4621b4bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/AggrWindowIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/AggrWindowIterator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.tsfile.read.common.TimeRange; import org.apache.tsfile.utils.TimeDuration; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TimeRangeIteratorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TimeRangeIteratorFactory.java index e2cc5ed5434a3..0e905ab3e5861 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TimeRangeIteratorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TimeRangeIteratorFactory.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.tsfile.utils.TimeDuration; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java index d153e05f69631..db0a8069a8bac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.driver; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java index 2136db2a24d7f..104e5b90ae315 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.template.Template; @@ -41,7 +42,6 @@ import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; import org.apache.iotdb.db.exception.metadata.MeasurementAlreadyExistException; import org.apache.iotdb.db.exception.metadata.SchemaQuotaExceededException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.protocol.thrift.impl.DataNodeRegionManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java index 1fe1f0f02dc79..18d7eed3cb656 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java @@ -25,6 +25,8 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.PatternTreeMap; @@ -33,8 +35,6 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java index 513daf61f9142..4b7bc8e874cac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java @@ -26,9 +26,9 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.QueryTimeoutException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.driver.IDriver; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/INodeCommonFragmentInstanceContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/INodeCommonFragmentInstanceContext.java new file mode 100644 index 0000000000000..596529c46db99 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/INodeCommonFragmentInstanceContext.java @@ -0,0 +1,27 @@ +/* + * 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.execution.fragment; + +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; + +public interface INodeCommonFragmentInstanceContext { + + FragmentInstanceId getId(); + + SessionInfo getSessionInfo(); + + boolean mayHaveTmpFile(); +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java index 2de14e8037989..6dfb9824cd40d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.db.node_commons.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.SingleTimeWindowIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java index 9653b4a39cfbb..c8b5bbc49e543 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java index fd44ca26d4c5c..fbd847d09b08e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java @@ -24,12 +24,12 @@ import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java index cef87ab5b139d..8eda8b882d658 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java index 371aaea226dc6..d61db10f4ca97 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java index ee16d5936ecaa..c7c8e7af016b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java index 33d6dfea4f46a..929a31d614e41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/ColumnInjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java index 37a89a9db0f03..7df06698676d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.columngenerator.ColumnGenerator; 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 efd2514790324..5107e953fc91a 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 @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; @@ -26,8 +28,6 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.IntoProcessException; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java index 8d4b779c2b66c..ed95cdc40f61b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/InsertTabletStatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/InsertTabletStatementGenerator.java index 90f34fb4df9ef..d819fbbcc5352 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/InsertTabletStatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/InsertTabletStatementGenerator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java index 768bbbad6768b..51ef377768f4d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java index ca0715b3c3eda..98015095cc4a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/SingleDeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java index 2069bce5012ec..d517602d404f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java index aa3b0ac29450a..41935c17a4b63 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow.SlidingWindowAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableInsertTabletStatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableInsertTabletStatementGenerator.java index 29fa126bd8cc9..3df82abbcb88f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableInsertTabletStatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableInsertTabletStatementGenerator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java index b92f2e19f5fad..de7041c487ebd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; 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.table.column.TsTableColumnCategory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java index 583d4713711f6..687af382d0467 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; 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/TransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java index ade8e09f3384c..d2180351c93e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeInsertTabletStatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeInsertTabletStatementGenerator.java index cf29cea813d02..3b4ac312539f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeInsertTabletStatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeInsertTabletStatementGenerator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java index d4998c9015c1f..465582af3a31c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; 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.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java index f55c38c645cb5..43c33a94855fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java @@ -22,12 +22,12 @@ import org.apache.iotdb.ainode.rpc.thrift.TInferenceReq; import org.apache.iotdb.ainode.rpc.thrift.TInferenceResp; import org.apache.iotdb.commons.client.exception.ClientManagerException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; import org.apache.iotdb.db.exception.runtime.ModelInferenceProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.protocol.client.an.AINodeClient; import org.apache.iotdb.db.protocol.client.an.AINodeClientManager; 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/copyto/CopyToOptions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/CopyToOptions.java index 51f0189954f11..17f5ed8e80be2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/CopyToOptions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/CopyToOptions.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.copyto; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.schema.column.ColumnHeader; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.CopyToTsFileOptions; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.planner.RelationPlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java index 6971475c4316d..171795ab497b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.copyto; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.CopyToTsFileOptions; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.TsFileFormatCopyToWriter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java index 22d7e1f7863aa..3baf72b922957 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.planner.RelationPlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java index a32367649480a..65f4a7223d06d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.ColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java index 0e7cd8256c67c..697cb70f3ad03 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java index df0473a03041c..26f9c17006408 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java index 99dcbf2e560f2..af95c9e78ea0b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java index 6a5ec86cc2aa7..e4a959fb9fa76 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MultiColumnMerger.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MultiColumnMerger.java index 18e9cc4cb2043..3a200ad95a26d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MultiColumnMerger.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MultiColumnMerger.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/NonOverlappedMultiColumnMerger.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/NonOverlappedMultiColumnMerger.java index cf8c04ad79700..7083861adab6b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/NonOverlappedMultiColumnMerger.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/NonOverlappedMultiColumnMerger.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SingleColumnMerger.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SingleColumnMerger.java index 9040ad63995b3..7fa664305bd43 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SingleColumnMerger.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SingleColumnMerger.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java index 6c159e2672746..6b3cc5fc5b9ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; 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.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java index d5a7f92aff957..f88d731376601 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java index 276e62d08960b..deef564d179b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java index 09e69af85c1ae..e59c7c2adfac0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java index d573f9a234fea..72c30c5a428fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java index a80bccfed9cdb..aab7c4fc2e2ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryUtil.java index 0640c03faa32a..8931f1025635c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryUtil.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.LastValueDescAccumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.MaxTimeDescAccumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java index 26e960db04093..084dbd995f9e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java index 6b73ede4a6f6b..9eeeb45fcd263 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java index f1851eeb5901c..843ce5abb9fc6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java index 8fe4604ea907d..93a0a4ed45787 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 314a931cc524e..d11d840f0db9a 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,12 +20,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.common.rpc.thrift.TSchemaNode; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; 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.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 e2a08deaa6830..70c4dc4fb62b6 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 @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; 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.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 7b1fa1f9385ff..69038f85f8fe4 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java index bd55f5103b7bb..0eb674ada0e53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java index 18c7a2bf9eae8..a0f3a6ea3c96a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java index aa65e3441d5d6..dcaa643bc9039 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.common.schematree.node.SchemaNode; 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/SchemaQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java index 3f7d49ab588b5..b1fd6b2e6ea47 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 e9fccdfedf974..3f6148914a4f9 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 0ba4335eee36d..d8dfdb10df848 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,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.column.ColumnHeader; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java index b4abb30ef0fa0..8435d2160b596 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; 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/sink/ShuffleHelperOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java index e0b62aa5d3d2a..d33298cef0119 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; 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/source/AbstractRegionScanDataSourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractRegionScanDataSourceOperator.java index 6c48c8060158d..92a99b9b0e5df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractRegionScanDataSourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractRegionScanDataSourceOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java index d5fffd6b14b8d..30d48b91895df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/source/AbstractSourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java index 1ff2f70bee025..317d27f2fd3df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; public abstract class AbstractSourceOperator extends AbstractOperator implements SourceOperator { 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 916921e3c870f..4f2329eb2e6fa 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 @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; 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.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; 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 0f2b940a3a62e..2b91d6c19b99e 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.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; 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/source/AlignedSeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java index 8ad102ef9f904..061266b7679e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/source/AlignedSeriesScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java index 3bdb8f78d9d9f..32ca6c779b21c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java index 8a7c2fda8dbc3..f11573d566efa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.source.ISourceHandle; 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/source/LastCacheScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java index 1ffa6542a8359..fc2457a5a8ca7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java index d8ba1cf7989ca..ba37f287b1698 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.IFullPath; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/source/SeriesScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java index 5d35db1e16146..09565a01bd766 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.IFullPath; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java index 09dc225f9a025..ce19f52241751 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java index c47f5d46a5326..96d6ff5135f4f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java index f42ddd4ce6bd8..c286548f857ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; public interface SourceOperator extends Operator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java index c72ec1b1a0041..60d307090d05b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java index c39cbdbd12116..fe6a236ec1ee6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java index 6362a28e5d093..d55b47cb8203f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractSeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanUtil; @@ -48,7 +48,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanOperator.appendDataIntoBuilder; import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter.DEVICE_NUMBER; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java index b4a0114a617cd..495254aca65f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java @@ -21,9 +21,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java index a3b18234c3ad9..cb0f72849bd05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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 index 67a9ad7b674c4..5cdaee77bc97c 100644 --- 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 @@ -31,6 +31,14 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; +import org.apache.iotdb.commons.node_commons.common.ConnectionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.relational.function.TableBuiltinTableFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.util.ReservedIdentifiers; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; @@ -65,14 +73,6 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.ConnectionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ReservedIdentifiers; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; 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 index 579eb316ca982..8303fc262ca0c 100644 --- 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 @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java index 46340e68e31af..46d122b307de5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; @@ -51,8 +51,8 @@ import java.util.concurrent.TimeUnit; import static com.google.common.base.Preconditions.checkState; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; -import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_PRIMITIVE_TYPE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_TIME_VALUE_PAIR; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java index 71ced322fb8a2..34a1907ac59f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java index 71537fc373f2d..fac0c175f1bf9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java index fc1f294a7d835..cf0e33838601e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ainode/InferenceWindowParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ainode/InferenceWindowParameter.java index b9ab1343c3b83..1d2194c3eafbd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ainode/InferenceWindowParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/window/ainode/InferenceWindowParameter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.window.ainode; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java index 5242b8d3a11bd..8fbeade8b86ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.StartupException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.service.IService; import org.apache.iotdb.commons.service.ServiceType; import org.apache.iotdb.commons.utils.TestOnly; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.exception.CpuNotEnoughException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java index f808ca137b34d..3452102b1f14e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.schedule; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.exception.CpuNotEnoughException; 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 a8b11dea77daa..0e5dda0a9595f 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 @@ -30,22 +30,22 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.memory.IMemoryBlock; import org.apache.iotdb.commons.memory.MemoryBlockType; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryTimeoutRuntimeException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.PreparedStatementInfo; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; @@ -432,7 +432,7 @@ private IQueryExecution createQueryExecutionForTreeModel( * along with CTE query dataset. */ public ExecutionResult executeForTableModel( - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statement, + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statement, SqlParser sqlParser, IClientSession clientSession, long queryId, @@ -468,7 +468,7 @@ public ExecutionResult executeForTableModel( } public ExecutionResult executeForTableModel( - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statement, + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statement, SqlParser sqlParser, IClientSession clientSession, long queryId, @@ -549,7 +549,7 @@ public ExecutionResult executeForTreeModel( /** For compatibility of MQTT and REST, this method should never be called. */ @Deprecated public ExecutionResult executeForTableModel( - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statement, + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statement, SqlParser sqlParser, IClientSession currSession, Long queryId, @@ -601,7 +601,7 @@ private IQueryExecution createQueryExecutionForTableModel( } private IQueryExecution createQueryExecutionForTableModel( - final org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statement, + final org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statement, final SqlParser sqlParser, final IClientSession clientSession, final MPPQueryContext queryContext, @@ -688,12 +688,14 @@ private IQueryExecution createQueryExecutionForTableModel( queryContext)); } // Initialize variables for TableModelPlanner - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement statementToUse = statement; + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statementToUse = + statement; List parameters = Collections.emptyList(); Map, Expression> parameterLookup = Collections.emptyMap(); // Unwrap Explain/ExplainAnalyze to check for inner Execute/ExecuteImmediate - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement innerStatement = statement; + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement innerStatement = + statement; if (statement instanceof Explain) { innerStatement = ((Explain) statement).getStatement(); } else if (statement instanceof ExplainAnalyze) { @@ -710,7 +712,7 @@ private IQueryExecution createQueryExecutionForTableModel( String.format("Prepared statement '%s' does not exist", statementName)); } - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement resolvedSql = + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement resolvedSql = preparedInfo.getSql(); parameterLookup = ParameterExtractor.bindParameters(resolvedSql, executeStatement.getParameters()); @@ -730,7 +732,7 @@ private IQueryExecution createQueryExecutionForTableModel( String sql = executeImmediateStatement.getSqlString(); List literalParameters = executeImmediateStatement.getParameters(); - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement resolvedSql = + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement resolvedSql = sqlParser.createStatement(sql, clientSession.getZoneId(), clientSession); if (!literalParameters.isEmpty()) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java index 3dc50e768b7a8..065dbebccf135 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java @@ -26,11 +26,11 @@ import org.apache.iotdb.common.rpc.thrift.TSchemaNode; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.model.ModelInformation; +import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.template.Template; -import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java index 6ec02317dbdc8..d0406bc1e373f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java @@ -24,21 +24,21 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.confignode.rpc.thrift.TRegionRouteMapResp; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; import org.apache.iotdb.db.protocol.client.ConfigNodeInfo; 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 f853cba65c785..ec4b531808a6d 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 @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.SchemaNodeManagementPartition; @@ -45,7 +46,6 @@ import org.apache.iotdb.db.exception.ainode.GetModelInfoException; import org.apache.iotdb.db.exception.metadata.template.TemplateIncompatibleException; import org.apache.iotdb.db.exception.metadata.view.UnsupportedViewException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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 5e2f73220e1c1..5f3d8c794f231 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 @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.analyze; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinScalarFunction; +import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; 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.db.calc_commons.utils.constant.SqlConstant; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.udf.BuiltinScalarFunction; -import org.apache.iotdb.db.node_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.expression.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java index 699008ab74d18..ffbc614bb2c87 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.analyze; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.binary.ArithmeticBinaryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java index a220fdf2883d3..5431aaf3b268a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/GroupByLevelHelper.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.analyze; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java index fa690e71cb9fb..878367a2cbe62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.analyze; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; @@ -284,7 +284,7 @@ public static Filter convertPredicateToTimeFilter(Expression predicate) { } public static Filter convertPredicateToTimeFilter( - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression predicate, + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression predicate, ZoneId zoneId, TimeUnit currPrecision) { if (predicate == null) { @@ -312,7 +312,7 @@ public static Filter convertPredicateToFilter( } public static Filter convertPredicateToFilter( - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression predicate, + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression predicate, Map measurementColumnsIndexMap, Map schemaMap, String timeColumnName, @@ -442,7 +442,7 @@ public static boolean predicateCanPushIntoScan(Expression predicate) { } public static boolean predicateCanPushIntoScan( - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression predicate) { + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression predicate) { return new org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate .PredicatePushIntoScanChecker() .process(predicate, null); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java index 7e23b0b4590fb..aee41a925fd2c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/SelectIntoUtils.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.analyze; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.Expression; 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/analyze/TemplatedAggregationAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAggregationAnalyze.java index ddf6b75a44261..88426a8e21134 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 @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.queryengine.plan.analyze; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.template.Template; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.expression.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java index 21b8d9d8dc105..b99a7bc20d273 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.analyze; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.template.Template; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.DeviceSchemaInfo; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java index 3bfe91c75d153..891471f009187 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.analyze; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java index cd19b38a74d4a..adbcba044ec48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.analyze; -import org.apache.iotdb.db.node_commons.plan.analyze.ITableTypeProvider; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; +import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil; import com.google.common.collect.ImmutableMap; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java index 4829b4808050f..c60d2b92a2d66 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java @@ -22,14 +22,14 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.auth.AuthException; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadAnalyzeException; import org.apache.iotdb.db.exception.load.LoadAnalyzeTypeMismatchException; import org.apache.iotdb.db.exception.load.LoadEmptyFileException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java index 83434caf438c9..174b615c7f84d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java @@ -20,6 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.analyze.load; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.commons.path.PatternTreeMap; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema; @@ -28,9 +31,6 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadAnalyzeException; import org.apache.iotdb.db.exception.load.LoadRuntimeOutOfMemoryException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult; import org.apache.iotdb.db.queryengine.plan.execution.config.executor.ClusterConfigTaskExecutor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java index a03a3522dd4ee..f2864cd588ec6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.consensus.ConfigRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; @@ -38,7 +39,6 @@ import org.apache.iotdb.db.exception.load.LoadAnalyzeTypeMismatchException; import org.apache.iotdb.db.exception.load.LoadFileException; import org.apache.iotdb.db.exception.load.LoadRuntimeOutOfMemoryException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; import org.apache.iotdb.db.protocol.client.ConfigNodeInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/AutoCreateSchemaExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/AutoCreateSchemaExecutor.java index 2c6ed30cd75ec..8143277a19853 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/AutoCreateSchemaExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/AutoCreateSchemaExecutor.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.template.Template; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadAnalyzeTypeMismatchException; -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.schematree.ClusterSchemaTree; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java index ecd7539107b44..f677082cbd069 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.analyze.schema; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; 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 362e33a45e90b..86698fe0fa17a 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 @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.execution; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; 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 8f95906fc8d10..9cedd1e4ef36a 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 @@ -23,13 +23,13 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.KilledByOthersException; import org.apache.iotdb.db.exception.query.QueryTimeoutRuntimeException; -import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; 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 1c7e41ed649cd..5e79fb72cd8a1 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 @@ -22,8 +22,8 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.execution.QueryStateMachine; 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 9d584c1188482..60ce359dfd42c 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 @@ -28,8 +28,17 @@ import org.apache.iotdb.commons.auth.entity.User; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; import org.apache.iotdb.commons.executable.ExecutableManager; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant; @@ -44,15 +53,6 @@ import org.apache.iotdb.db.audit.DNAuditLogger; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBConfig; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; @@ -276,11 +276,11 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.TTL_INFINITE; import static org.apache.iotdb.commons.executable.ExecutableManager.getUnTrustedUriErrorMsg; import static org.apache.iotdb.commons.executable.ExecutableManager.isUriTrusted; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.commons.schema.table.TsTable.TABLE_ALLOWED_PROPERTIES; import static org.apache.iotdb.commons.schema.table.TsTable.TIME_COLUMN_NAME; import static org.apache.iotdb.commons.schema.table.TsTable.TTL_PROPERTY; -import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask.DATA_REGION_GROUP_NUM_KEY; import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask.SCHEMA_REGION_GROUP_NUM_KEY; import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational.CreateDBTask.TIME_PARTITION_INTERVAL_KEY; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TreeConfigTaskVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TreeConfigTaskVisitor.java index 1ea10ef37e840..b5e3af2334290 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TreeConfigTaskVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TreeConfigTaskVisitor.java @@ -23,12 +23,12 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.auth.entity.User; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; import org.apache.iotdb.commons.executable.ExecutableManager; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.config.constant.SystemConstant; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.execution.config.metadata.AlterEncodingCompressorTask; import org.apache.iotdb.db.queryengine.plan.execution.config.metadata.AlterTimeSeriesTask; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java index 3b8e37943ab71..16c11cb1aaba0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java @@ -57,8 +57,12 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.executable.ExecutableManager; import org.apache.iotdb.commons.executable.ExecutableResource; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; @@ -179,10 +183,6 @@ import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.metadata.SchemaQuotaExceededException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.source.dataregion.DataRegionListeningFilter; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java index 0cb937023154f..10f31dc8c5dc3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java @@ -24,6 +24,8 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.common.rpc.thrift.TSetConfigurationReq; import org.apache.iotdb.commons.cluster.NodeStatus; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.schema.cache.CacheClearOptions; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; @@ -31,8 +33,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TFetchTableResp; import org.apache.iotdb.confignode.rpc.thrift.TSpaceQuotaResp; import org.apache.iotdb.confignode.rpc.thrift.TThrottleQuotaResp; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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 fb7a7c8af776a..746e563fd627c 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,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.metadata; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; 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.node_commons.utils.DateTimeUtils; 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 0e47ee2522801..0415127999582 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,17 +20,17 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.metadata; import org.apache.iotdb.common.rpc.thrift.Model; +import org.apache.iotdb.commons.node_commons.plan.relational.function.TableBuiltinTableFunction; +import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinScalarFunction; +import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; +import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; 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.relational.TableBuiltinAggregationFunction; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; -import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; -import org.apache.iotdb.db.node_commons.plan.udf.BuiltinAggregationFunction; -import org.apache.iotdb.db.node_commons.plan.udf.BuiltinScalarFunction; -import org.apache.iotdb.db.node_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; -import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; 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/ShowRegionTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowRegionTask.java index dff3229965c8e..daf9fea76a57b 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,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.metadata; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.utils.FileUtils; 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.node_commons.utils.DateTimeUtils; 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 41ef30916dc9a..332949bcb5a17 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.node_commons.common.SessionInfo; import org.apache.iotdb.commons.schema.column.ColumnHeader; -import org.apache.iotdb.db.node_commons.common.SessionInfo; 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/ShowCreateViewTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowCreateViewTask.java index f4a8578c1e7e2..42f6397083a41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowCreateViewTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowCreateViewTask.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.exception.sql.SemanticException; 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/PrepareTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PrepareTask.java index 7fe890dd7f913..2188726132314 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PrepareTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PrepareTask.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.session; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; 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/PreparedStatementHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PreparedStatementHelper.java index 84d3c30ab800b..7873e247509e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PreparedStatementHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PreparedStatementHelper.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.session; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.PreparedStatementInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PreparedStatementMemoryManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PreparedStatementMemoryManager.java index 9d5a3fb098e5c..e0d318fce75b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PreparedStatementMemoryManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PreparedStatementMemoryManager.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.session; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.memory.IMemoryBlock; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.PreparedStatementInfo; import org.apache.iotdb.db.queryengine.plan.Coordinator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/SetSqlDialectTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/SetSqlDialectTask.java index 761efe1c5aed0..75e0e4abbb23e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/SetSqlDialectTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/SetSqlDialectTask.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.session; -import org.apache.iotdb.db.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; 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; 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 949c18303a745..9a581ad1e2eb6 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.node_commons.utils.DateTimeUtils; 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.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; 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 065b459537bae..7982f3f08440f 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 @@ -22,11 +22,11 @@ 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.node_commons.plan.planner.plan.node.PlanNode; 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.node_commons.plan.planner.plan.node.PlanNode; 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 7c2535a49ebcc..43ea8d07b0042 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,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.execution.memory; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.schema.column.ColumnHeader; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java index fd18cd98ed398..6304f3448be10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression; +import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java index fafea1a1f58ba..b9c0f4abe364d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java index 2dd1188b91e90..61e3242e9d5ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression.binary; +import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java index 98b78740ae7ad..f3b3a30b9e7e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.leaf; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java index cda2fe0153d61..27b65cb9dfd1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.leaf; +import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java index d4ae229171af1..d408410043325 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.leaf; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java index dbc82a3b7156e..6cb3195c90081 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression.leaf; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java index 459cb75340308..0dca5214af87e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.leaf; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java index 5171f41f81fc8..4988c552ef91d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.expression.multi.FunctionType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.expression.multi.FunctionType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.node_commons.plan.udf.BuiltinAggregationFunction; -import org.apache.iotdb.db.node_commons.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; 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/expression/multi/builtin/BuiltInScalarFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java index d416b1c1e370a..d7798661e5294 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java index de65da11ae3d0..d335091cc80cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java index ab8998f34ab16..ee9c60f6c834c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java index 09502a4dd4b39..1ddef210f9b7e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java index a58297449a319..805536a2ac18d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java index ae2e67a5ad399..15c184d0178b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java index d9bc16189495b..f8390678b932f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression.other; +import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java index d18eb56952b6d..e82387e629575 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.other; +import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java index 63cc341e80f82..6c2c0fd1c6e7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.ternary; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java index 921d873399caf..4c78297fe2ef7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java @@ -21,9 +21,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.ternary; +import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java index 78536161df562..227c080ad712a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java index 3baf8dcffd4fe..17c051a9de89c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java index fcf43f21c1a44..674e5aa41e4d4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java index 5c8bcf651267e..353379da9270c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java index b6b0bb453dda5..7c85398b950b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java index bd5a4323188cb..c364273ad0578 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java index 0f39aeb0e3014..3cb7fd5ac6330 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; +import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; 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 13df1ff2c2bd8..759d8457c4fda 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 @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.exception.SemanticException; 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.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/expression/visitor/ColumnTransformerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java index 74e0a6ced9dda..a1149e22dfc97 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; +import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.TreeCaseWhenThenColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; @@ -50,8 +52,6 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.RegularColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java index f8bb7b8dbe7bd..bac3b533f0c7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CompleteMeasurementSchemaVisitor.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.metadata.view.BrokenViewException; -import org.apache.iotdb.db.exception.sql.SemanticException; 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.binary.BinaryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java index 0713242fdf7b7..405ec519f234c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; 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.multi.FunctionExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java index 6e4600cd8e50d..9e5758d4bc0a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; +import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java index b6023a52853c1..3b0f39a01fb13 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java index 79fdd754f273a..0ff52b29756a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForHavingVisitor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; import org.apache.iotdb.db.queryengine.plan.expression.Expression; 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/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java index e263970ed8006..1dfa37d386b56 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForPredicateVisitor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.expression.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java index 866324b2c2329..ed21f4365f699 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java index 24a6af124c7df..8bdee51b162d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; 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 1a3d64f43a303..7db7d383f2472 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 @@ -21,16 +21,16 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; 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.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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/optimization/ColumnInjectionPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java index 42993dba4d306..1d606e1f4ac04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; 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/optimization/LimitOffsetPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java index f8ed47f8c33c6..f502b72cfa26b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.optimization; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java index 9c69c699ae5fc..d3e86dd64882c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy.LINEAR; +import static org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy.LINEAR; import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TopKNode.LIMIT_VALUE_USE_TOP_K; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PlanOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PlanOptimizer.java index 803c40d1e06ee..da5355a2527a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PlanOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PlanOptimizer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java index b0f2c66be70be..c9c92a0a6025c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.optimization; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; 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.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; 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 c7ba85897c77d..5746ee12effdf 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 @@ -28,6 +28,19 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.cq.TimeoutPolicy; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataTypeParameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; @@ -41,19 +54,6 @@ import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataTypeParameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; -import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.ConstantContext; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.CountDatabasesContext; @@ -305,6 +305,8 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.COLUMN_TIMESERIES_COMPRESSION; import static org.apache.iotdb.commons.conf.IoTDBConstant.COLUMN_TIMESERIES_COMPRESSOR; import static org.apache.iotdb.commons.conf.IoTDBConstant.COLUMN_TIMESERIES_ENCODING; +import static org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; +import static org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils.currPrecision; import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_RESULT_NODES; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; @@ -321,8 +323,6 @@ import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_IS_STANDARD; import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_LENGTH; import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_START; -import static org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; -import static org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils.currPrecision; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.canPushDownLimitOffsetToGroupByTime; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.pushDownLimitOffsetToTimeParameter; import static org.apache.iotdb.db.queryengine.plan.relational.sql.parser.AstBuilder.lowerIdentifier; @@ -5028,13 +5028,13 @@ private Property parseProperty(final IoTDBSqlParser.PropertyContext ctx) { .literalExpression())); } - private org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression parseExpression( + private org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression parseExpression( final IoTDBSqlParser.LiteralExpressionContext context) { if (context.STRING_LITERAL() != null) { - return new org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral( + return new org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral( parseStringLiteral(context.getText())); } else if (context.INTEGER_LITERAL() != null) { - return new org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral( + return new org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral( context.getText()); } throw new UnsupportedOperationException("Currently other expressions are not supported"); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java index b28d78ca89e16..63d932c017931 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java @@ -22,13 +22,13 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.SqlLexer; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index eff1e970ded16..20a393cd30e72 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -17,6 +17,19 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; @@ -35,19 +48,6 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.TableDateBinTimeRangeIterator; @@ -172,6 +172,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; @@ -185,7 +186,6 @@ import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.MAX; import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.MIN; import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUM; -import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.common.DataNodeEndPoints.isSameNode; import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DELIMITER_BETWEEN_ID; import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DOWNSTREAM_PLAN_NODE_ID; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java index 9a37072fb20c0..133fe593fcda4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java @@ -18,12 +18,12 @@ */ package org.apache.iotdb.db.queryengine.plan.planner; +import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.plan.planner.ITableOperatorGeneratorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.analyze.ITableTypeProvider; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java index 1ddc593f1fcce..f66e0db29eec6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java @@ -22,14 +22,14 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.memory.IMemoryBlock; import org.apache.iotdb.commons.memory.MemoryBlockType; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; @@ -54,7 +54,7 @@ import java.util.Map; import java.util.Objects; -import static org.apache.iotdb.db.node_commons.common.SqlDialect.TREE; +import static org.apache.iotdb.commons.node_commons.common.SqlDialect.TREE; /** * Used to plan a fragment instance. One fragment instance could be split into multiple pipelines so 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 f915417b954cb..aa55a97181e27 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 @@ -23,6 +23,9 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.common.rpc.thrift.TSchemaNode; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; @@ -30,9 +33,6 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.template.Template; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; @@ -126,11 +126,11 @@ import java.util.stream.Collectors; import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; +import static org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy.LINEAR; 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.calc_commons.utils.constant.SqlConstant.LAST_VALUE; import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.MAX_TIME; -import static org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy.LINEAR; 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; 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 47695ce2683b5..fe5b2f21da0cd 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.expression.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanner.java index 580040ff5297f..bb475949f36e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanner.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index d0354b3028406..9a9c5d55fff7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -22,6 +22,13 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.model.ModelInformation; +import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.IFullPath; @@ -48,13 +55,6 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/SubPlanTypeExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/SubPlanTypeExtractor.java index 0c01957018bed..0421c2852df95 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/SubPlanTypeExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/SubPlanTypeExtractor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.AlignedPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; 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 128c998b4f77a..e49fd0a2f4e82 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 @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; 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 0a7d369565854..486aa7a798d01 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 @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; 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.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.expression.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanner.java index 06d811b04a031..b96d3f613161c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanner.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java index 7f4beb55d6d69..3c836604f3ffc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.partition.DataPartition; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; 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/distribution/NodeGroupContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NodeGroupContext.java index 2ee389c740371..766b331b1108e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NodeGroupContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NodeGroupContext.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.partition.DataPartition; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryNode; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java index d9005b42bec7c..10089c0763acf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.plan.ClusterTopology; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java index 710c00501e1db..cf92eb239be49 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java @@ -23,6 +23,12 @@ import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.expression.multi.FunctionType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; @@ -31,12 +37,6 @@ import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.expression.multi.FunctionType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java index 392868bcf0552..7877b11869762 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.partition.StorageExecutor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.ClusterTopology; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java index f64272fa728a0..4be909d7a2d03 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; public class PipelineMemoryEstimatorFactory { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/AbstractFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/AbstractFragmentParallelPlanner.java index 029a09ab31d44..442d31c6c16f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/AbstractFragmentParallelPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/AbstractFragmentParallelPlanner.java @@ -24,12 +24,12 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.enums.ReadConsistencyLevel; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.partition.QueryExecutor; import org.apache.iotdb.commons.partition.StorageExecutor; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/FragmentInstance.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/FragmentInstance.java index 0e531ffe641b9..195b7735ad7c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/FragmentInstance.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/FragmentInstance.java @@ -22,13 +22,13 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.partition.ExecutorType; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/LogicalQueryPlan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/LogicalQueryPlan.java index 7a80e5bf53d5b..0ee6cecb0d5f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/LogicalQueryPlan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/LogicalQueryPlan.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; /** 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 56c8b957e41e7..596e0d0f4b406 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 @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPartitionRelatedNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.partition.DataPartition; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPartitionRelatedNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.SubPlanTypeExtractor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java index 900a8b33d879c..7611c20054eca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java index cd61a2f5737a9..cac78ceae7d0c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java @@ -43,7 +43,7 @@ static TimePredicate deserialize(ByteBuffer byteBuffer) { return new TreeModelTimePredicate(Expression.deserialize(byteBuffer)); } else { return new TableModelTimePredicate( - org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression.deserialize( + org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression.deserialize( byteBuffer)); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java index a8688639f5233..5288ab072beb7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import java.util.Collections; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializer.java index ebd8ae8d2477c..9351553f00100 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializer.java @@ -14,8 +14,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.CommonPlanNodeDeserializer; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.CommonPlanNodeDeserializer; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePieceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializerProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializerProvider.java index f712056471fa6..4119eabd89fc0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializerProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializerProvider.java @@ -14,8 +14,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializer; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanNodeDeserializer; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider; public class DataNodePlanNodeDeserializerProvider implements IPlanNodeDeserializerProvider { @Override 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 15c03f5e09c6b..8db4b9e8fa953 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import java.io.DataOutputStream; import java.io.IOException; 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 4a16287c2dc37..c3d94a6f6ef00 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 @@ -21,33 +21,33 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; @@ -715,13 +715,14 @@ public List visitTableScan(TableScanNode node, GraphContext context) { @Override public List visitAggregation( - org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode node, + org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Aggregation-%s", node.getPlanNodeId().getId())); boxValue.add(String.format("OutputSymbols: %s", node.getOutputSymbols())); int i = 0; - for (org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Aggregation + for (org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode + .Aggregation aggregation : node.getAggregations().values()) { StringBuilder aggregator = new StringBuilder( @@ -754,7 +755,8 @@ public List visitAggregationTableScan( boxValue.add(String.format("QualifiedTableName: %s", node.getQualifiedObjectName().toString())); boxValue.add(String.format("OutputSymbols: %s", node.getOutputSymbols())); int i = 0; - for (org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Aggregation + for (org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode + .Aggregation aggregation : node.getAggregations().values()) { StringBuilder aggregator = new StringBuilder( @@ -821,7 +823,7 @@ public List visitMarkDistinct(MarkDistinctNode node, GraphContext contex @Override public List visitFilter( - org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode node, + org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Filter-%s", node.getPlanNodeId().getId())); @@ -831,7 +833,7 @@ public List visitFilter( @Override public List visitProject( - org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode node, + org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Project-%s", node.getPlanNodeId().getId())); @@ -929,7 +931,7 @@ public List visitTableExchange(ExchangeNode node, GraphContext context) @Override public List visitLimit( - org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode node, + org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Limit-%s", node.getPlanNodeId().getId())); @@ -946,7 +948,7 @@ public List visitEnforceSingleRow(EnforceSingleRowNode node, GraphContex @Override public List visitOffset( - org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode node, + org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Offset-%s", node.getPlanNodeId().getId())); @@ -956,7 +958,7 @@ public List visitOffset( @Override public List visitSort( - org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode node, + org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Sort-%s", node.getPlanNodeId().getId())); @@ -995,7 +997,7 @@ public List visitGroup(GroupNode node, GraphContext context) { @Override public List visitMergeSort( - org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode node, + org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("MergeSort-%s", node.getPlanNodeId().getId())); @@ -1006,7 +1008,7 @@ public List visitMergeSort( @Override public List visitCollect( - org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode node, + org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Collect-%s", node.getPlanNodeId().getId())); @@ -1016,7 +1018,7 @@ public List visitCollect( @Override public List visitTopK( - org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode node, + org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("TopK-%s", node.getPlanNodeId().getId())); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeUtil.java index 28b34cf1dd97f..f6201800a7196 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeUtil.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import java.util.List; import java.util.Map; 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 6186320f07d55..d620365b22fe7 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 @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesCountNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java index 382013d7d0861..bfe58813c8507 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; public class SimplePlanVisitor implements PlanVisitor { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java index 59a8c8607ad4b..7b7a7000288e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPartitionRelatedNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPartitionRelatedNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java index a5c222ecf3869..c8d6600704245 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.storageengine.dataregion.modification.ModificationFile; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java index d89425a934b9b..ecbb592f9d106 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.load; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java index cb2430dad124f..de2ec7b08c63d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.storageengine.load.splitter.TsFileData; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java index 6b7be9dfab062..022f0c7519dbf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.ProcessNode; import java.util.ArrayList; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java index cac962c35baa3..710ceaec7f136 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java index 11f6c8357a0aa..9300b183edc64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/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 12790c12630a9..26ed001a9a745 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 @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 caae24a3f53e2..4bc82944fdd8e 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 @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 8c88ff8a5344a..c39533b884011 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 @@ -20,15 +20,15 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.template.Template; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 264567b108586..91f9d6255477a 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 @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java index 80b8574859e46..9f0f214751f29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.common.rpc.thrift.TSchemaNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.ProcessNode; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java index a42b3fe66c064..f872277ca4331 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.ProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java index b5bcce82dae00..966167eb50e2d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.ProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.ProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; 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 b3d735cd6a56b..a5fe8fcc99ec3 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 @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import java.io.DataOutputStream; import java.io.IOException; 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 fc95c6a5a7a19..7fb4878f6256d 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 @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java index aed1f45f45b33..a1ba23fa02296 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java index adfcde050bf68..8b97d871093e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java index 1c506499dbbd3..250f2fc0ff1aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; 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 25f0a93c02423..7ea3cfb1a4d6e 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,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java index c20a94fd04f50..cd3a80445f937 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; 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.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/metadata/read/SeriesSchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java index 8d990294e7ee6..e97983091ad9b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.commons.schema.template.Template; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/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 587f6fabc7f3d..997b910ce5040 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,13 +22,13 @@ 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.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; 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.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher; import java.util.Collections; 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 052ada6cded1b..c6f613e26d4f6 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 @@ -20,6 +20,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.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; @@ -27,9 +30,6 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.template.Template; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 7403e0de493fa..4be471fc03e94 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 @@ -19,6 +19,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.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; @@ -26,9 +29,6 @@ import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.template.Template; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java index a7e77e8892ade..18ba19dccf9f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java index 699081a028293..f90053e476a68 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.utils.SerializeUtils; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java index e288904226bf5..3ff83bc535b3b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java index d1b13aa585f80..046f653e08ec5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java index d990fa34b3085..f5a18304ad823 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java index 0fafc86735816..0971698edccbe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; 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/metadata/write/CreateMultiTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java index bf4f6cf4a4fe4..b1b4e0d1a92a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java index 203e4d1c746e6..6c91ec8561c1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java index 8c2ed09a7c607..d5bc7a9c03d41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.IDeactivateTemplatePlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java index e9d609b75faaa..50ada41e6880d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java index a805d617dfaf3..a8f15fad4996d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java index c2ab2e477e9e9..89140c4a8bb28 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java index e88ef4ed06bc0..1b6b57f833cc1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java index 1e769a2cc90c7..542c6472b16d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.IPreDeactivateTemplatePlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java index 0da7a95fe2c68..9d4c71536068e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.IRollbackPreDeactivateTemplatePlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java index c65a6d3d1e152..5453e6d6ccb9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java index 7be0d3b62896f..c72315d8d61e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.exception.NotImplementedException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java index 1f15987585723..ca6572c40e8bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java index b2ff441aca390..ae93a26d86a6e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java @@ -20,15 +20,15 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java index dbfffb670190e..50c4bf4f99ed9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java index 03f0fb9166b78..4133b56f4b578 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java index 340b8d9caa8b4..191be8463abf2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.consensus.statemachine.dataregion.DataExecutionVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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/pipe/PipeEnrichedInsertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java index ba6ab23977e23..7a545b607e1ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java @@ -21,13 +21,13 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.consensus.statemachine.dataregion.DataExecutionVisitor; import org.apache.iotdb.db.exception.DataTypeInconsistentException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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/pipe/PipeEnrichedNonWritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java index cac5291ebcee9..586eff9faff92 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.consensus.statemachine.schemaregion.SchemaExecutionVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ConstructSchemaBlackListNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java index 9bfa4b99437e8..590f370799216 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.consensus.statemachine.schemaregion.SchemaExecutionVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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/pipe/PipeOperateSchemaQueueNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java index 3f728091b911e..98314b1c415de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningQueue; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java index b48142ac863df..fde11973fae5e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AI; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.model.ModelInferenceDescriptor; 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 768ae31c348dd..03b07f490beb6 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,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java index f5637e0c95439..2c48808d70613 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; 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 c426aa856125f..bfed971894b06 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,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationSourceNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java index 6c60c862f5d70..2a3120895f864 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java index f093e4f6e4ab4..062cce10bc40c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.utils.columngenerator.parameter.ColumnGeneratorParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java index 2b103caab2368..cf2c48db6acc6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; 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 d7b0253354374..0f100f0c8c706 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,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.DeviceViewIntoPathDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java index 66ee6cff4bd37..2388a0a2d03c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java index 25186dc202fdd..5c54df2a13115 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; 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/process/FillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java index 1ec03f937acc7..70f7807f71c7a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.FillDescriptor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java index 11b4c402d4b3f..705fb5c2bfd76 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.Expression; 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/process/GroupByLevelNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java index 6f8b06e21de79..32e87c7a5c9db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.CrossSeriesAggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java index 47d7383c96fea..13c0af48f3f5c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.CrossSeriesAggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java index 9af48bd3200b1..d462dca196a8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; 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 3b9e19a44d241..66bb88a908c39 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,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.IntoPathDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java index 2e351a4b04228..6aa3cb43b65f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java index ac03355d32c6c..c5712a18ee366 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java index d7321d4a3b54d..52eb745c0689d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java index 6972c0f0f6374..0a252ce07c6eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; 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/process/RawDataAggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java index 8468770de5f4c..a3f0167101e60 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,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java index afce68715fac2..08aa268a85b77 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; 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/process/SlidingWindowAggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SlidingWindowAggregationNode.java index db2567a6c208b..a33321caccd24 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,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java index a2d7a887aa2f5..7a3e1fe184d41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java index ce740bdbf6b84..36252421e7166 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java index f2443b7591fc2..185321066e8fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java index 0782a0572566b..945cebac0e8b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java index 0f04c33fb3c61..e5a2374be63de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java index 1a72e17afdfce..189f2eba4aab3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java index f8f4f88196836..b66d7c23e36df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java index 6fa583cba5415..977139bc23755 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java index 0ea4f9f13d932..5c7ec1a272262 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.LastQueryScanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java index 919471b294e5d..888de6c76582c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java index 402e1afd778fd..b35b2f44e5118 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; 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/sink/MultiChildrenSinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/MultiChildrenSinkNode.java index 1267c420f8e2e..6e9b0e6ea4d7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/MultiChildrenSinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/MultiChildrenSinkNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java index 95d50d3d78244..3fd84f978270b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; 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/sink/SinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/SinkNode.java index f3bdb8096a232..c57605b0554f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/SinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/SinkNode.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; public abstract class SinkNode extends PlanNode implements AutoCloseable { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java index ba1454f9ad185..f6d53e2e2b44a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java index ece77b530bf82..824fe951de061 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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 c9e8d8c2bdf3b..72005155cc125 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 @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/LastQueryScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastQueryScanNode.java index 6322f28680b7f..946877cfd9ed7 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 @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/LastSeriesSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java index 9d2acee670b32..9c3baec7c6d8c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java index 13466eb8a02fa..a26b426a7ee8e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java index f935bc2d6b706..2f8422944d6e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/SeriesAggregationSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationSourceNode.java index 2b0ae8a9e1389..c2431506c7501 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,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java index e7553320728e4..22e9319531e6e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/SeriesScanSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java index 62136d5764e5d..a979902becb0b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java index 707ccc1c41aea..7dbdb85d4413c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java index 415723ad1e79f..b9d49ec8c17a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.expression.Expression; 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 d9590c6febf3c..999ce3af4486c 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeader; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; 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 5686576d60ac7..41ae4ca901f03 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 @@ -20,6 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; @@ -27,10 +31,6 @@ 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.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; 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/VirtualSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/VirtualSourceNode.java index 01af871dc5e77..888351741b7ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/VirtualSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/VirtualSourceNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; public abstract class VirtualSourceNode extends PlanNode { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java index 65da23a50c2f1..08c671c5dcc32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntryValue; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java index 61aa0a5441fd9..3cbc9bca1a8de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.IWALByteBufferView; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java index 2f14d41143073..8d34f60e1007a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java @@ -24,14 +24,14 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndexType; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.partition.DataPartition; 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.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.common.schematree.DeviceSchemaInfo; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java index 6d24c792acb20..26c49147ac71f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java @@ -21,12 +21,12 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.index.ProgressIndex; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java index 62d0604d853b2..ae87f0a38b644 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java @@ -22,14 +22,14 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataTypeInconsistentException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; import org.apache.iotdb.db.storageengine.dataregion.memtable.AbstractMemTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java index 0907f468d78e7..39f1bf57e7ac7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java @@ -21,14 +21,14 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java index 86a26fd30719c..a79707e8e2373 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java @@ -23,13 +23,13 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.index.ProgressIndex; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java index 888cac2a87c0e..7ef9eb2a0ded3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java @@ -23,14 +23,14 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; 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/write/InsertTabletNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java index 3978024794343..b7ee5b66f402b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java @@ -23,17 +23,17 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.exception.query.OutOfTTLException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java index f1712460b3aba..d4948863764f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.exception.ObjectFileNotExist; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.calc_commons.utils.IObjectPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java index a65c0e428d16d..27f202aee670b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.ProgressIndexType; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java index 9340132891af7..38d05b298fd43 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.write; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.DataTypeInconsistentException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.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.fetcher.cache.TableDeviceSchemaCache; import org.apache.iotdb.db.storageengine.dataregion.memtable.AbstractMemTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java index 3cd025fc0370d..1586ed282d54c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java index e185141589adf..7e95e7cb36f42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java @@ -22,14 +22,14 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.exception.query.OutOfTTLException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/SearchNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/SearchNode.java index 6c4ef34f5c5e8..57a4ae4aa9c4b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/SearchNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/SearchNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.write; import org.apache.iotdb.commons.consensus.index.ComparableConsensusRequest; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.consensus.iot.log.ConsensusReqReader; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/DeviceViewIntoPathDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/DeviceViewIntoPathDescriptor.java index a34bf2e1b79d4..5fa1b3fac7193 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/DeviceViewIntoPathDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/DeviceViewIntoPathDescriptor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.analyze.SelectIntoUtils; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/FillDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/FillDescriptor.java index 48c900d7c9cd3..117d749d5eb58 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/FillDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/FillDescriptor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; -import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.statement.literal.Literal; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByParameter.java index 9499f2cfab28f..10e7fc48d3fe6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByParameter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByTimeParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByTimeParameter.java index 5f173a48c8bd7..6e685383479fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByTimeParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByTimeParameter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.statement.component.GroupByTimeComponent; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/IntoPathDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/IntoPathDescriptor.java index 5dfc1e5042807..881bb27efee90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/IntoPathDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/IntoPathDescriptor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.analyze.SelectIntoUtils; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/OutputColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/OutputColumn.java index a972c0689b380..279b96f3c2b0d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/OutputColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/OutputColumn.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java index 5d97d2edda73a..05561a8867b83 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java @@ -19,41 +19,41 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; 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 1fb9d6b487bc7..52e68b9a31625 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 @@ -21,45 +21,45 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.security.Identity; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Fill; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionInvocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.With; +import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.schema.table.InformationSchema; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.security.Identity; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; -import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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 1c0c796b13c9d..d258a356bcecb 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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/analyzer/CanonicalizationAware.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java index ef1f96fa14502..282ab1554fe77 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; import java.util.OptionalInt; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java index d9bfcfd173c49..f5b0a92a8edd8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 4901caecd2043..08e89175ea795 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -19,73 +19,73 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; +import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind; +import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Columns; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ProcessingMode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; -import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind; -import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Columns; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DecimalLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ProcessingMode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; @@ -142,6 +142,16 @@ import static java.util.Collections.unmodifiableSet; import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression.isQualifiedAllFieldsReference; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.FOLLOWING; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.PRECEDING; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_FOLLOWING; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_PRECEDING; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.GROUPS; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.ROWS; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; @@ -149,16 +159,6 @@ import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression.isQualifiedAllFieldsReference; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.FOLLOWING; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.PRECEDING; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_FOLLOWING; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_PRECEDING; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.GROUPS; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.ROWS; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.ExpressionTreeUtils.extractExpressions; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; import static org.apache.tsfile.read.common.type.BlobType.BLOB; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java index bdecd30a76416..ca2b0875b1058 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultExpressionTraversalVisitor; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java index 9cd6da921036c..ff21e307449ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java index 28ddb808fdf01..9428c4c1fc0a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RangeQuantifier; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java index a0af3ea3b3414..8ea7b53a93ba3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java @@ -19,21 +19,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.VariableDefinition; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExcludedPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.MeasureDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.Range; import com.google.common.collect.ImmutableList; @@ -49,7 +49,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableSet.toImmutableSet; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ProcessingMode.Mode.FINAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ProcessingMode.Mode.FINAL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.ExpressionTreeUtils.extractExpressions; import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.AstUtil.preOrder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java index f9a18dd2a78b7..3639900ad1846 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; import java.util.Objects; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java index 41165800d94b3..a936bd06d3c10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java index 83e10a3530be2..9d0bf43b7e5b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.rpc.TSStatusCode; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java index 82e3baf5acb84..6027233ba10bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; import java.util.Map; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index 5fb1e1ffd82cd..ca4c46592f35a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -20,105 +20,105 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.function.TableBuiltinTableFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllRows; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Columns; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Except; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Fill; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Intersect; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinUsing; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Limit; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.MeasureDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NaturalJoin; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Select; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SetOperation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionArgument; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionInvocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionTableArgument; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Union; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Values; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.VariableDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Window; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.With; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; 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.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllRows; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Columns; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Except; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingElement; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Intersect; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinOn; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinUsing; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Select; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SetOperation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleGroupBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionArgument; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionTableArgument; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Union; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.VariableDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Window; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; -import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; -import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; import org.apache.iotdb.db.queryengine.execution.warnings.IoTDBWarning; @@ -270,16 +270,16 @@ import static java.util.Collections.emptyList; import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.ForecastTableFunction.TIMECOL_PARAMETER_NAME; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression.getQualifiedName; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.FULL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.LEFT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.RIGHT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; import static org.apache.iotdb.commons.schema.table.TsTable.TABLE_ALLOWED_PROPERTIES; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTimestampType; -import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ForecastTableFunction.TIMECOL_PARAMETER_NAME; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression.getQualifiedName; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.FULL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.INNER; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.LEFT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.RIGHT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; import static org.apache.iotdb.db.queryengine.execution.warnings.StandardWarningCode.REDUNDANT_ORDER_BY; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AggregationAnalyzer.verifyOrderByAggregations; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AggregationAnalyzer.verifySourceAggregations; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java index aa73322497351..b17245d66464b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java index 2c76b8cbac2f6..4e6d552d81ce7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java @@ -19,35 +19,35 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableList; import com.google.common.math.DoubleMath; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java index 279a37ce45ce6..360d1a9d03874 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -19,23 +19,23 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java index 729aa04b4aa99..73521fba78f44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java @@ -19,23 +19,23 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import java.util.List; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java index 5a0c32e862c3f..9f12f2f775b66 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java @@ -19,40 +19,40 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DecimalLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java index 43be54a6faa1a..826a2fe6f7bc2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java @@ -19,21 +19,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java index 6757b94a0d791..2ae34d8636c66 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java index 84f99855658f4..384fcd76e5466 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableExpressionType; 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.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java index 6733f1b15e755..1276456c02a53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java @@ -19,6 +19,23 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.filter.impl.multichildren.AndFilter; import org.apache.iotdb.commons.schema.filter.impl.multichildren.OrFilter; @@ -32,23 +49,6 @@ 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.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicateVisitor; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java index 4c18c086fbecf..c39e0a5b0f53b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java @@ -19,21 +19,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicateVisitor; public class ExtractPredicateColumnNameVisitor extends PredicateVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java index f3cca8ffd8f25..e8c6a41731147 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.tablefunction; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.CanIgnoreReturnValue; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java index 1ca005a9b6819..8506599720b99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java @@ -19,6 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionFactory; +import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.SchemaPartition; @@ -26,14 +34,6 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinWindowFunction; import org.apache.iotdb.db.calc_commons.plan.relational.metadata.ITypeMetadata; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionFactory; -import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java index 577cdc107cbdf..b755445f1a545 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnMetadata; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnMetadata; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java index 9362de110d8dc..d706527a61e53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadata.java index 3ab7afa469dbf..5eb113e68eaa9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadata.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnMetadata; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnMetadata; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; import java.util.ArrayList; import java.util.Collections; 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 42e4b038a3ecd..de4f26a6a2e9a 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 @@ -19,6 +19,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.AdditionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.DivisionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.ModulusResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.SchemaPartition; @@ -31,22 +47,6 @@ import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.AdditionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.DivisionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.ModulusResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; -import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TreeDeviceViewSchema.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TreeDeviceViewSchema.java index 646b085d62099..cc06fe736b647 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TreeDeviceViewSchema.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TreeDeviceViewSchema.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.commons.schema.table.TreeViewSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import java.util.List; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java index 206cea783b5ad..3f7928b7d4e90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.filter.SchemaFilterType; import org.apache.iotdb.commons.schema.filter.impl.StringValueFilterVisitor; @@ -27,10 +31,6 @@ import org.apache.iotdb.commons.schema.filter.impl.singlechild.TagFilter; import org.apache.iotdb.commons.schema.filter.impl.values.PreciseFilter; import org.apache.iotdb.commons.schema.table.TsTable; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema.CheckSchemaPredicateVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema.ConvertSchemaPredicateToFilterVisitor; 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 68a793dab6498..159ee6f79c68c 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 @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; 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.TagFilter; @@ -29,7 +30,6 @@ 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.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaValidator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaValidator.java index 2331d0e4ffcc4..a83752e4d9519 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaValidator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaValidator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java index 009b76a60877a..713dc221941ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java @@ -22,6 +22,10 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; @@ -36,10 +40,6 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.ColumnCreationFailException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.lock.DataNodeSchemaLockManager; import org.apache.iotdb.db.queryengine.plan.analyze.lock.SchemaLockType; @@ -73,8 +73,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.commons.schema.table.TsTable.TIME_COLUMN_NAME; -import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.utils.EncodingInferenceUtils.getDefaultEncoding; public class TableHeaderSchemaValidator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java index 9b00dfedfb10d..dbc5cbd6931c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java @@ -26,16 +26,16 @@ import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.With; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; -import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java index a1fc187cfbca1..331c96a57c1dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.SubExpressionExtractor; import org.apache.iotdb.db.queryengine.plan.relational.utils.DisjointSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java index c086bbbbc7241..6a9ecfc22e03d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java index b6b8b75476d56..49ccbd0f2abf3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java index f2ad010f07cb3..81bca262d18e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java @@ -19,36 +19,36 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.function.InterpretedFunctionInvoker; +import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.calc_commons.transformation.dag.util.CastFunctionUtils; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.function.InterpretedFunctionInvoker; -import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator; @@ -77,10 +77,10 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.MINUS; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.PLUS; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.MINUS; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.PLUS; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java index b503a5fbb37de..f5625db4ebd35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java @@ -19,45 +19,45 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; @@ -89,7 +89,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; import static org.apache.tsfile.read.common.type.FloatType.FLOAT; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java index f98a73853f413..368529b651133 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; import com.google.common.collect.ImmutableList; import org.apache.tsfile.common.conf.TSFileConfig; @@ -44,10 +44,10 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBool; import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; import static org.apache.tsfile.read.common.type.FloatType.FLOAT; import static org.apache.tsfile.read.common.type.IntType.INT32; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java index d078c89a1374a..50f2773fac1f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NoOpSymbolResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NoOpSymbolResolver.java index 2d662b0dbc1c0..e14ae7b04e060 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NoOpSymbolResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NoOpSymbolResolver.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; public class NoOpSymbolResolver implements SymbolResolver { public static final NoOpSymbolResolver INSTANCE = new NoOpSymbolResolver(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java index 32116cb1c4952..1551ac504dd81 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java index e3d2a69932ea9..c53aed0e0dd32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; public class OrderingTranslator { private OrderingTranslator() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java index d69f1f8e3134a..f1d45ced36002 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; 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/planner/PlanNodeSearcher.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanNodeSearcher.java index a730270527622..b13528ec3d4cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanNodeSearcher.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanNodeSearcher.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlannerContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlannerContext.java index 2dbf7bfc1ea00..ac1b4433a15c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlannerContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlannerContext.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java index 0fb65377d9a5e..fde6d09ce6369 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; import org.apache.tsfile.utils.Pair; @@ -32,11 +32,11 @@ import java.util.Arrays; import static org.apache.iotdb.commons.conf.IoTDBConstant.TIME; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.and; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.or; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.and; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.or; public class PredicateUtils { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index 7d105013bffaf..e83a1c22683a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -19,48 +19,48 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Aggregation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.VariableDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Aggregation; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Fill; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.MeasureDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.VariableDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; @@ -101,17 +101,17 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.lang.String.format; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.groupingSets; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.GROUPS; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.ROWS; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.groupingSets; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.GROUPS; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.ROWS; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingTranslator.sortItemToSortOrder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware.scopeAwareKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java index 4103a7f4b2b4f..ec4c8a30377dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.RelationType; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; 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 faf93ea9d51e8..667d19ed062ac 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 @@ -19,73 +19,73 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.AggregationLabelSet; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.AggregationValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ClassifierValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers.Assignment; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.MatchNumberValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Except; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Intersect; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinUsing; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.MeasureDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SetOperation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionInvocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Union; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Values; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.VariableDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.AggregationLabelSet; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.AggregationValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ClassifierValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers.Assignment; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.MatchNumberValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Except; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Intersect; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinOn; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinUsing; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SetOperation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Union; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.VariableDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; @@ -160,17 +160,17 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.lang.String.format; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.CROSS; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.FULL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.IMPLICIT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.LEFT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.RIGHT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.Position.PAST_LAST; import static org.apache.iotdb.commons.schema.table.InformationSchema.INFORMATION_DATABASE; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.CROSS; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.FULL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.IMPLICIT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.INNER; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.LEFT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join.Type.RIGHT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.Position.PAST_LAST; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.NavigationAnchor.LAST; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.NavigationMode.RUNNING; import static org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingTranslator.sortItemToSortOrder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java index e95d2f25cf768..0b69b8cfdb77d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.CanonicalizationAware; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.ResolvedField; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java index a5745452eca7a..5f2e064562cb7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java index 1ef84eab6a31b..7ecb95f1e72b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java @@ -19,28 +19,28 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; @@ -70,8 +70,8 @@ import static com.google.common.collect.Streams.stream; import static java.lang.String.format; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression.Quantifier.ALL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression.Quantifier.ALL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware.scopeAwareKey; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java index 5d4ecc84b0d41..219ed6b751113 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Field; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolResolver.java index 63e986c74b814..da97397dbb70f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolResolver.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; public interface SymbolResolver { Object getValue(Symbol symbol); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java index 4d28fa64b2d74..756b4a0acf761 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultExpressionTraversalVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultTraversalVisitor; 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 b36c8696a4a88..d4aaa32dd1583 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 @@ -19,6 +19,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.column.ColumnHeader; @@ -27,22 +43,6 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; @@ -103,8 +103,8 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode.COLUMN_NAME_PREFIX; -import static org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode.COLUMN_NAME_PREFIX; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet.LOGICAL_PLANNER; import static org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet.LOGICAL_PLAN_OPTIMIZE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.MetadataUtil.createQualifiedObjectName; 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 284417b84013e..c9bb007e0a73f 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 @@ -24,11 +24,11 @@ import org.apache.iotdb.commons.client.IClientManager; import org.apache.iotdb.commons.client.async.AsyncDataNodeInternalServiceClient; import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.QueryStateMachine; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java index 07a18eed4b08c..f6d8d7c2bbc1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.ResolvedField; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; @@ -61,8 +61,8 @@ * boundary. * *

    AST and IR expressions use the same class hierarchy ({@link - * org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression}, but differ in the following - * ways: + * org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression}, but differ in the + * following ways: *

  • AST expressions contain Identifiers, while IR expressions contain SymbolReferences *
  • FunctionCalls in AST expressions are SQL function names. In IR expressions, they contain an * encoded name representing a resolved function diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java index 8f2502c5398fc..21e5ffe4e65e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.commons.partition.DataPartition; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; 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/relational/planner/distribute/SubPlanGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/SubPlanGenerator.java index 0b7a57276516c..7a83e26bde0f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/SubPlanGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/SubPlanGenerator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; 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 5533ee6e6da86..c8e8d89b7632e 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 @@ -24,6 +24,49 @@ import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.schema.table.InformationSchema; @@ -32,49 +75,6 @@ import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.confignode.rpc.thrift.TRegionInfo; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -143,12 +143,12 @@ import java.util.stream.IntStream; import static com.google.common.collect.ImmutableList.toImmutableList; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind.AGGREGATE; +import static org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED; import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT; -import static org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind.AGGREGATE; -import static org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PushPredicateIntoTableScan.containsDiffFunction; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.TransformSortToStreamSort.isOrderByAllIdsAndTime; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.split; 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 1a436ce656a07..0016af8ff1306 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 @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; 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 d63fca9e1c0c9..9a72d9a8661aa 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 @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java index d5f7a43619616..9577f9c97a50f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java @@ -19,24 +19,24 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java index caa012287eb0f..a31f28704be8b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java @@ -19,22 +19,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; public abstract class DefaultTraversalVisitor implements AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java index a80218890fb03..dfa62e5f1b27a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionNodeInliner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionNodeInliner.java index 80ed9d2d43a61..d04c651858baa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionNodeInliner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionNodeInliner.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java index 6506921ea9884..386e4b7daef35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java @@ -19,41 +19,41 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; public class ExpressionRewriter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java index 3827759d55843..de85541c5897e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java @@ -19,45 +19,45 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataTypeParameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataTypeParameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java index 1ddf586d4f9a7..10cb784b877f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -34,7 +34,7 @@ import static java.util.Collections.emptySet; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combinePredicates; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractPredicates; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java index d4094607b3f8d..fe78de466f812 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java @@ -19,28 +19,28 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import javax.annotation.Nullable; import java.time.ZoneId; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; public class GapFillStartAndEndTimeExtractVisitor implements AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java index 583cba2e1cdb7..2c9877e46f613 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; @@ -50,8 +50,8 @@ import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toList; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; public final class IrUtils { private IrUtils() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java index 65e9376163689..e18f102a885bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultimap; @@ -36,8 +36,8 @@ import java.util.Set; import static com.google.common.collect.ImmutableList.toImmutableList; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.or; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java index b8734a020cb64..3e77a7031f5fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java @@ -20,24 +20,24 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.With; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java index 4e8e1cf317505..79b7c5d82cd32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/SubExpressionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/SubExpressionExtractor.java index 22825550b61ba..86527094ae6b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/SubExpressionExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/SubExpressionExtractor.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; import com.google.common.graph.SuccessorsFunction; import com.google.common.graph.Traverser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java index 9c2208917b869..da99d20986baa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Match; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.PlanOptimizersStatsCollector; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java index cb211b72bf116..fdd50c244bd82 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; import java.util.function.Function; import java.util.stream.Stream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java index c3a88a0883505..84086bedeccc6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.common.QueryId; import com.google.common.collect.HashMultiset; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java index fba90e9318f7e..e209dcb416907 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java index f082cb8541b2f..72668ae3fed1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java index 2217799132d4a..378d365be98bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java index 870aa591ed644..794cdbffa7393 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; @@ -42,8 +42,8 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; public class CanonicalizeExpressionRewriter { 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 6531be20519ef..410cbf2beade3 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 @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; 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.TableScanNode; 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 efa933890e949..316f918f2cfff 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 @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; 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.TableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java index e5146d624094f..b8d684bf88159 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java index 5f66068709220..3e8fc78d4c404 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java index b83ef5aa0c209..ee72af7077897 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PropertyPattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java index a572b7d251079..c1a100abc2aa4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -41,7 +41,7 @@ import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.SUBTRACT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.SUBTRACT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Except.distinct; public class ImplementExceptAll implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java index c4701c36a78e5..cf77573d95fba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -36,7 +36,7 @@ import org.apache.tsfile.read.common.type.LongType; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; public class ImplementExceptDistinctAsUnion implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java index 66475d8d20101..ad78f32785132 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java index 264da6b286d37..eb2152c086a34 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -36,7 +36,7 @@ import org.apache.tsfile.read.common.type.LongType; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; public class ImplementIntersectDistinctAsUnion implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java index 34e27f5ad411c..f5fa28512ecc5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java index 2384ce961862b..92625e48adb96 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -41,7 +41,7 @@ import java.util.concurrent.atomic.AtomicReference; import static com.google.common.collect.Iterables.getOnlyElement; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; /** * This rule prepares cartesian product of partitions from all inputs of table function. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java index 4fa9c699dafc8..772ee52f7a1c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java index be077084e7acb..00d3813f6e11b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java index 178123468aa3b..ceb4806ba76ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java index fd562592b251a..891d067cbc60a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java index 620e4b76648cd..661fe42a2b289 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java index 58a8a22150a5e..df05e0ba13e09 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java index dfdfba12945b3..737d77b6a49d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java index 2874a8cc079d9..73aae2493e699 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java index 761886ac1f888..490a9df668893 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java index 71eae26bfd7ed..4d135674a9d52 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SetOperationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java index f320a7fd29c66..59d705b40aa4c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.base.Predicates; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java index e3504f7a03570..3517b6419e89f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrPatternAlternationOptimizer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPatternFlattener; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrPatternAlternationOptimizer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPatternFlattener; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.patternRecognition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java index 396315eebb91e..20213b6bc8c53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java index eabb284fb8c16..453563f9c469c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import com.google.common.collect.Maps; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java index f86b9f7df3616..5617e958606b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java index 58170aa17ba95..37c6106046e18 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java index f83c40bc10615..82f0e494f9e84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java index db321ffdb1755..0f707c9757f60 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java index 3baee00c24532..fcec45a5f4f90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java index f96aa5741cb25..ebc266f359e1f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import com.google.common.collect.ImmutableSet; @@ -30,7 +30,7 @@ import java.util.Set; import static com.google.common.collect.Sets.intersection; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor.extractUnique; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java index 5583e6be950e8..1ac5c7e314bb1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java index f1e67b1fd8339..9e7396d830a93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java index fa1a7c81f4ee7..5f4f8da7bd410 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java index 5d8edb0eddc10..608caed0d0cea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java index 6f5bde753f0b2..447f46b7fb46b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FillNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java index 811011d2f2439..6a4cd50704d75 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java index 4d09115b59c05..ea4966b479e9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java index f888acd0dccb2..ee9c4fdcffbbe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java index 2e6dc98192d9e..53974ebc5d799 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java index c64de9342dbb1..bd57ed5337e17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java index 42d4fcc440eed..b667b53fc34dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java index 1fcd11cbf4a02..0b03d6d1950ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java index 36b227876c93b..92fa229a61a93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java index 3d7f13b495d15..c02a9d3d1e12c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java index 058d66dfdf74f..6a25c57cfbe46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch.ONE; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch.ONE; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictChildOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.PatternRecognition.rowsPerMatch; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.patternRecognition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java index 3c8a8cd1e666d..97a350da0ae5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java index 4511d27d428f7..bb388ff754b50 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java index da63e3f945aba..6124ced909a9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java index 80fac73327b07..fb0e7e40ee6aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; 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 a68648ed5adf5..04f170958ac3a 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,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java index f7127b9326d8e..2eec028143d41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java index 508c1e50173e9..b00704909a141 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java index b54236c53e36a..f8df1b7f2bed1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java index 9402fc13f4e61..70ec157be8f07 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java index 5013d87b0ceb6..6875bb7a8d3fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java index b3327561eda0b..591d4157a9900 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; @@ -34,8 +34,8 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.lang.Math.toIntExact; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.toTopNRankingType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.ChildReplacer.replaceChildren; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java index bdd8f1e06a534..2d26c239d9b3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; @@ -39,11 +39,11 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.IS_DISTINCT_FROM; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.IS_DISTINCT_FROM; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combinePredicates; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractPredicates; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java index 2ff071f88419e..72535ff2d76a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java index ab36f532141f4..64001fd7b122f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java index 3d33b97ae6ccc..9895e9a67f942 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java @@ -18,12 +18,12 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java index 839214eb7bff1..5d5285d0c8164 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java index a3fdcab055dab..303f55584c8c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java index 456dda2c7506e..7c17b13951bc7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java index 00671d417b860..22cc2fe21d66e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java index 86c76a0721e32..4e91507e22dc0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -38,8 +38,8 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.isEmpty; public class RemoveEmptyExceptBranches implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java index e019c67fc2f44..ead8d28acf490 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java index 10e4a6ad300d0..3bb39de767d04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.enforceSingleRow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java index 2d9093a4675ed..a158592bb233e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java index a8fa2b2ffa3ea..81c3c35539ea7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java index f57b734319e96..3be8b417530df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java index d935b5ec229e3..b2666040584e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.filter; public class RemoveTrivialFilters implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java index 48a73b8e95315..623f3c148de9b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java index bc446b0750f0f..ee3d8b889778a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.RIGHT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.RIGHT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.isAtLeastScalar; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java index a11e4d89f4181..0cf812c985965 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java index 80e3d78375d56..d85ab721e7c7e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SetOperationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java index 1c3141c502a7b..11ace4bd4019d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java @@ -19,29 +19,29 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; +import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; -import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SetOperationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; @@ -63,10 +63,10 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.concat; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.LongType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java index 044e82ea2dd4a..3d49d4f935ce0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; @@ -44,10 +44,10 @@ import static com.google.common.base.Verify.verify; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind.AGGREGATE; +import static org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT; -import static org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind.AGGREGATE; -import static org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java index cb9eb0fd6c1a3..f42e6f65f37ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.relational.planner.LiteralEncoder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java index 09972c88a84e8..0781e2c405fa9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; @@ -38,8 +38,8 @@ import java.util.stream.Stream; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java index 7758f2ea09c13..7237f71e9080f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -45,11 +45,11 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java index dde53b352214d..aa4c115d9e66f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -40,11 +40,11 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java index 561959365b879..129b5e9d33949 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -50,13 +50,13 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.empty; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java index cc2ccbc8fb834..393abf6452555 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -47,13 +47,13 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.empty; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java index 0e74e81e640a5..ffdab1e737fdf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -45,11 +45,11 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Aggregation.groupingColumns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java index 836b51ab019b8..ed051144e7d7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -40,11 +40,11 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java index a05f3853c4d81..e84fbdeca8255 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; @@ -35,10 +35,10 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index c50a21e4bb3c7..93d08fee03658 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -19,23 +19,23 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; @@ -46,12 +46,12 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanNodeSearcher.searchFrom; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java index e505727e957ab..c933f59bde2da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java @@ -19,22 +19,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; @@ -48,13 +48,13 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.globalAggregation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.globalAggregation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java index 18e099a67682a..5fd973fcc6617 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; @@ -40,11 +40,11 @@ import java.util.function.Predicate; import static com.google.common.collect.ImmutableList.toImmutableList; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractConjuncts; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java index 431cfefdb5363..d8599832fb0e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static com.google.common.collect.Iterables.getOnlyElement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java index 67d153e66371b..9528b59acbbc1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; @@ -41,9 +41,9 @@ import java.util.Optional; import static com.google.common.base.Preconditions.checkState; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.empty; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java index d41de1b3a0ee2..2ce4ecf0cf93e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java @@ -18,14 +18,14 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; @@ -41,8 +41,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.RANK; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.RANK; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; final class Util { private Util() {} 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 5cca16ca67121..2cb654aa8e0e0 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 @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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/planner/node/AggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java index e84abb11606e3..10c8f5701eabf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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/planner/node/AlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java index ead707b22d52c..dc8393409d982 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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/planner/node/ChildReplacer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ChildReplacer.java index 1b8dede60d22b..1583fa0958df2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ChildReplacer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ChildReplacer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java index 8f87ad84df283..ea64c6f359c92 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; 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/relational/planner/node/CteScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java index 4caa03281b682..2a060e18f7877 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java @@ -22,13 +22,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; 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/relational/planner/node/DeviceTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java index 04e308a3a4732..0e930a27f6ae1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; 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/planner/node/ExchangeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java index a76119f56fbed..c1df95e7737b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; 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/relational/planner/node/ExplainAnalyzeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java index 55e5eeeb8036e..680448b5d8d4c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; 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 index 40d5d09e9199a..cb3cb1bb91ecb 100644 --- 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 @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; 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/planner/node/IntoNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java index dbdefb6d6c61a..9277b454716e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java index e4e0681c6e0ea..52176313d091e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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/planner/node/Patterns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java index 5002bfd443034..6c4c787216085 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java @@ -19,40 +19,40 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Property; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java index c696e87052506..1a9449e1f5702 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 b41581605e276..64efb49f02aa0 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 @@ -20,15 +20,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; 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/planner/node/TreeAlignedDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java index 7bb1e1e77cb4f..62b7bd035c668 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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/planner/node/TreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java index 105b7c2bd9dfa..41e5e49bb8c5f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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/planner/node/TreeNonAlignedDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java index 69e0398322ded..dcb6af2268f7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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/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 51396b20593b4..4483590932274 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,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TableDeviceSourceNode; import org.apache.iotdb.db.schemaengine.schemaregion.attribute.update.DeviceAttributeCacheUpdater; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java index 24e841c6c40b0..aabb9b6b744c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java index 72b7d8b0a254d..aafbde2256034 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.commons.consensus.ConsensusGroupId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; 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/ConstructTableDevicesBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java index 18a7bd4c81e54..221af2ab124e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java index 79efd9d56e8e6..34c1ab79c0ea5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java index 9e8525cf80dae..25133b74cc9b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java index 48996ea0dca3a..04f6ac093850b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java index f682b0386a41f..3ee3225a85d53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java index d1f5d0b6f24bf..1095116973619 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java index 5c19bf1a863a6..dcfd77f5f206e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; 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 e53bddb08d866..88fb2172b593e 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,15 +20,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; 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 40edaf46057ba..4483a6f3200fd 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,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeader; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.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.metadata.read.TableDeviceSourceNode; import org.apache.iotdb.db.schemaengine.schemaregion.attribute.update.DeviceAttributeCacheUpdater; 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 460562198662d..be9bc37448d46 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,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.nio.ByteBuffer; 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 d9e2cdd6e0753..f698635cbe0b9 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,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java index 753e9f409d90b..6c7972969bd6e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableSchemaQueryWriteVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableSchemaQueryWriteVisitor.java index fbe5a1ffc2efc..f43abcc1efc7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableSchemaQueryWriteVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableSchemaQueryWriteVisitor.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.commons.consensus.ConsensusGroupId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.executor.RegionExecutionResult; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; 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/optimizations/AdaptivePlanOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/AdaptivePlanOptimizer.java index 9bef4eb222fa4..c8761c5df0d27 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/AdaptivePlanOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/AdaptivePlanOptimizer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java index 988bebe8d6e3a..879f1047f4544 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java index ff56aff31ac6d..c54d8f5f29d57 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.EqualityInference; @@ -34,7 +34,7 @@ import java.util.Set; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor.extractUnique; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java index ef694fb9f6ce2..8577d1a55bcd9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java @@ -19,21 +19,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java index 4ec9455bbcd9f..f9dae0feb4e41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java @@ -19,22 +19,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; @@ -60,9 +60,9 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableMap.toImmutableMap; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java index 1415e76b43de2..c2741293b617a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; 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 03d02945d682a..666d7c1bddd9c 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 @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; 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 477676a0f3376..bb30a3e7d34f6 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 @@ -19,26 +19,26 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; 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 f0c7171de174b..1e2a4d9dc6855 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 @@ -20,36 +20,36 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; @@ -103,21 +103,21 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableMap.toImmutableMap; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.FULL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.RIGHT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.STATE_TABLE_MODEL; import static org.apache.iotdb.commons.schema.table.InformationSchema.CURRENT_QUERIES; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ATTRIBUTE; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.extractGlobalTimeFilter; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.FULL; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.RIGHT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; 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.plan.analyze.AnalyzeVisitor.getTimePartitionSlotList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java index 9c90ee5a4100a..077b5187048e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; 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 f7bd319a9e6ce..3f4f8d2b459c7 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 @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java index 65ace453e531a..fd0fcbc6db0f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java @@ -19,30 +19,30 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.AggregationValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ClassifierValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.MatchNumberValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.AggregationValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ClassifierValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.MatchNumberValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; @@ -61,7 +61,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.groupingSets; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.groupingSets; public class SymbolMapper { private final Function mappingFunction; 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 25e36456eaf80..ca8ab96f47d8f 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 @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java index 32e0fcd0302bc..283b9de62e6f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java @@ -19,24 +19,24 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.SimplePlanRewriter; @@ -56,18 +56,18 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.globalAggregation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode.Quantifier.ALL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.NOT_EQUAL; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.globalAggregation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode.Quantifier.ALL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.NOT_EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SimplePlanRewriter.rewriteWith; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; 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 9b6f345fe1175..7c8782d697814 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 @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; 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/planner/optimizations/UnaliasSymbolReferences.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/UnaliasSymbolReferences.java index 5f5ff1e165319..a30b59d26c3b1 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 @@ -19,44 +19,44 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.NodeAndMappings; @@ -92,7 +92,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableMap.toImmutableMap; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper.symbolMapper; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper.symbolReallocator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java index 997704f24291e..b8719f3c2ce1e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; +import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; +import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; -import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; -import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; @@ -44,10 +44,10 @@ import java.util.Optional; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; public class Util { private Util() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java index 2d7b407ad6260..108fd2cddc8f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java @@ -19,31 +19,31 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.rowpattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAlternation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAnchor; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrConcatenation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrEmpty; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrExclusion; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrPermutation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantified; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AnchorPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.EmptyPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OneOrMoreQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternAlternation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternConcatenation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternPermutation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternVariable; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrMoreQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrOneQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAlternation; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAnchor; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrConcatenation; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrEmpty; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrExclusion; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrPermutation; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantified; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AnchorPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.EmptyPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExcludedPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OneOrMoreQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternAlternation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternConcatenation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternPermutation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternVariable; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ZeroOrMoreQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ZeroOrOneQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.Range; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; @@ -52,10 +52,10 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.oneOrMore; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.range; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrMore; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.oneOrMore; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.range; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrMore; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; public class RowPatternToIrRewriter implements AstVisitor { private final Analysis analysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java index 6c916077e5846..f596cd145b54d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java @@ -18,13 +18,13 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.sql; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultTraversalVisitor; import com.google.common.collect.ImmutableMap; 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 8a596ddb5b4e6..e3acbcbb4fe33 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,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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/AbstractTraverseDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractTraverseDevice.java index 313465765ca1b..4c778f5040383 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,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; 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.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; import org.apache.iotdb.db.queryengine.plan.relational.metadata.MetadataUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java index 6702673bb5b3d..8520384a05526 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java index 9ed10a4db5aed..7c3c2fe6e415e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java index 0b5e485f6ff71..798ffbe27d973 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java index d4c4b2970651f..3fd9e9e1eb2ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java index 8cd5249d1ea66..4f2bccebb16ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinOn; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -39,7 +39,7 @@ import java.util.Objects; import static com.google.common.base.MoreObjects.toStringHelper; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; public class AsofJoinOn extends JoinOn { 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 ea8f8b8200370..43b8af86a47d4 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 @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; public interface AstVisitor extends CommonQueryAstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java index 344667021bf47..407e6611eae9d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.commons.schema.cache.CacheClearOptions; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java index 7222e8494cdbd..38cc565494286 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java index 9ac066fc0d21f..1a099b5cb7544 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import com.google.common.collect.ImmutableList; 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 11c480bb5f908..6d3057897d001 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.schema.column.ColumnHeader; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; 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/CountStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java index 79daac1b01f04..bb7c67509ade8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java index f8a924449f203..ac76e9e085d30 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java index 238374061d1db..3e2958a070ddd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java index 4492146a06f07..7f7fa15d1d7e8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java index ce42609865109..5b52e3fed6b3d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java index e1b739b08294b..de5552db5a920 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java index d1645bd80aad8..2f626119b6113 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java index 00d976dfe9496..1ae464159d6ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java index f2aa93feb8b29..10d21281b6cf6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java index edcb1ea680c7f..3950ced20355e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java index 9e21dcc61cdfa..09b59f17236c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java index b60090234186f..8396dac07c9eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java index 599435079d31c..20116df630331 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java index 406e47e77e594..1f54404d772f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java index 991fe62c9847a..2d08a3a7baee1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java index 8d69a1f6bf5e6..a440f94dd3c89 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; /** When walking Expressions, don't traverse into SubqueryExpressions */ public abstract class DefaultExpressionTraversalVisitor extends DefaultTraversalVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java index cb6d62a644d59..c558b023f3798 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java @@ -19,65 +19,65 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingElement; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinOn; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternAlternation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternConcatenation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternPermutation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternVariable; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Select; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SetOperation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleGroupBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExcludedPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Fill; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Limit; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternAlternation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternConcatenation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternPermutation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternVariable; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Select; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SetOperation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Values; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.With; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WithQuery; public abstract class DefaultTraversalVisitor implements AstVisitor { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java index 3173acde25a62..3157d0e5efe19 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.storageengine.dataregion.modification.TableDeletionEntry; import com.google.common.collect.ImmutableList; 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 1707f4d7acc97..d243a2e1d3ba7 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 @@ -19,6 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; @@ -27,13 +34,6 @@ import org.apache.iotdb.db.calc_commons.execution.relational.ColumnTransformerBuilder; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceBlackListConstructor; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.TableDeviceQuerySource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java index ac036675c829d..23ac9a6cff21f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java index 7ba3a90d95de8..fb2b76a949d00 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java index ff87f1802d053..38f14015f47dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java index 7d96446e848b0..2a6de41b6dcb0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java index 66b62e7087797..36fd77c379299 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java index 49d45e4a6f516..75d65caaf6ad3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java index 7b38c657a1986..b9c2c5ebd6cf7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java index 9f3c4e466f584..7df8713e5f502 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java index 12eff1c1cfe29..b722366e01f76 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java index 7ecc0019eb44f..5162c5da43193 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java index 001207ecbf7e0..bebde368e2503 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java index 285421d8bed9a..102cec58a0d74 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java index b4127005d8ba2..7c84c56dfd591 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java index cfd64df9d1925..3dd04e382a285 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java index 2afd895b118d2..a2baf0d3597f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java index 89fce236405bc..f131bc0b6c1c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java index 4d5622bfa7ed1..0c0918d1c7491 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java index 29f113ab6e536..539b337c5fa29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Flush.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Flush.java index 95f4f12bbe426..7fc9cd9d747f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Flush.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Flush.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java index 6304177481355..560430af3d030 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.LongType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java index be35cefa5f092..31e41df275d31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaValidator; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java index 9e88af2cc93f3..7343d0d37a4c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeUtils; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ITableDeviceSchemaValidation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java index 4834c97ba9416..1589d9f6115bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaValidator; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; 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 index bd283cbc1ea34..413e7b60be2a2 100644 --- 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 @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadConfiguration.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadConfiguration.java index c22ebb0d11c43..ca83423ba6d9e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadConfiguration.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadConfiguration.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java index cdae9e7b03ed3..98aaa0b020b7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java index e7c34e86c9b29..96682ad536fea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.db.storageengine.load.config.LoadTsFileConfigurator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java index 2bb56fae6d19c..d6dbc684ff0ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java index 1fc18179dacee..b8fecb3347e93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java index a86577160f705..3acf1dacbfc33 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java index d7f2756449329..9e4271c8f5c67 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java index 3d1996a916267..2aa4ed602d259 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java index 84aec7d01ceb6..6778de6688844 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java index 5fc634f9c118a..df38cb91b7ff5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java @@ -20,15 +20,15 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.auth.entity.PrivilegeType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.commons.schema.table.Audit; import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.commons.utils.AuthUtils; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.relational.type.AuthorRType; import org.apache.iotdb.db.utils.DataNodeAuthUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java index 8ab3f7bf2cbcb..43383e0c9ee2d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java index 3802d1a515a26..5b03ebbb205fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java index 9b317e67445fe..4d6375d1f8d30 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java index 9817249340db3..3fd7daf3f98f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java index b592aba8e1c18..d84783a660d22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java index a15839430973c..1dab7aa03f665 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java index c260ba5ee6b98..ba93792710c2c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetConfiguration.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetConfiguration.java index 2ac9789cbe046..40f6976763fcb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetConfiguration.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetConfiguration.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java index c2e795549a344..86b161c0ce545 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java index 49fe127f10172..0effa50df99b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSystemStatus.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSystemStatus.java index 2ebdb13cbd83f..e1e8b6407f4ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSystemStatus.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSystemStatus.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java index dabbcde9efedd..c4674461ed6bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java index 5d712bf8c14ce..2d3f88e656b7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java index d4ade407492d9..645a61474db13 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java index 23feef103bcbb..eb4dfb4b1b6b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java index a901bfc26aae7..536df270185dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java index 0c8c82935189e..e76acb4d3716b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java index 028324fde3434..49e7de6884b55 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfiguration.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfiguration.java index 45a879efb5a63..0bf73de90f6ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfiguration.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfiguration.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java index b2a8e50823ffb..52954606e7770 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java index 08f1055450dd2..b7aa74264762f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java index 2d7e1bcfc3b27..4d0da9920b92a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java index 575455933e1f8..35b7c9c9801b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java index 1590a7a52982d..e068abdffba9d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java index db3b2e6f70041..5777bb63b82b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; 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 120ce603e920a..b065a9a521352 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,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; 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/ShowExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java index 357893cf31b40..4324b426b1015 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java index 9aaaf96c08225..cd722b3d9f937 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java index b4cf77b2745f6..e2cda90a1b46d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java index d78abc55dffb7..5876ed8c462c5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java index c99be4036cdeb..e4ef2661f0747 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java index 3155af37d4be1..a814b3d49a5b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java index 905f59a9ba410..5ef5557950b6e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java index 234dbbded73d5..14e8374cc6a14 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java index 8ca97250a7d9f..0a87d8279a53a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; 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 index f9ae38f436d3d..d28e48155ae1d 100644 --- 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 @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java index 34a8c35e8b389..e89034af9a3ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java index 220ac75316969..f302fc5d78db2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java index 32f83e9cb8447..cde523f02d89d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java index 67dc97440ae02..edea03087d243 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java index 23488bdae30ad..dcad874b70825 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java index 503eb4ff54778..6808028dd5329 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; import java.util.LinkedList; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java index bdef65a48828f..b3f6370f61cfc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java index 03990061ebb36..d934fb7109e26 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartRepairData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartRepairData.java index 24f68411fb553..94dd44e1bc1f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartRepairData.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartRepairData.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java index 1c3d3bfcc15fa..0834ebd66fc7a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java index 2f3236436b395..ab4363e2bbe34 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopRepairData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopRepairData.java index f69e0ceafee48..bd92329e97489 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopRepairData.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopRepairData.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java index 8ebc80a06d989..81522fc7953ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java index 31991cf79f8f5..9409487f1d170 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java index f9cfefaf00017..a17ebf9d7183c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java index 934faf1eae56d..889a6d1cf5aad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java index d5d6f52d75894..ae8a9d86e5482 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java index df4fadf95efd6..3c5547cdf3f1e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java index 772b5ae7321ff..a5142e9d0c85b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java index dfc784504ba22..d8564c958bc69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; @@ -26,9 +29,6 @@ import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException; import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeUtils; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ITableDeviceSchemaValidation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java index 633a596e24a14..e649d0e1e7626 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import java.util.Collections; 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 b51758d6ba48c..3cb9061e48279 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 @@ -24,6 +24,122 @@ import org.apache.iotdb.commons.cluster.NodeStatus; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllRows; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AnchorPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Columns; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataTypeParameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.EmptyPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Except; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExcludedPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Fill; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Intersect; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinUsing; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Limit; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.MeasureDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NaturalJoin; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OneOrMoreQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternAlternation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternConcatenation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternPermutation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternVariable; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ProcessingMode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Select; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableExpressionType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionArgument; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionInvocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionTableArgument; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Union; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Values; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.VariableDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Window; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.With; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ZeroOrMoreQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ZeroOrOneQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.cache.CacheClearOptions; import org.apache.iotdb.commons.schema.table.InformationSchema; @@ -33,122 +149,6 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllRows; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AnchorPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Columns; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataTypeParameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.EmptyPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Except; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingElement; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Intersect; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinOn; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinUsing; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OneOrMoreQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternAlternation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternConcatenation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternPermutation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternVariable; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ProcessingMode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Select; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleGroupBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableExpressionType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionArgument; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionTableArgument; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Union; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.VariableDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Window; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowDefinition; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.With; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrMoreQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrOneQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; @@ -309,6 +309,23 @@ import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toList; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_END; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_START; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets.Type.CUBE; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets.Type.EXPLICIT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets.Type.ROLLUP; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_OMIT_EMPTY; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_SHOW_EMPTY; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_WITH_UNMATCHED; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ProcessingMode.Mode.FINAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ProcessingMode.Mode.RUNNING; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName.mapIdentifier; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.skipPastLastRow; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.skipToFirst; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.skipToLast; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.skipToNextRow; +import static org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils.currPrecision; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.DATA_NODE_ID_TABLE_MODEL; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ATTRIBUTE; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; @@ -318,23 +335,6 @@ import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.APPROX_COUNT_DISTINCT; import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.APPROX_MOST_FREQUENT; import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.APPROX_PERCENTILE; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_END; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_START; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets.Type.CUBE; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets.Type.EXPLICIT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets.Type.ROLLUP; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_OMIT_EMPTY; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_SHOW_EMPTY; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_WITH_UNMATCHED; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ProcessingMode.Mode.FINAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ProcessingMode.Mode.RUNNING; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName.mapIdentifier; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.skipPastLastRow; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.skipToFirst; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.skipToLast; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.skipToNextRow; -import static org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils.currPrecision; import static org.apache.iotdb.db.queryengine.plan.execution.config.TableConfigTaskVisitor.DATABASE_NOT_SPECIFIED; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.SERVICE_MANAGEMENT_NOT_SUPPORTED; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.parseDateTimeFormat; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ErrorHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ErrorHandler.java index 603378d034eb4..ae9916808c9a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ErrorHandler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ErrorHandler.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; -import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; import com.google.common.collect.ImmutableSet; import org.antlr.v4.runtime.BaseErrorListener; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java index 494bcb092ae6d..e1bb72273bf63 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.CaseInsensitiveStream; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.CaseInsensitiveStream; -import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlBaseListener; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlLexer; 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 index a6c933efedc7b..8fc363609ae45 100644 --- 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 @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Select; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Select; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.StatementAnalyzerFactory; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; 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 index 6949d04e0c5da..5638c29addbcf 100644 --- 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 @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.StatementAnalyzerFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java index 1427e650045b4..306a55baeaef7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; import com.google.common.graph.SuccessorsFunction; import com.google.common.graph.Traverser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java index 11eb8cceb6c17..d9811c2235a80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.node_commons.plan.relational.sql.util.CommonQuerySqlFormatter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.util.CommonQuerySqlFormatter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java index 14edc4027babe..3a253275a047c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java @@ -19,34 +19,34 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QueryBody; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Select; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowDefinition; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Fill; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Select; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowDefinition; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeCoercion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeCoercion.java index 938aa9978c3c8..159932dfbc239 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeCoercion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeCoercion.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.type; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java index 5febbd33fecfa..c73d307e9dc3b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.utils; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java index de91f6da036b6..318937737ceb8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java @@ -29,6 +29,7 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.ConsensusGroupId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.commons.utils.RetryUtils; import org.apache.iotdb.consensus.exception.ConsensusGroupNotExistException; @@ -36,7 +37,6 @@ import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.mpp.FragmentInstanceDispatchException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.executor.RegionExecutionResult; import org.apache.iotdb.db.queryengine.execution.executor.RegionReadExecutor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java index ca3cc660bb7a7..a8100e64c11ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java @@ -31,11 +31,11 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.ProgressIndexType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadFileException; import org.apache.iotdb.db.exception.mpp.FragmentInstanceDispatchException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/Statement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/Statement.java index 10980da9c8c56..8916ee25c07c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/Statement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/Statement.java @@ -61,8 +61,8 @@ public boolean isQuery() { public abstract List getPaths(); - public org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement toRelationalStatement( - final MPPQueryContext context) { + public org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement + toRelationalStatement(final MPPQueryContext context) { throw new UnsupportedOperationException("Method not implemented yet"); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillComponent.java index e8c387eb7fa04..22e23db11dec0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillComponent.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import org.apache.iotdb.db.queryengine.plan.statement.literal.Literal; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java index 00bd6f01b0a5a..eecb667be54ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/IntoComponent.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java index 45fb751706ae8..921ac0cc1cf17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.statement.crud; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; @@ -27,10 +31,6 @@ import org.apache.iotdb.db.exception.metadata.DuplicateInsertException; import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertMultiTabletsStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertMultiTabletsStatement.java index efccf2719ff42..0ccd115fb2e9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertMultiTabletsStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertMultiTabletsStatement.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.crud; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java index 89d2f023f10a7..bd3753dff68a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java @@ -21,6 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.utils.TimePartitionUtils; @@ -28,9 +31,6 @@ import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException; import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.IMeasurementSchemaInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java index 3336695ff0e86..774a09a9c5492 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.statement.crud; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java index b372068a02a6d..8386182f60f92 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.statement.crud; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java index ec24718aae4ba..38384e5584ecc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java @@ -22,16 +22,16 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException; import org.apache.iotdb.db.exception.metadata.PathNotExistException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.IMeasurementSchemaInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java index c3b2aee0b059e..7b467865c9c06 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java @@ -370,8 +370,8 @@ public List getPaths() { @TableModel @Override - public org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement toRelationalStatement( - MPPQueryContext context) { + public org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement + toRelationalStatement(MPPQueryContext context) { final Map loadAttributes = new HashMap<>(); loadAttributes.put(DATABASE_LEVEL_KEY, String.valueOf(databaseLevel)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java index 2b9cfa25ccab5..31ddf1c6c6de4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.crud; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType; import org.apache.iotdb.db.queryengine.execution.operator.window.ainode.InferenceWindow; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/literal/BinaryLiteral.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/literal/BinaryLiteral.java index eb18bcc3d1947..733cfb08c9e2f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/literal/BinaryLiteral.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/literal/BinaryLiteral.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.plan.statement.literal; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateContinuousQueryStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateContinuousQueryStatement.java index 92cd2e0572265..89fc6bd3a8513 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateContinuousQueryStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/CreateContinuousQueryStatement.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.statement.metadata; import org.apache.iotdb.commons.cq.TimeoutPolicy; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.statement.IConfigStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java index e1a122b081620..04c8eccad1878 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/view/CreateLogicalViewStatement.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.statement.metadata.view; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.exception.metadata.view.UnsupportedViewException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.analyze.SelectIntoUtils; import org.apache.iotdb.db.queryengine.plan.expression.Expression; 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/statement/pipe/PipeEnrichedStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/pipe/PipeEnrichedStatement.java index a9d3b5ca1163f..8f49aaed59c9a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/pipe/PipeEnrichedStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/pipe/PipeEnrichedStatement.java @@ -77,8 +77,8 @@ public List getPaths() { @TableModel @Override - public org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement toRelationalStatement( - final MPPQueryContext context) { + public org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement + toRelationalStatement(final MPPQueryContext context) { final PipeEnriched pipeEnriched = new PipeEnriched(innerStatement.toRelationalStatement(context)); if (pipeEnriched.getInnerStatement() instanceof InsertRows) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetConfigurationStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetConfigurationStatement.java index 06c438481a929..7b78a54c35ac0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetConfigurationStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetConfigurationStatement.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.auth.entity.PrivilegeType; import org.apache.iotdb.commons.conf.ConfigurationFileUtils; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.statement.IConfigStatement; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java index c5c5b1437b096..a6f5a38b5213d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.sys; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.statement.IConfigStatement; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java index 66ab69870aaf5..15e32ddfc2115 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.udf; -import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.udf.api.UDAF; import org.apache.iotdb.udf.api.UDTF; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java index f5df1429c9620..479cba04b70a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.statistics; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java index daf88dfb6626c..aa27a2770798f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.builder; -import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.IntermediateLayerVisitor; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java index 9b1dacb667b4e..4c33a534b1e67 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDFParametersFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.udf.api.UDAF; import org.apache.iotdb.udf.api.customizer.config.UDAFConfigurations; import org.apache.iotdb.udf.api.customizer.parameter.UDFParameterValidator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java index dd4b12e4980f0..6e2d125210e74 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDFParametersFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.udf.api.UDTF; import org.apache.iotdb.udf.api.customizer.config.UDTFConfigurations; import org.apache.iotdb.udf.api.customizer.parameter.UDFParameterValidator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/update/GeneralRegionAttributeSecurityService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/update/GeneralRegionAttributeSecurityService.java index 58a688e35c29f..a6c4dfbf41e78 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/update/GeneralRegionAttributeSecurityService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/update/GeneralRegionAttributeSecurityService.java @@ -29,6 +29,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.StartupException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.service.AbstractPeriodicalServiceWithAdvance; import org.apache.iotdb.commons.service.IService; import org.apache.iotdb.commons.service.ServiceType; @@ -36,7 +37,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; import org.apache.iotdb.db.protocol.client.ConfigNodeInfo; 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 3c081f21903ed..82d7fc7341dab 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 @@ -23,6 +23,11 @@ import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.file.SystemFileFactory; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; @@ -46,11 +51,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.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; 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/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java index 09d33269520dc..6bafa18d9af18 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.schemaengine.schemaregion.logfile.visitor; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.ConstructTableDevicesBlackListNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanSerializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanSerializer.java index 791099e2f91cb..2cc642492cc16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanSerializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanSerializer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.schemaengine.schemaregion.logfile.visitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.ConstructTableDevicesBlackListNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java index b74c026cefdd5..f61ffa863b257 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.schemaengine.schemaregion.read.resp.reader.impl; +import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.filter.SchemaFilter; @@ -26,7 +27,6 @@ import org.apache.iotdb.commons.schema.tree.SchemaIterator; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceManager; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionTypeAnalyzer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTreeViewSchemaUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTreeViewSchemaUtils.java index 0d402d9b89d07..816e84a9509d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTreeViewSchemaUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTreeViewSchemaUtils.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.schemaengine.table; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.TsTable; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.storageengine.dataregion.memtable.DeviceIDFactory; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/InformationSchemaUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/InformationSchemaUtils.java index 337b0ffd78fe3..cbc13532689a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/InformationSchemaUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/InformationSchemaUtils.java @@ -21,13 +21,13 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.exception.table.TableNotExistsException; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.table.TableType; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.protocol.session.IClientSession; 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/service/DataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java index b9068ddce2914..30b8ecfaa2770 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java @@ -43,6 +43,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.StartupException; +import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.service.JMXService; @@ -78,7 +79,6 @@ import org.apache.iotdb.db.conf.IoTDBStartCheck; import org.apache.iotdb.db.consensus.DataRegionConsensusImpl; import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; -import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; @@ -147,9 +147,9 @@ import java.util.stream.Collectors; import static org.apache.iotdb.commons.conf.IoTDBConstant.DEFAULT_CLUSTER_NAME; +import static org.apache.iotdb.commons.node_commons.utils.DateTimeUtils.initTimestampPrecision; import static org.apache.iotdb.commons.utils.StatusUtils.retrieveExitStatusCode; import static org.apache.iotdb.db.conf.IoTDBStartCheck.PROPERTIES_FILE_NAME; -import static org.apache.iotdb.db.node_commons.utils.DateTimeUtils.initTimestampPrecision; public class DataNode extends ServerCommandLine implements DataNodeMBean { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java index c6c4d3aa61a9a..683470dc824e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java @@ -26,6 +26,7 @@ import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil; import org.apache.iotdb.commons.consensus.ConfigRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema; import org.apache.iotdb.confignode.rpc.thrift.TGetDatabaseReq; @@ -33,7 +34,6 @@ import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; import org.apache.iotdb.db.protocol.client.ConfigNodeInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java index 86e31cd050fdf..cd2a82da2927e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java @@ -28,6 +28,8 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.file.SystemFileFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.schema.SchemaConstant; @@ -66,8 +68,6 @@ import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.quota.ExceedQuotaException; import org.apache.iotdb.db.exception.runtime.TableLostRuntimeException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource.Status; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResourceManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TableDeletionEntry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TableDeletionEntry.java index c7d4f4b57cf20..41e153d612074 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TableDeletionEntry.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TableDeletionEntry.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.modification; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.IDPredicateType; import org.apache.iotdb.db.utils.ModificationUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TreeDeletionEntry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TreeDeletionEntry.java index c449dc8fcc331..fb2b7d0fe8857 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TreeDeletionEntry.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TreeDeletionEntry.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.storageengine.dataregion.modification; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; 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.PathPatternUtil; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; import org.apache.iotdb.db.storageengine.dataregion.modification.v1.Deletion; import org.apache.iotdb.db.utils.ModificationUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java index edfbe5325ff35..08b7a62b338b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.buffer; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.ContinuousSameSearchIndexSeparatorNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java index 94a6acf81b7ed..345ce224021dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java @@ -21,13 +21,13 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.file.SystemFileFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; import org.apache.iotdb.consensus.common.request.IndexedConsensusRequest; import org.apache.iotdb.consensus.common.request.IoTConsensusRequest; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.ContinuousSameSearchIndexSeparatorNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/active/ActiveLoadPathHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/active/ActiveLoadPathHelper.java index 7c83f20f36903..81c40f212aac8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/active/ActiveLoadPathHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/active/ActiveLoadPathHelper.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.load.active; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement; import org.apache.iotdb.db.storageengine.load.config.LoadTsFileConfigurator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/config/LoadTsFileConfigurator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/config/LoadTsFileConfigurator.java index 4f0156ac0d3e3..f55b80336902c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/config/LoadTsFileConfigurator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/config/LoadTsFileConfigurator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.load.config; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.external.commons.lang3.StringUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java index e356cd16cb222..e1941f79e112a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.storageengine.load.converter; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.exception.load.LoadRuntimeOutOfMemoryException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTreeConvertedInsertTabletStatementExceptionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTreeConvertedInsertTabletStatementExceptionVisitor.java index 03b80bd812e6e..92445518f08b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTreeConvertedInsertTabletStatementExceptionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTreeConvertedInsertTabletStatementExceptionVisitor.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.storageengine.load.converter; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; import org.apache.iotdb.db.exception.load.LoadRuntimeOutOfMemoryException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor; import org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTsFileDataTypeConverter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTsFileDataTypeConverter.java index 8337e4a937c23..5a9fe1083ad16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTsFileDataTypeConverter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTsFileDataTypeConverter.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java index 6323cead9455e..00046f9b56e08 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.tools; import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.tsfile.file.metadata.IDeviceID; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java index 7f950cf5452da..71d46b2bcfce2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.tools; import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.tsfile.file.metadata.IDeviceID; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java index adb4bc5e5f715..3f427aaa61a3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java @@ -24,13 +24,13 @@ import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; import org.apache.iotdb.commons.consensus.ConfigRegionId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.trigger.TriggerInformation; import org.apache.iotdb.commons.trigger.TriggerTable; import org.apache.iotdb.commons.trigger.exception.TriggerExecutionException; import org.apache.iotdb.confignode.rpc.thrift.TTriggerState; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; import org.apache.iotdb.db.protocol.client.ConfigNodeInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java index 52c69d372c933..4dc4977f8ee29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.utils; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.service.metric.MetricService; import org.apache.iotdb.commons.service.metric.enums.Metric; @@ -26,8 +28,6 @@ import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.protocol.thrift.OperationType; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeAuthUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeAuthUtils.java index 17d69fa031261..3a5f83ca7cb8a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeAuthUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeAuthUtils.java @@ -25,6 +25,8 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.utils.AuthUtils; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; @@ -32,8 +34,6 @@ import org.apache.iotdb.db.audit.DNAuditLogger; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.plan.Coordinator; import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeDateTimeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeDateTimeUtils.java index 087d72b3acd86..22fc959db6041 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeDateTimeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeDateTimeUtils.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.utils; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.SqlLexer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java index 34d2e9bf82cbf..390686b0ac8e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java @@ -23,13 +23,13 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.QuerySchemaFetchFailedException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.utils.ErrorHandlingCommonUtils; import org.apache.iotdb.db.exception.BatchProcessException; import org.apache.iotdb.db.exception.QueryInBatchStatementException; import org.apache.iotdb.db.exception.StorageGroupNotReadyException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.query.QueryTimeoutRuntimeException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.protocol.thrift.OperationType; import org.apache.iotdb.db.queryengine.plan.planner.exceptions.ReplicaSetUnreachableException; import org.apache.iotdb.db.queryengine.plan.planner.exceptions.RootFIPlacementException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java index d4dce932aff6f..2d56bf88a3d12 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.utils; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/MemoryReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/MemoryReader.java index 0dc32fdc7e23a..d303e4065c4c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/MemoryReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/MemoryReader.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.utils.cte; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; +import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider similarity index 100% rename from iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider rename to iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider similarity index 100% rename from iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider rename to iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachineTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachineTest.java index 0b3a44008935f..8dc047118108b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachineTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachineTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.consensus.statemachine.dataregion; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; 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 c0308d119e77c..c6b455b23162f 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 @@ -19,6 +19,10 @@ package org.apache.iotdb.db.metadata.schemaRegion; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.column.ColumnHeader; @@ -30,10 +34,6 @@ import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.UpdateAssignment; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionTestUtil.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionTestUtil.java index 921093c37e4d3..430e0f273f3b4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionTestUtil.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionTestUtil.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.metadata.schemaRegion; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; @@ -27,7 +28,6 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilterFactory; import org.apache.iotdb.commons.schema.filter.impl.DeviceFilterUtil; import org.apache.iotdb.commons.schema.template.Template; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; 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/test/java/org/apache/iotdb/db/pipe/consensus/DeletionRecoverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionRecoverTest.java index b0f0572667ccc..6e2846b229d2d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionRecoverTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionRecoverTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.consensus.index.impl.RecoverProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.SimpleProgressIndex; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResourceManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.AbstractDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionResourceTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionResourceTest.java index 372400b897bcb..ac468677a515c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionResourceTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionResourceTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.consensus.index.impl.RecoverProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.SimpleProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.pipe.agent.task.progress.CommitterKey; import org.apache.iotdb.commons.pipe.agent.task.progress.PipeEventCommitManager; @@ -30,7 +31,6 @@ import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskSourceRuntimeEnvironment; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource.Status; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResourceManager; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java index ff3f47ac9c9af..0536d56df3e2b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java @@ -21,13 +21,13 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.PrefixTreePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent; import org.apache.iotdb.db.pipe.event.common.tablet.parser.TabletInsertionEventTreePatternParser; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/sink/PipeDataNodeThriftRequestTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/sink/PipeDataNodeThriftRequestTest.java index 662ae9a2099ee..6ee1860eefcbb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/sink/PipeDataNodeThriftRequestTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/sink/PipeDataNodeThriftRequestTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.pipe.sink; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.sink.payload.thrift.response.PipeTransferFilePieceResp; import org.apache.iotdb.commons.schema.SchemaConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.processor.twostage.exchange.payload.CombineRequest; import org.apache.iotdb.db.pipe.processor.twostage.state.CountState; import org.apache.iotdb.db.pipe.sink.payload.evolvable.request.PipeTransferDataNodeHandshakeV1Req; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java index 20529a7a78300..659578abc2f4e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.pipe.source; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.source.schemaregion.IoTDBSchemaRegionSource; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTreePatternParseVisitorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTreePatternParseVisitorTest.java index 55f80d4feaf35..c7ee8bd66dfd9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTreePatternParseVisitorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTreePatternParseVisitorTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.pipe.source; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePattern; @@ -27,7 +28,6 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.UnionIoTDBTreePattern; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.source.schemaregion.IoTDBSchemaRegionSource; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipeRealtimeExtractTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipeRealtimeExtractTest.java index 5ad4b8d991e23..14b8f0acb6c16 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipeRealtimeExtractTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipeRealtimeExtractTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant; @@ -28,7 +29,6 @@ import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskSourceRuntimeEnvironment; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionHybridSource; import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionLogSource; import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/SchemaRegionListeningQueueTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/SchemaRegionListeningQueueTest.java index 2f9a7c4c804c1..5fc7fcd53c6e0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/SchemaRegionListeningQueueTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/SchemaRegionListeningQueueTest.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.auth.AuthException; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.queue.ConcurrentIterableLinkedQueue; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java index f6240fe02fe39..274e46b891a91 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.qp.sql; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor; import org.junit.After; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java index 6476300ed3493..8940c79f6e17b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.common.schematree; -import org.apache.iotdb.db.node_commons.common.NodeRef; +import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java index 1968a2436e5ca..893e556a2774b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutorTest.java index 22b021b7424a0..d1b72b1c6d586 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutorTest.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.consensus.IConsensus; import org.apache.iotdb.consensus.exception.ConsensusException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.protocol.thrift.impl.DataNodeRegionManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.schemaengine.SchemaEngine; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java index 213e2307ff398..2ba14645f1564 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.calc_commons.execution.operator.process.AggregationMergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.CountAccumulator; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java index edf7131b09995..b84c4cd1e0651 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java index 092857bc9bdc7..d46598d04450b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.AlignedFullPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java index 8172a2b1b1942..19cae206ec287 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java index 67b15a92a23c7..b77d335d9bdc1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java @@ -21,11 +21,11 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.CteScanOperator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java index 063ed39432a0e..3cb17752bc238 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java index 719cfbdc77b05..f6ea789450df1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java @@ -21,14 +21,14 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java index d880cbf7aaaa5..0a9eff81214ae 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java @@ -20,9 +20,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java index 7d77c3e25dbf3..47870f2d3badd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java index 6649a6f6ebede..0d4fa40fe962e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.FixedIntervalFillFilter; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.IntPreviousFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java index 3ddbdf417d06e..a36c98f5efec3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java index 802655c8307e7..6daab5e148e86 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java @@ -20,8 +20,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java index d7bef9d86bf76..0b1b0b10ccdd5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryTreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryTreeSortOperatorTest.java index ff03ca9367f0b..323658f88e408 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryTreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryTreeSortOperatorTest.java @@ -20,9 +20,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java index c5d0ad9db9800..c32ca0c61fdc2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; 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 f8868a0d3e963..8289148ae17fd 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 @@ -20,13 +20,13 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MultiColumnMergerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MultiColumnMergerTest.java index b36d429acca44..d604c7eb834c6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MultiColumnMergerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MultiColumnMergerTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MultiColumnMerger; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java index 35a5ff0a459d8..177864b99ff1e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java @@ -21,6 +21,13 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.FieldColumnSchema; @@ -30,13 +37,6 @@ import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonOverlappedMultiColumnMergerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonOverlappedMultiColumnMergerTest.java index 09cfba8b43d2d..402e571087ea7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonOverlappedMultiColumnMergerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonOverlappedMultiColumnMergerTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.NonOverlappedMultiColumnMerger; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java index e1d3278ac904f..3443ecd0b448b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index daa3db41df121..dc72a0af97086 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; @@ -37,7 +38,6 @@ import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java index 12e8010c42102..b4a0062cbe8cb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java @@ -23,11 +23,11 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java index b66ee86cb64e5..fe1024d96ae80 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java index e22486c5147bc..f62939233efa7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleColumnMergerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleColumnMergerTest.java index 66a75608b8ea1..8e3ab2fc1b0dc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleColumnMergerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleColumnMergerTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java index 30f71a0c82e94..b0cc744c2bc73 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java @@ -20,9 +20,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java index 1ef09d1c95dac..4df5d64f658f4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java index 089d37d20bd0b..65f1f8801eb8f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java @@ -22,11 +22,11 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.SortOperator; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java index 2aca46bbadcd3..e39d8ce52f25f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.common.NodeRef; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java index 08fd4a88ba93f..170cfa3a1a441 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java @@ -21,13 +21,13 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java index 74cd3dd52720d..3e133aedbac44 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.LinearFill; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java index d2d5c62f644ca..01d3eea66ed46 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java @@ -22,12 +22,12 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java index edc281b9a41dc..378cf55a1e6fe 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java @@ -22,11 +22,11 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java index 8c83f40bdb53c..50dbed2c57c62 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java index 4d9a34cd12978..348c9d4b385d8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java index b62c009f9a7d7..d313f53f0d32d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.TableStreamSortOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java index e9ee663b35569..721f4d6b56a7c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.calc_commons.execution.operator.process.ValuesOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java index e2e3ec475b1b9..26b1f64ab56f6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWGroupWMoOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java index a04ef5f22e89d..a0cf92fc7930f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java index 1ef7a4b20d8c5..b1095a60598ed 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java index 9b9476bf2e7dd..c62cc701b2421 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java index 59dba2b9147d5..672e9c56cc30f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java index 7c4783677bbf9..488e97f63f1f7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java @@ -19,25 +19,25 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrPatternAlternationOptimizer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPatternFlattener; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrPatternAlternationOptimizer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPatternFlattener; import org.junit.Assert; import org.junit.Test; import java.util.Optional; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.alternation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.concatenation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.empty; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.excluded; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.label; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.permutation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.plusQuantified; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.questionMarkQuantified; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.rangeQuantified; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.starQuantified; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.alternation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.concatenation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.empty; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.excluded; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.label; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.permutation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.plusQuantified; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.questionMarkQuantified; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.rangeQuantified; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.starQuantified; public class IrRowPatternOptimizationTest { @Test diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java index 5a123e002ac52..973185c7447cd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregator; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; @@ -27,8 +29,6 @@ import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Program; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -38,15 +38,15 @@ import java.util.Map; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.alternation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.concatenation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.end; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.excluded; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.label; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.permutation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.questionMarkQuantified; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.starQuantified; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.start; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.alternation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.concatenation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.end; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.excluded; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.label; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.permutation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.questionMarkQuantified; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.starQuantified; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.start; import static org.mockito.Mockito.mock; public class MatcherTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java index 86264f0952565..747c92bc881a6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.RowNumberOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java index 8d7677a94343b..c9d5e2d926f83 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.TableWindowOperator; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RankFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java index 1280dd293be45..39f74101cddd1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.TopKRankingOperator; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java index f5748ee681979..b49e1dad56fd6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate; import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java index 5e91d23500bb8..2a0509657f006 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java index 350962529fe08..36b3c4698d6a9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java @@ -20,8 +20,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java index 1d2fe58b93f46..74743ab21ee11 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; 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 09ca7b0047886..a1712cf0d30fb 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 @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; 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.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java index 8bf1042abd46d..af18ff82410df 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java index 81ec8fa58fb0b..9c869f543ff31 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java index 4ccdae57f4386..0ad771954db8b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.AbstractTableScanOperatorParameter; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java index 2c325bbca84f6..fced1af059a5b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.expression.predicate; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java index 66dc7edb8fde1..84188d326a7b5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeFailTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; 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 6fba751d66fdd..5d190f9f3d883 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 @@ -22,9 +22,9 @@ 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.node_commons.common.SessionInfo; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.column.ColumnHeader; -import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java index d0ba14461f799..4d0025a3d276f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java index c5b80b552743f..6f93eac864234 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java index 28e35ac2bb101..8fd14751c0723 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.optimization; import org.apache.iotdb.common.rpc.thrift.TEndPoint; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java index f1c5438ec2702..7731fd000e411 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; 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.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java index 16ce7c9112864..c447d21c37fa0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.junit.Test; 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 1973df9be383d..7c2eb02aa4caf 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.optimization; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; 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.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ColumnInjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java index 75da051d84f64..6f298edc5cf65 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.auth.entity.PrivilegeType; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; 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/planner/ExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java index 1ce97704eb0c1..cace11e6493f2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner; +import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java index 1e0bc4565bb6a..3df13339a9433 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java @@ -25,14 +25,14 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.partition.QueryExecutor; import org.apache.iotdb.commons.partition.StorageExecutor; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java index 1210ce434d796..96a8c60b50816 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java @@ -23,12 +23,12 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; 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.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java index 885122ce07fb7..c6bd87aec1a9e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java index eac3821e0ddf1..c0d8cc5a48e4c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java @@ -22,10 +22,10 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java index c912eb162eab3..d47fc598dcc50 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java @@ -20,6 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.FirstAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.FirstByAccumulator; @@ -30,8 +32,6 @@ import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.enums.TSDataType; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByDeviceOrderByLimitOffsetTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByDeviceOrderByLimitOffsetTest.java index 815ad831a63f4..ab77f1d9f6de9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByDeviceOrderByLimitOffsetTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByDeviceOrderByLimitOffsetTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByTimeOrderByLimitOffsetTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByTimeOrderByLimitOffsetTest.java index b3d46d879e841..5a053f353626f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByTimeOrderByLimitOffsetTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByTimeOrderByLimitOffsetTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java index aff18c752cc17..7a812832724e1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java index 14808ea1065ba..6b4fea340e7df 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java @@ -21,12 +21,12 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerCycleTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerCycleTest.java index b232f5ecf9746..e47fc198a5612 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerCycleTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerCycleTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java index b5392954f54f2..7e6733c51e8a2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NoDataRegionPlanningTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NoDataRegionPlanningTest.java index 155be1902fcbe..a3575667eaf03 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NoDataRegionPlanningTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NoDataRegionPlanningTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/RegionScanPlanningTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/RegionScanPlanningTest.java index bd4b49cc6e969..6064e4bb90b3b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/RegionScanPlanningTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/RegionScanPlanningTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java index 387900bf69715..f9e28c7644b13 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java @@ -27,6 +27,7 @@ import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.SchemaNodeManagementPartition; @@ -36,7 +37,6 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util2.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util2.java index 9654208a40f0c..aba865163a095 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util2.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util2.java @@ -26,6 +26,7 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.SchemaNodeManagementPartition; @@ -35,7 +36,6 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; 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 0db43153e14d9..0f52afa64aa1d 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 @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.logical; import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; 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.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java index bc00ff4160202..a9fbac9ac0674 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.logical; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java index 0f434c4fc3193..3c89e2e92ebf8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java @@ -20,15 +20,15 @@ package org.apache.iotdb.db.queryengine.plan.planner.logical; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.SchemaConstant; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java index 8ac50e4b9444a..8cfe0a1e8fdaf 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java @@ -21,12 +21,12 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.filter.SchemaFilterType; import org.apache.iotdb.commons.schema.filter.impl.PathContainsFilter; import org.apache.iotdb.commons.schema.filter.impl.TagFilter; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanGraphPrinterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanGraphPrinterTest.java index 841aa19929010..252b739afd073 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanGraphPrinterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanGraphPrinterTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java index ac11d782225da..16e97e31679ab 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/load/LoadTsFileNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/load/LoadTsFileNodeTest.java index 5e382a83fd624..06746fb40f110 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/load/LoadTsFileNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/load/LoadTsFileNodeTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.load; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadSingleTsFileNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePieceNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java index 135fecf532006..cc9c07aa5059f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java index 585a2fcf7c1b4..bf5ca207292fd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java @@ -20,9 +20,9 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/NodeManagementMemoryMergeNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/NodeManagementMemoryMergeNodeSerdeTest.java index 8756aef558363..8df17ff99e6ef 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/NodeManagementMemoryMergeNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/NodeManagementMemoryMergeNodeSerdeTest.java @@ -22,10 +22,10 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TSchemaNode; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.node.MNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java index d29ce46914033..f6275ddf41096 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.PathsUsingTemplateScanNode; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaCountNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaCountNodeSerdeTest.java index a391754164595..aaf6af7cb5950 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaCountNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaCountNodeSerdeTest.java @@ -20,9 +20,9 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java index 1c4c62a1cd435..5352f5ea6f597 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaFetchMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SeriesSchemaFetchScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java index 2c2076a49f412..ecb79d3f3f95a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SeriesSchemaFetchScanNode; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java index 4899b3e4c0e5b..e44d7251b6b7a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java @@ -20,9 +20,9 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java index 834b15e0856cd..d55b744f26080 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.metadata.write; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.BatchActivateTemplateNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java index d236b4c9e509d..052d535ddbdbc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java index d6e56f1eaf39c..41c7d6bc72559 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.pipe; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedInsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java index 7ed8a9109feda..c78b1580a042f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.pipe; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.DeleteTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedNonWritePlanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java index 1afbf6ef35086..74af30e1aad3c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.pipe; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalBatchActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedWritePlanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java index 86bc0f13f65e6..9bf3495bf3274 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/DeviceViewNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/DeviceViewNodeSerdeTest.java index 3c6134dc23dbe..6f3659c6276ab 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/DeviceViewNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/DeviceViewNodeSerdeTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/ExchangeNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/ExchangeNodeSerdeTest.java index 39f73813ba2f2..8c501701500b7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/ExchangeNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/ExchangeNodeSerdeTest.java @@ -20,7 +20,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java index ff3633f550cb4..748838429f0d6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java index 887f3b261d463..538eb25a35654 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; 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.leaf.ConstantOperand; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java index 10f9b3d08b09b..2486e41b38784 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java @@ -20,9 +20,9 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java index a146a6a934755..dc09501fadb7f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java @@ -20,9 +20,9 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java index 94c48ee146a27..5c19ddbb81440 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewIntoNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.IntoNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/LimitNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/LimitNodeSerdeTest.java index f3d8f0b1bdc2f..3690100923894 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/LimitNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/LimitNodeSerdeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/OffsetNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/OffsetNodeSerdeTest.java index 098b1bec8ea19..dd6a4e766f99e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/OffsetNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/OffsetNodeSerdeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SingleDeviceViewNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SingleDeviceViewNodeSerdeTest.java index 745ecf2c35e81..6dbe8d1d89901 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SingleDeviceViewNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SingleDeviceViewNodeSerdeTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleDeviceViewNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SortNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SortNodeSerdeTest.java index b7fdf1d9175fc..221c16714377e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SortNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SortNodeSerdeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java index af7e8527fd00b..502c6e84b95fa 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.InnerTimeJoinNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java index af562161cbf1c..8593312483430 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java @@ -20,21 +20,21 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; +import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; -import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.FunctionNullability; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/IdentitySinkNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/IdentitySinkNodeSerdeTest.java index 087be3cdfd698..e31a3668f5434 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/IdentitySinkNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/IdentitySinkNodeSerdeTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/ShuffleSinkHandleNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/ShuffleSinkHandleNodeSerdeTest.java index 1e8aa6a2cbc9d..7a59853e698bd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/ShuffleSinkHandleNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/ShuffleSinkHandleNodeSerdeTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.ShuffleSinkNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java index 25d86e17887ec..47e88b00ca115 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java @@ -20,10 +20,10 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java index 820fa8aace59d..accb94bc76a13 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.source; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java index 0b737ceea7796..49bd523583027 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.LastQueryScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.ShowDiskUsageNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java index 4a96067329135..27bed5fcc8509 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.write; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.ContinuousSameSearchIndexSeparatorNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALByteBufferForTest; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java index 6bbe4fcd1f6d8..8b4159aafff8a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java index 2ecf492d14294..f541ec6732b89 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.write; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertMultiTabletsNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java index 6645810eda8cc..3ce3d90ba3b74 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.write; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALByteBufferForTest; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java index 0e6cb54c233c9..af479d8ac39bd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.write; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertRowNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java index 66faaf76ae184..f933e3514c92d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.write; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsOfOneDeviceNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java index 9ded59cbfd2b9..85eb9acc8aa23 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.write; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALByteBufferForTest; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java index 42b13c08f159e..a7851aa2d734c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java @@ -28,6 +28,7 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.executor.SeriesPartitionExecutor; @@ -35,7 +36,6 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertMultiTabletsNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java index df33c0f22c5ea..817def4d4ac77 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.write; import org.apache.iotdb.commons.consensus.index.impl.IoTProgressIndex; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.storageengine.dataregion.modification.DeletionPredicate; import org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.And; import org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.FullExactMatch; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java index b499dd5a4eb62..8200c9bb1cb56 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -52,6 +52,7 @@ import java.util.List; import java.util.OptionalInt; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.EXTREME; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.FIRST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; @@ -60,7 +61,6 @@ import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java index c10d7ccce10aa..87a8c2d563cc0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; @@ -35,13 +35,13 @@ import java.util.Optional; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; 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 e52e70697ca5d..dc1c1ab427c82 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 @@ -26,29 +26,29 @@ import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.executor.SeriesPartitionExecutor; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java index a278bb3b15a5d..980eed94f8112 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; @@ -32,9 +32,9 @@ import com.google.common.collect.ImmutableSet; import org.junit.Test; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.assertAnalyzeSemanticException; 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.equiJoinClause; 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 a028679dec67a..e7d7c6c4a9572 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 @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.execution.config.TableConfigTaskVisitor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/DistinctTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/DistinctTest.java index fe25406826a9a..31913900693b2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/DistinctTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/DistinctTest.java @@ -30,7 +30,7 @@ import java.util.Optional; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java index 7f100965cf6ea..d6bee8de53bd2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import com.google.common.collect.ImmutableMap; import org.junit.BeforeClass; import org.junit.Test; -import static org.apache.iotdb.db.node_commons.utils.DateTimeUtils.initTimestampPrecision; +import static org.apache.iotdb.commons.node_commons.utils.DateTimeUtils.initTimestampPrecision; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.assertAnalyzeSemanticException; 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.expression; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java index 4b45e971f7a9b..d4c585e880e5f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; 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 b9262f8fb8618..332406985a236 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 @@ -20,22 +20,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.calc_commons.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -72,12 +72,12 @@ import java.util.List; import java.util.Optional; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AnalyzerTest.analyzeSQL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.ALL_DEVICE_ENTRIES; 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 37beedf87d667..2fd2e16684595 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 @@ -20,15 +20,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java index 843d96b409c40..e876c52917e82 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java index 59682729487a2..7334704229b5d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java @@ -14,10 +14,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; 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 ec9ea35fb0e78..683e163f987c4 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 @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; 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 7418b9e136596..82da0db14d2ef 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 @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java index 0eec23bd9a38b..a2a7745d485ca 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java @@ -19,6 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnMetadata; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.SchemaNodeManagementPartition; @@ -26,17 +37,6 @@ import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnMetadata; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; -import org.apache.iotdb.db.node_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java index 548522a21f391..504c287dee43a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; @@ -38,16 +38,16 @@ import java.util.Optional; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.DIVIDE; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.DIVIDE; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java index f7462691bc70d..f9683ac15219f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ForecastTableFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.ForecastTableFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; @@ -37,12 +37,12 @@ import java.util.Collections; import java.util.function.Consumer; -import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_INTERVAL; -import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_START_TIME; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.FIRST; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_INTERVAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_START_TIME; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.FIRST; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AnalyzerTest.analyzeSQL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.QUERY_CONTEXT; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.TEST_MATADATA; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index a46d055f21018..6346d31617902 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -19,6 +19,24 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.node_commons.plan.relational.function.TableBuiltinTableFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnMetadata; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.SchemaNodeManagementPartition; @@ -27,24 +45,6 @@ import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; -import org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic.SubtractionResolver; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnMetadata; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeManager; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; -import org.apache.iotdb.db.node_commons.plan.udf.BuiltinAggregationFunction; -import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher; import org.apache.iotdb.db.queryengine.plan.function.Exclude; 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 534a6f940bbb7..fe67445cbd338 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 @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; 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.node.DeviceTableScanNode; 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 b0a7b18c938d4..7add9179e519b 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 @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TreeViewTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TreeViewTest.java index bdbed5c3b3a4c..7cdf75860cb7d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TreeViewTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TreeViewTest.java @@ -35,9 +35,9 @@ import java.util.Optional; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata.DEVICE_VIEW_TEST_TABLE; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata.TREE_VIEW_DB; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanAssert.assertPlan; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java index 03f81dacb25ee..8c24d60263ac9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; @@ -36,7 +36,7 @@ import java.util.Collections; import java.util.Optional; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.expression; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java index 0e67699cab072..bbb75177bc2f0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java @@ -23,11 +23,11 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.schema.column.ColumnHeader; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; @@ -57,10 +57,10 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java index 0be52409320b9..30a19f6821381 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java @@ -23,10 +23,10 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.schema.column.ColumnHeader; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; @@ -53,7 +53,7 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; 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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java index 6cf1546d5ae6c..e0db086b8d396 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; @@ -35,12 +35,12 @@ import com.google.common.collect.ImmutableSet; import org.junit.Test; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; 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.any; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.anyTree; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java index b3217b85302e7..7a72ebfb296cc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java @@ -20,25 +20,25 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.Measure; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SkipToPosition; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -60,10 +60,10 @@ import java.util.Optional; import java.util.Set; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.concatenation; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.excluded; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.label; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.Patterns.starQuantified; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.concatenation; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.excluded; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.label; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.starQuantified; import static org.junit.Assert.assertEquals; public class PatternRecognitionNodeSerdeTest { 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 09a9446bb080a..351122c3bc756 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 @@ -21,12 +21,12 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.conf.IoTDBConstant; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java index 2fe0c7bef61da..951fa9e3a6ac4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java index 412fa540c3b40..f9dfe8e7bdc25 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; @@ -39,12 +39,12 @@ import java.util.Collections; import java.util.Optional; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java index 4f0a82ec45449..d02abdae56079 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java index 4fa07a722e17c..6e950cf6ab24e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java index c848afcc8f02c..16dc7f30c9ede 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Map; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java index 90af4f89d1d69..09bee2eee6691 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java index 495805040900a..c074c22e2b749 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Collection; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java index 11d5242f12e0e..223bce917963c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java index 886e86c373098..739b40b8e7045 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java index 786332c415ab6..3b8233dc7b5ca 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java index 35f7e99fa0f6a..e3e0eabd60424 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java index dab164985850f..ac28bcfa9c016 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java index ca63b46468699..ec30f6b73d98c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Set; 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 4dcbcf3a51d0d..2c5a95808088e 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java index 0fd6ee6e360cb..92637aa324b8a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java @@ -21,9 +21,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; 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 index 2b0741e9a03bc..9f8e6904dc550 100644 --- 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 @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/EquiJoinClauseProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/EquiJoinClauseProvider.java index f33a76f4e7fc1..dad730ce71be8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/EquiJoinClauseProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/EquiJoinClauseProvider.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java index bb0a60c41119b..7b860615e4831 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java index 5afd944c9bc92..9f16ef708f1ae 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java index 3fce94b518839..45ef8b90ae7c7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java @@ -19,36 +19,36 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DecimalLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java index 2799d67b9e688..d488aa936f6a3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java index df6746f32e658..10987cec2a1b1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java index 1dfc6d529fc88..a8f244e1d5e47 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.Preconditions.checkState; 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 index bd7fe863774c5..41ef19d559a29 100644 --- 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 @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java index b61be9de708aa..9b72dc9ed6142 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java index fd5be67799bdc..b6e14f8546c37 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java index 1307adce00944..2e81971f8fe64 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MatchResult.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MatchResult.java index 361b477f799e1..ff9988ac9c567 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MatchResult.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MatchResult.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java index 41a8fd31d9803..997c6f5dfee1b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; public interface Matcher { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java index 75b6f05c700e6..26e10ea188bc7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java index b84a6f22f258d..1e1170d0c820b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java index 573c75d2e3d91..25f36936935a3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java index 3ad067dcb2b28..cb66fe8d98a0f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata; 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 e79a75860bd17..9ed2bc5688ed2 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 @@ -19,38 +19,38 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; @@ -86,14 +86,14 @@ import static com.google.common.collect.ImmutableMap.toImmutableMap; import static java.util.Collections.nCopies; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.FIRST; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.UNDEFINED; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.FIRST; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.UNDEFINED; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; 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; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.StrictAssignedSymbolsMatcher.actualAssignments; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java index 9d4d63528f084..09bc7249e3732 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; @@ -32,7 +32,7 @@ import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments.identity; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments.identity; 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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java index cd77262852ddb..932f4b92f1f75 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanTestSymbol.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanTestSymbol.java index 5fc9b67d90aa6..80834fed24a00 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanTestSymbol.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanTestSymbol.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; public interface PlanTestSymbol { Symbol toSymbol(SymbolAliases aliases); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java index b69c998545cb8..9a4e8364a7724 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.function.Predicate; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java index 6bb59bd41bfdc..e16879acb493d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java index 0c0786ad57192..cf74aa84b4a7f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java index 2113038decbb8..a838b2f06a00e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java index 9babb64d4ef2a..4c6e97239b1f6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java index 2f1a6cd732616..dbb2f8ec42234 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java index a63e8b54901d5..b0dc4872f7d73 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAlias.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAlias.java index 4bda25a170e52..6ef122518dc3c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAlias.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAlias.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import static java.util.Objects.requireNonNull; 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 96c2def8707df..c9f09bd4d5204 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 @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java index 7a91253871b3c..55b4c5ca2e424 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; 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 c0087c25ac93e..3632951b766ea 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 @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java index cdb3cb9326bbf..a91ad4d14842b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java index d00dea7a0055c..1d21bb5270a8b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.Ordering; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java index 2504062bc0a38..379199adf7dfc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java index 0a63e815d9157..d58f964a1a20d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.informationschema; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; @@ -29,6 +29,7 @@ import java.util.Optional; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.BIN; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.CLIENT_IP; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.COST_TIME; @@ -40,7 +41,6 @@ import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.STATEMENT_TABLE_MODEL; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.STATE_TABLE_MODEL; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.USER_TABLE_MODEL; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; 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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java index 31c8a9962f9bd..eafa5d288a4d7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.predicate; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.tsfile.read.common.type.IntType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/AstMemoryEstimatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/AstMemoryEstimatorTest.java index c1ebeb5f331d1..f0286f616bc05 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/AstMemoryEstimatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/AstMemoryEstimatorTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SqlParserErrorHandlerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SqlParserErrorHandlerTest.java index 5d7662a097d6b..968ed2a67283e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SqlParserErrorHandlerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SqlParserErrorHandlerTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java index 035d1028c64ed..e3b88f8be8eae 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.auth.entity.PrivilegeModelType; import org.apache.iotdb.commons.auth.entity.PrivilegeType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RelationalAuthorStatement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java index 9a8fbe2661843..d56404565bd0d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java @@ -19,6 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.statement; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TsTable; @@ -26,11 +31,6 @@ import org.apache.iotdb.commons.schema.table.column.FieldColumnSchema; import org.apache.iotdb.commons.schema.table.column.TagColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/QueryStatementTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/QueryStatementTest.java index 307bee5829cd5..ad812e74a0c6e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/QueryStatementTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/QueryStatementTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.statement; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java index 4260a7df70630..edb9f5b4d88ef 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.statement; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.commons.path.PartialPath; 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.FieldColumnSchema; import org.apache.iotdb.commons.schema.table.column.TagColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java index db45fab9e290d..25f51c333bd6d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.db.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SessionInfo; -import org.apache.iotdb.db.node_commons.common.SqlDialect; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java index 8a4880b8cbf42..c5a481f65e787 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java index 7cfb33382d4de..2e01d0698b0d4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java index edee703f32644..18319c705f3f7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java index 2892e44caca57..43f3a19337827 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java index 00dc61776152a..6e084bdecd083 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.LpadColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java index 6657aa2237bb2..66595bb03480f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.RpadColumnTransformer; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java index 30ca862f15917..8a78f435b0824 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java index 63af69cd782c6..74a656740ede8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java index 3ea565b9a57b3..2eda860b269c3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java index 6601c096b4de1..20c59f3a7d896 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java index 2c5fc2ee8a29a..b2a744a88f637 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java index c9ce05d2f6fc6..281ce06dc3fe1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java index 73bd2facfaa55..17de5ce9b97fc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java @@ -21,10 +21,10 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base32Encoding; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java index c678025c2c79b..672f10daf6822 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java index cd21a3e1505ea..3ed983b5824eb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java index 2d26a1f231ff3..7ed1562c1164b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.junit.Assert; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java index 810045cc8cbc9..33f4bd2db8378 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java @@ -28,6 +28,7 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.consensus.ConsensusFactory; @@ -43,7 +44,6 @@ import org.apache.iotdb.db.consensus.statemachine.dataregion.IoTConsensusDataRegionStateMachine; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.load.LoadFileException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.protocol.thrift.impl.DataNodeInternalRPCServiceImpl; import org.apache.iotdb.db.protocol.thrift.impl.DataNodeRegionManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.CreateAlignedTimeSeriesNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java index e2959f4e89e95..a91934137b187 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.exception.ShutdownException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; @@ -37,7 +38,6 @@ import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.exception.WriteProcessRejectException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java index 267d58a8739ef..52be97716c6ce 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.ttl.TTLCache; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.exception.query.OutOfTTLException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java index c03994df5100d..5520ebcd34031 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.concurrent.ExceptionalCountDownLatch; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java index 38300811c74b0..3f79a3c41c240 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.concurrent.ExceptionalCountDownLatch; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java index 942c45e78cf5c..08ccd8e3737ef 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.storageengine.dataregion.compaction.inner; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataRegionException; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.storageengine.buffer.BloomFilterCache; import org.apache.iotdb.db.storageengine.buffer.ChunkCache; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java index 11125e7a1b662..23b65b391a08d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.storageengine.dataregion.compaction.inner; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataRegionException; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.storageengine.buffer.BloomFilterCache; import org.apache.iotdb.db.storageengine.buffer.ChunkCache; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandlerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandlerTest.java index cfb1c5341a9d2..c76b2a3df916e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandlerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandlerTest.java @@ -24,6 +24,7 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.StartupException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.TsFileProcessorException; import org.apache.iotdb.db.exception.WriteProcessException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemTableTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemTableTestUtils.java index a3c992c16d3bf..f1468650bfb80 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemTableTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemTableTestUtils.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.WriteProcessException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java index 4fcfe9e06c3f7..3e979c02334d6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java @@ -21,6 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; @@ -31,7 +32,6 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessorTest.java index a3668a33ed946..64d529e224488 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessorTest.java @@ -22,6 +22,7 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.file.SystemFileFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.exception.DataRegionException; import org.apache.iotdb.db.exception.TsFileProcessorException; import org.apache.iotdb.db.exception.WriteProcessException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManagerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManagerTest.java index 2c08900003cf6..87d93e40612d1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManagerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManagerTest.java @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.allocation.ElasticStrategy; import org.apache.iotdb.db.storageengine.dataregion.wal.node.WALNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java index bad49f715acb6..a91d104381beb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.storageengine.dataregion.wal; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java index 3e0ccbbdea3c9..22dfa20631206 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.node.IWALNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALFileUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java index 932efe73fa554..859d55f11d059 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.node.IWALNode; import org.apache.iotdb.db.storageengine.dataregion.wal.node.WALNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java index b095fd8ce7b7e..a68e1b4590989 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.node.IWALNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALFileUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java index 7f66ad9b5668a..5f7fec5253ff3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.buffer; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.io.WALReader; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALFileUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java index aac39f47e5b60..6fc21e5dfd4e0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.io; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java index e4b3fc382e1f9..00aab67665e71 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.node; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.common.request.IndexedConsensusRequest; import org.apache.iotdb.consensus.iot.log.ConsensusReqReader; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALFakeNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALFakeNodeTest.java index c0b162e6a4e82..392403eabaa3e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALFakeNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALFakeNodeTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.storageengine.dataregion.wal.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java index e03ff250928bf..1dfbf6f5685f2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java @@ -20,11 +20,11 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.db.storageengine.dataregion.DataRegionTest; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java index 2fbbeb3e62d3d..01c3d311dea78 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.consensus.iot.log.ConsensusReqReader; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.StorageEngine; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java index 046797f3c3f81..30b1780a3b355 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRepairWriterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRepairWriterTest.java index 8fac39c7de842..088c0ee6d90e8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRepairWriterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRepairWriterTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.recover; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntry; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java index b629ccb701113..0971aacafd7d9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java @@ -18,13 +18,13 @@ */ package org.apache.iotdb.db.storageengine.dataregion.wal.recover.file; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; 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.table.column.TsTableColumnCategory; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java index f0f4d9fb94471..8449d2482c4d1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.recover.file; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.TsTable; @@ -26,7 +27,6 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataRegionException; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/trigger/executor/TriggerExecuteTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/trigger/executor/TriggerExecuteTest.java index 9453e52f5c257..a13111c0f4c67 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/trigger/executor/TriggerExecuteTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/trigger/executor/TriggerExecuteTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.trigger.executor; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.trigger.TriggerInformation; import org.apache.iotdb.confignode.rpc.thrift.TTriggerState; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.trigger.service.TriggerManagementService; import org.apache.iotdb.trigger.api.Trigger; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/DateTimeUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/DateTimeUtilsTest.java index 35872a9a67613..494093c07e5b8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/DateTimeUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/DateTimeUtilsTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.utils; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java index 246b1387ed341..2ca087f8d8ec6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java @@ -22,11 +22,11 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.StartupException; +import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.schemaengine.SchemaEngine; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ErrorHandlingUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ErrorHandlingUtilsTest.java index 23feb2bfbd99f..f3719c09d4344 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ErrorHandlingUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ErrorHandlingUtilsTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.utils; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.exception.StorageGroupNotReadyException; import org.apache.iotdb.db.exception.metadata.PathNotExistException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.protocol.thrift.OperationType; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/MemUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/MemUtilsTest.java index acc7147359f49..d124544e601d9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/MemUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/MemUtilsTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.utils; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TimestampPrecisionUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TimestampPrecisionUtilsTest.java index d88b440250754..525a2fdfa54d2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TimestampPrecisionUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TimestampPrecisionUtilsTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.utils; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.junit.Test; diff --git a/iotdb-core/node-commons/pom.xml b/iotdb-core/node-commons/pom.xml index 29cb467f790ef..894a88a146b1c 100644 --- a/iotdb-core/node-commons/pom.xml +++ b/iotdb-core/node-commons/pom.xml @@ -55,6 +55,11 @@ external-service-api 2.0.7-SNAPSHOT + + org.apache.iotdb + iotdb-relational-grammar + 2.0.7-SNAPSHOT + org.apache.iotdb udf-api diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/sql/SemanticException.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/SemanticException.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/sql/SemanticException.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/SemanticException.java index 630929318c28a..4e43b890b4a21 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/sql/SemanticException.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/exception/SemanticException.java @@ -17,9 +17,8 @@ * under the License. */ -package org.apache.iotdb.db.exception.sql; +package org.apache.iotdb.commons.exception; -import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.rpc.TSStatusCode; public class SemanticException extends IoTDBRuntimeException { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/ConnectionInfo.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/ConnectionInfo.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/ConnectionInfo.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/ConnectionInfo.java index d5c2dd5106394..dece95aecc2d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/ConnectionInfo.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/ConnectionInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.common; +package org.apache.iotdb.commons.node_commons.common; public class ConnectionInfo { private final long userId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/NodeRef.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/NodeRef.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/NodeRef.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/NodeRef.java index 3ce7596307f90..39b79a81b2293 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/NodeRef.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/NodeRef.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.common; +package org.apache.iotdb.commons.node_commons.common; import static java.lang.String.format; import static java.lang.System.identityHashCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/SessionInfo.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/SessionInfo.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/SessionInfo.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/SessionInfo.java index f0b0863c4ede7..1d2d00ae8626e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/SessionInfo.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/SessionInfo.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.common; +package org.apache.iotdb.commons.node_commons.common; import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion; +import org.apache.iotdb.commons.node_commons.plan.relational.security.Identity; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.node_commons.plan.relational.security.Identity; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/SqlDialect.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/SqlDialect.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/SqlDialect.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/SqlDialect.java index cbab98514dc60..62b4f69424752 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/common/SqlDialect.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/SqlDialect.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.common; +package org.apache.iotdb.commons.node_commons.common; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/MemoryEstimationHelper.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/MemoryEstimationHelper.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/MemoryEstimationHelper.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/MemoryEstimationHelper.java index defad97799393..1498ce05fdd8b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/MemoryEstimationHelper.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/MemoryEstimationHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution; +package org.apache.iotdb.commons.node_commons.execution; import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.MeasurementPath; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java index 6810dd7f7f2bc..85155c06abf1f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped; public interface UpdateMemory { UpdateMemory NOOP = () -> true; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java index 3284c1414165a..8e9a22282c005 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; public final class CombineHashFunction { private CombineHashFunction() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java index 16d1866fa4014..703f72c64907c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -35,7 +35,7 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Verify.verify; import static java.lang.Math.min; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.sumExact; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.sumExact; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; // This implementation assumes arrays used in the hash are always a power of 2 diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java index 8159b921886f2..84fc5abad4eea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -32,8 +32,8 @@ import static java.lang.Math.max; import static java.lang.Math.min; import static java.lang.Math.toIntExact; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.VariableWidthData.EMPTY_CHUNK; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.VariableWidthData.POINTER_SIZE; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.VariableWidthData.EMPTY_CHUNK; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.VariableWidthData.POINTER_SIZE; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfByteArray; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfIntArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java index 714479b780988..d4af7aa615ace 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java index 408fe209a99b8..afb7f1f6cf271 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import com.google.common.annotations.VisibleForTesting; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java index d215de8ed8963..840d93f9856d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; -import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; +import org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.Column; @@ -27,8 +27,8 @@ import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil.getFlatVariableWidthSize; -import static org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil.notDistinctFrom; +import static org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil.getFlatVariableWidthSize; +import static org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil.notDistinctFrom; public class HashStrategy implements FlatHashStrategy { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java index 2b2195585501e..a50d852a80d65 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import com.google.common.annotations.VisibleForTesting; import org.apache.tsfile.block.column.Column; @@ -32,8 +32,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; public class MarkDistinctHash { private final GroupByHash groupByHash; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java index 1272b3f045e40..d551ed68f9546 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlockBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java index f3f209bc77928..516bcd506e061 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; import com.google.common.primitives.Ints; import org.apache.tsfile.utils.RamUsageEstimator; @@ -30,9 +30,9 @@ import static java.lang.Math.addExact; import static java.lang.Math.max; import static java.lang.Math.subtractExact; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.bytesToInt; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.intToBytes; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.sumExact; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.bytesToInt; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.intToBytes; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.sumExact; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfObjectArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java index 9c6e127f2cea8..017b5e79468e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; import java.io.IOException; import java.io.InputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/analyze/ITableTypeProvider.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/analyze/ITableTypeProvider.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/analyze/ITableTypeProvider.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/analyze/ITableTypeProvider.java index b30a3edbebdab..a8f468c83839f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/analyze/ITableTypeProvider.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/analyze/ITableTypeProvider.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.analyze; +package org.apache.iotdb.commons.node_commons.plan.analyze; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/multi/FunctionType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/expression/multi/FunctionType.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/multi/FunctionType.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/expression/multi/FunctionType.java index ee67c75734cd3..bbfce3cb6b7a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/expression/multi/FunctionType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/expression/multi/FunctionType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.expression.multi; +package org.apache.iotdb.commons.node_commons.plan.expression.multi; /** */ public enum FunctionType { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java similarity index 52% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java index 392001e1989ab..113b6286c11e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java @@ -12,31 +12,31 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import java.io.DataInputStream; import java.io.IOException; @@ -65,29 +65,29 @@ public PlanNode deserialize(ByteBuffer buffer) { public PlanNode deserialize(ByteBuffer buffer, short nodeType) { switch (nodeType) { case 1001: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode.deserialize( - buffer); + return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode + .deserialize(buffer); case 1002: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode + return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode .deserialize(buffer); case 1003: return OutputNode.deserialize(buffer); case 1004: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode.deserialize( - buffer); + return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode + .deserialize(buffer); case 1005: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode.deserialize( - buffer); + return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode + .deserialize(buffer); case 1006: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode.deserialize( - buffer); + return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode + .deserialize(buffer); case 1007: return MergeSortNode.deserialize(buffer); case 1008: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode.deserialize( - buffer); + return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode + .deserialize(buffer); case 1009: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode + return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode .deserialize(buffer); case 1010: return StreamSortNode.deserialize(buffer); @@ -100,7 +100,7 @@ public PlanNode deserialize(ByteBuffer buffer, short nodeType) { case 1014: return ValueFillNode.deserialize(buffer); case 1015: - return org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode + return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode .deserialize(buffer); case 1017: return GapFillNode.deserialize(buffer); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java similarity index 61% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java index 0ffcaa1668b61..ed39ec23a56a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java @@ -12,47 +12,47 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.node.WindowNode; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; public interface ICoreQueryPlanVisitor extends IPlanVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPartitionRelatedNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPartitionRelatedNode.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPartitionRelatedNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPartitionRelatedNode.java index ef2a803454b9f..9cbc2ab6217d4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPartitionRelatedNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPartitionRelatedNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java index f918eec671a1e..4f00fae62c2bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; import java.io.DataInputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializerProvider.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanNodeDeserializerProvider.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializerProvider.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanNodeDeserializerProvider.java index 72db2e50019ce..87f5d518d70d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanNodeDeserializerProvider.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanNodeDeserializerProvider.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; public interface IPlanNodeDeserializerProvider { IPlanNodeDeserializer getDeserializer(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanVisitor.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanVisitor.java index ff9278fdafdaa..658e9553dee83 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/IPlanVisitor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanVisitor.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; public interface IPlanVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNode.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNode.java index 51a8f42b0705b..3bd5d26e06d22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNode.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; -import org.apache.iotdb.consensus.common.request.IConsensusRequest; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.tsfile.utils.PublicBAOS; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeId.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNodeId.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeId.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNodeId.java index 7e5a68e96d56b..c09b15b979913 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeId.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNodeId.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; import org.apache.tsfile.utils.Accountable; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNodeType.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeType.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNodeType.java index 328ed4c42bfec..b589a54626b73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/PlanNodeType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNodeType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java index c101cce5771b1..69da4aaa3a849 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.node.process; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/ProcessNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/ProcessNode.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/ProcessNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/ProcessNode.java index 7092f5cf82563..24792bde7e338 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/ProcessNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/ProcessNode.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.node.process; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; public abstract class ProcessNode extends PlanNode { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java index f3608fc5bd6b2..3544df746bc57 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.node.process; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/TwoChildProcessNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/TwoChildProcessNode.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/TwoChildProcessNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/TwoChildProcessNode.java index ab2d4544e6afb..78aef78c2d33f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/process/TwoChildProcessNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/TwoChildProcessNode.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.node.process; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/source/SourceNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/source/SourceNode.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/source/SourceNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/source/SourceNode.java index ebb20e3e2c229..e820ef6e9089f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/node/source/SourceNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/source/SourceNode.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.node.source; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPartitionRelatedNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPartitionRelatedNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; public abstract class SourceNode extends PlanNode implements AutoCloseable, IPartitionRelatedNode { protected SourceNode() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/parameter/InputLocation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/parameter/InputLocation.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/parameter/InputLocation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/parameter/InputLocation.java index 32c3cabdc5e1b..990b8d661ed6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/planner/plan/parameter/InputLocation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/parameter/InputLocation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.node_commons.plan.planner.plan.parameter; +package org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/analyzer/NodeRef.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/analyzer/NodeRef.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/analyzer/NodeRef.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/analyzer/NodeRef.java index 2aff097c58104..77a0d851a369b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/analyzer/NodeRef.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/analyzer/NodeRef.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.analyzer; +package org.apache.iotdb.commons.node_commons.plan.relational.analyzer; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; import static java.lang.System.identityHashCode; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/BoundSignature.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/BoundSignature.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/BoundSignature.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/BoundSignature.java index 4aca02fc832be..1335a7163a224 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/BoundSignature.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/BoundSignature.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function; +package org.apache.iotdb.commons.node_commons.plan.relational.function; -import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; +import org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionId.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/FunctionId.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionId.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/FunctionId.java index b6ab0aa407546..a97fcde167548 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionId.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/FunctionId.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function; +package org.apache.iotdb.commons.node_commons.plan.relational.function; import java.util.Locale; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionKind.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/FunctionKind.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionKind.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/FunctionKind.java index a3cdfa26c0301..3f70a34cd260e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/FunctionKind.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/FunctionKind.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function; +package org.apache.iotdb.commons.node_commons.plan.relational.function; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionAINodeService.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionAINodeService.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionAINodeService.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionAINodeService.java index db2ed961f2d31..423cc8d7cc1a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionAINodeService.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionAINodeService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function; +package org.apache.iotdb.commons.node_commons.plan.relational.function; import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionAINodeServiceProvider.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionAINodeServiceProvider.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionAINodeServiceProvider.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionAINodeServiceProvider.java index c3bc47844f4e9..eea5032ec4737 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionAINodeServiceProvider.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionAINodeServiceProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function; +package org.apache.iotdb.commons.node_commons.plan.relational.function; public interface ITableFunctionAINodeServiceProvider { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionFactory.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionFactory.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionFactory.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionFactory.java index 9553ddc9fbb81..31bf0287df65f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ITableFunctionFactory.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function; +package org.apache.iotdb.commons.node_commons.plan.relational.function; import org.apache.iotdb.udf.api.relational.TableFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/InterpretedFunctionInvoker.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/InterpretedFunctionInvoker.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/InterpretedFunctionInvoker.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/InterpretedFunctionInvoker.java index 13630ea0d8ccc..d8811c5c35f2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/InterpretedFunctionInvoker.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/InterpretedFunctionInvoker.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function; +package org.apache.iotdb.commons.node_commons.plan.relational.function; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; -import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/LongVariableConstraint.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/LongVariableConstraint.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/LongVariableConstraint.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/LongVariableConstraint.java index 2bb222fadd357..742ac6d32b358 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/LongVariableConstraint.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/LongVariableConstraint.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function; +package org.apache.iotdb.commons.node_commons.plan.relational.function; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/OperatorType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/OperatorType.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/OperatorType.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/OperatorType.java index 621d3feb10924..085201ee0ebff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/OperatorType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/OperatorType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function; +package org.apache.iotdb.commons.node_commons.plan.relational.function; public enum OperatorType { ADD("+", 2), diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java index 06d1f7de1d33b..c5b3fe349bfd2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function; +package org.apache.iotdb.commons.node_commons.plan.relational.function; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/Signature.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/Signature.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/Signature.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/Signature.java index 2d30e2d74a1cf..4b3ae03a15535 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/Signature.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/Signature.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function; +package org.apache.iotdb.commons.node_commons.plan.relational.function; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableBuiltinTableFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TableBuiltinTableFunction.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableBuiltinTableFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TableBuiltinTableFunction.java index 004f6114bd326..4bfc8473a9559 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableBuiltinTableFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TableBuiltinTableFunction.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function; +package org.apache.iotdb.commons.node_commons.plan.relational.function; +import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.ClassifyTableFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.ForecastTableFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.PatternMatchTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.CapacityTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.CumulateTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.HOPTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.SessionTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.TumbleTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.VariationTableFunction; -import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ClassifyTableFunction; -import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.ForecastTableFunction; -import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.PatternMatchTableFunction; import org.apache.iotdb.udf.api.relational.TableFunction; import java.util.Arrays; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableFunctionFactory.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TableFunctionFactory.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableFunctionFactory.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TableFunctionFactory.java index 69d7b8ac12cc4..f719b5deb7055 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TableFunctionFactory.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TableFunctionFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function; +package org.apache.iotdb.commons.node_commons.plan.relational.function; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.udf.api.relational.TableFunction; public class TableFunctionFactory { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TypeVariableConstraint.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TypeVariableConstraint.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TypeVariableConstraint.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TypeVariableConstraint.java index 09422c484db23..80157571ae094 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/TypeVariableConstraint.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TypeVariableConstraint.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function; +package org.apache.iotdb.commons.node_commons.plan.relational.function; -import org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; import java.util.HashSet; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/AdditionResolver.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/AdditionResolver.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/AdditionResolver.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/AdditionResolver.java index c4b1de02797b7..a33eb9f215ecf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/AdditionResolver.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/AdditionResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic; +package org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/DivisionResolver.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/DivisionResolver.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/DivisionResolver.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/DivisionResolver.java index 4a8fd0143d53d..093e7db2af145 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/DivisionResolver.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/DivisionResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic; +package org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/ModulusResolver.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/ModulusResolver.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/ModulusResolver.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/ModulusResolver.java index 3816abd18cb86..2ddc2a7b2228b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/ModulusResolver.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/ModulusResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic; +package org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java index 07e0070d34e43..9fde7447090d6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic; +package org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java index f788d6a50c762..8c79c223ddda2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.arithmetic; +package org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java index 5e51d34767bf9..44571dbe4cb7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.tvf; +package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf; import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.utils.ResultColumnAppender; -import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.utils.ResultColumnAppender; +import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.relational.TableFunction; @@ -67,8 +67,8 @@ import java.util.Set; import java.util.stream.Collectors; +import static org.apache.iotdb.commons.node_commons.plan.relational.utils.ResultColumnAppender.createResultColumnAppender; import static org.apache.iotdb.commons.udf.builtin.relational.tvf.WindowTVFUtils.findColumnIndex; -import static org.apache.iotdb.db.node_commons.plan.relational.utils.ResultColumnAppender.createResultColumnAppender; public class ClassifyTableFunction implements TableFunction { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ForecastTableFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/ForecastTableFunction.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ForecastTableFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/ForecastTableFunction.java index 46defa5c47ad1..305091e00ea65 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/ForecastTableFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/ForecastTableFunction.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.tvf; +package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf; import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.utils.ResultColumnAppender; -import org.apache.iotdb.db.node_commons.plan.udf.TableUDFUtils; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.utils.ResultColumnAppender; +import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.access.Record; @@ -66,10 +66,10 @@ import java.util.Set; import java.util.stream.Collectors; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.TableFunctionUtils.checkType; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.TableFunctionUtils.parseOptions; +import static org.apache.iotdb.commons.node_commons.plan.relational.utils.ResultColumnAppender.createResultColumnAppender; import static org.apache.iotdb.commons.udf.builtin.relational.tvf.WindowTVFUtils.findColumnIndex; -import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.TableFunctionUtils.checkType; -import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.TableFunctionUtils.parseOptions; -import static org.apache.iotdb.db.node_commons.plan.relational.utils.ResultColumnAppender.createResultColumnAppender; public class ForecastTableFunction implements TableFunction { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java index f1cf66f7bc341..4c2f522c5acfd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.tvf; +package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf; -import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.QetchAlgorithm; -import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.MatchState; -import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.Point; -import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.RegexMatchState; -import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.Section; +import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.QetchAlgorithm; +import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.MatchState; +import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.Point; +import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.RegexMatchState; +import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.Section; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.access.Record; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/TableFunctionUtils.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/TableFunctionUtils.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/TableFunctionUtils.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/TableFunctionUtils.java index 4ae0339c59643..1946181142ab0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/TableFunctionUtils.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/TableFunctionUtils.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.tvf; +package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.udf.api.type.Type; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/MatchConfig.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/MatchConfig.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/MatchConfig.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/MatchConfig.java index 32bdba11b7757..04879ba6a26a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/MatchConfig.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/MatchConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match; +package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match; public class MatchConfig { // if the gap between new two points is larger than this times gap before, the new point diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java index ebe77106dbda0..51774f0fc8c64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match; +package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match; -import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.MatchState; -import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.PatternSegment; -import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.Point; -import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.RegexMatchState; -import org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.Section; +import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.MatchState; +import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.PatternSegment; +import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.Point; +import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.RegexMatchState; +import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.Section; import java.util.ArrayDeque; import java.util.ArrayList; @@ -32,9 +32,9 @@ import java.util.List; import java.util.Queue; -import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.GAP_TOLERANCE; -import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; -import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model.PatternSegment.tangent; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.MatchConfig.GAP_TOLERANCE; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.PatternSegment.tangent; public class QetchAlgorithm { private int pointNum = -1; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/MatchState.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/MatchState.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/MatchState.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/MatchState.java index 4435352346a30..dda9e97addda6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/MatchState.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/MatchState.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model; +package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model; import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; public class MatchState { private double matchValue = 0.0; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java index e7fe93ec36bd0..b006fe1a462d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model; +package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model; import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; public class PatternSegment { // variable area diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Point.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/Point.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Point.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/Point.java index 0a0b01528956a..a4484a7de5b5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Point.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/Point.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model; +package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model; public class Point { public double x; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java index da64e0b6f0d84..b9c223525d1e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model; +package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model; import java.util.ArrayDeque; import java.util.ArrayList; @@ -25,8 +25,8 @@ import java.util.Iterator; import java.util.List; -import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.CALC_SE_USING_MORE_MEMORY; -import static org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.MatchConfig.CALC_SE_USING_MORE_MEMORY; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; public class RegexMatchState { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Section.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/Section.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Section.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/Section.java index af359d5db7ef2..979c4022d8bfd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/function/tvf/match/model/Section.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/Section.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.function.tvf.match.model; +package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model; import java.util.ArrayList; import java.util.HashMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ColumnMetadata.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ColumnMetadata.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ColumnMetadata.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ColumnMetadata.java index fcc0e9431506b..7a370e933d816 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ColumnMetadata.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ColumnMetadata.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.metadata; +package org.apache.iotdb.commons.node_commons.plan.relational.metadata; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ColumnSchema.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ColumnSchema.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ColumnSchema.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ColumnSchema.java index fe912b263ac81..4a14fc8fc6a01 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ColumnSchema.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ColumnSchema.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.metadata; +package org.apache.iotdb.commons.node_commons.plan.relational.metadata; +import org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/FunctionNullability.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/FunctionNullability.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/FunctionNullability.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/FunctionNullability.java index 9044739129ac0..51b8005a4928b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/FunctionNullability.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/FunctionNullability.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.metadata; +package org.apache.iotdb.commons.node_commons.plan.relational.metadata; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ResolvedFunction.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ResolvedFunction.java index bd1b702ad716a..c2e51f81ed2b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/ResolvedFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ResolvedFunction.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.metadata; +package org.apache.iotdb.commons.node_commons.plan.relational.metadata; -import org.apache.iotdb.db.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionId; -import org.apache.iotdb.db.node_commons.plan.relational.function.FunctionKind; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; +import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/TableSchema.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/TableSchema.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/TableSchema.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/TableSchema.java index 860e96fe9d7b1..b512623bb2e27 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/metadata/TableSchema.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/TableSchema.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.metadata; +package org.apache.iotdb.commons.node_commons.plan.relational.metadata; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.type.InternalTypeManager; import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Assignments.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/Assignments.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Assignments.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/Assignments.java index 91d2d78bea474..1593bb6439564 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Assignments.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/Assignments.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner; +package org.apache.iotdb.commons.node_commons.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/DataOrganizationSpecification.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/DataOrganizationSpecification.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/DataOrganizationSpecification.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/DataOrganizationSpecification.java index 8e2d98e779a39..28792b9f2836a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/DataOrganizationSpecification.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/DataOrganizationSpecification.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner; +package org.apache.iotdb.commons.node_commons.plan.relational.planner; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/OrderingScheme.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/OrderingScheme.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/OrderingScheme.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/OrderingScheme.java index bd5c112bf2d6b..43b45e863aef8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/OrderingScheme.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/OrderingScheme.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner; +package org.apache.iotdb.commons.node_commons.plan.relational.planner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/SortOrder.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/SortOrder.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/SortOrder.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/SortOrder.java index c7c6d5f4ab49a..a197d2476c791 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/SortOrder.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/SortOrder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner; +package org.apache.iotdb.commons.node_commons.plan.relational.planner; import static java.lang.String.format; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Symbol.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/Symbol.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Symbol.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/Symbol.java index 430c8c1b48de1..a567b5599ebea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/Symbol.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/Symbol.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner; +package org.apache.iotdb.commons.node_commons.plan.relational.planner; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/iterative/GroupReference.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/iterative/GroupReference.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/iterative/GroupReference.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/iterative/GroupReference.java index 30dc12ce13460..d248f9732a91a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/iterative/GroupReference.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/iterative/GroupReference.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.iterative; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/AggregationNode.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/AggregationNode.java index 9c1a57dac5e4e..635a44b4667b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AggregationNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/AggregationNode.java @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.expression.multi.FunctionType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.expression.multi.FunctionType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ApplyNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ApplyNode.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ApplyNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ApplyNode.java index ed1afa866b6f6..dedfa8221a7ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ApplyNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ApplyNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/AssignUniqueId.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/AssignUniqueId.java index e6f66718266cf..087ebcf5adf64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/AssignUniqueId.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/AssignUniqueId.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/CollectNode.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/CollectNode.java index 78f579480e46e..030f3e412dfe9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CollectNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/CollectNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CorrelatedJoinNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/CorrelatedJoinNode.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CorrelatedJoinNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/CorrelatedJoinNode.java index 9947b4410a088..56633fbbdcfaf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/CorrelatedJoinNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/CorrelatedJoinNode.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java index 9f8daa8938af9..811b59154092d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ExceptNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ExceptNode.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ExceptNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ExceptNode.java index 498f65b3918bf..8bd3add84b77e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ExceptNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ExceptNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.collect.ListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FillNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/FillNode.java similarity index 69% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FillNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/FillNode.java index a0b852b7e9a4b..d6792161764b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FillNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/FillNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/FilterNode.java similarity index 80% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/FilterNode.java index 94b4ec837788c..ee2a01bdca147 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/FilterNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/FilterNode.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/GapFillNode.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/GapFillNode.java index 0576a27d2e8a0..d2831923b663c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GapFillNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/GapFillNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/GroupNode.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/GroupNode.java index 1984891fb9656..aca81beabe89f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/GroupNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/GroupNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/IntersectNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/IntersectNode.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/IntersectNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/IntersectNode.java index 6ae3a22628c35..80c7e4b5759ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/IntersectNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/IntersectNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.collect.ListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/JoinNode.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/JoinNode.java index 35aeb18230a11..c1694a074365c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/JoinNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/JoinNode.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -46,8 +46,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.lang.String.format; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.EquiJoinClause.flipBatch; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.EquiJoinClause.flipBatch; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; public class JoinNode extends TwoChildProcessNode { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/LimitNode.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/LimitNode.java index 9369b7b62dc09..fe5309d1d6f45 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LimitNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/LimitNode.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/LinearFillNode.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/LinearFillNode.java index 09d58da9528d7..36a7bf2efb13d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/LinearFillNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/LinearFillNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/MarkDistinctNode.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/MarkDistinctNode.java index 592aaae37451c..7c165c787a97d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MarkDistinctNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/MarkDistinctNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/Measure.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/Measure.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/Measure.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/Measure.java index 32b0238c21078..b9962fddbc957 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/Measure.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/Measure.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.utils.TypeUtil; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/MergeSortNode.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/MergeSortNode.java index 18c4ad16a59b3..bd281b4f01c40 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/MergeSortNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/MergeSortNode.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/OffsetNode.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/OffsetNode.java index 93295bc919541..8de8636229a14 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OffsetNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/OffsetNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/OutputNode.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/OutputNode.java index 1896b87ad68bc..e432a1c17b05c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/OutputNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/OutputNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/PatternRecognitionNode.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/PatternRecognitionNode.java index 230628cb16018..df0e7da70dcc4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PatternRecognitionNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/PatternRecognitionNode.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrRowPattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -47,7 +47,7 @@ import java.util.Set; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.node.RowsPerMatch.ONE; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch.ONE; public class PatternRecognitionNode extends SingleChildProcessNode { private final List partitionBy; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/PreviousFillNode.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/PreviousFillNode.java index bc56fcb5bba7c..ce7d444176ce7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/PreviousFillNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/PreviousFillNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ProjectNode.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ProjectNode.java index 00413bd7bf461..5f9f98a4d392e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ProjectNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ProjectNode.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/RowNumberNode.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/RowNumberNode.java index f02b86641388a..6c5a04a77b4b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowNumberNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/RowNumberNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowsPerMatch.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/RowsPerMatch.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowsPerMatch.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/RowsPerMatch.java index c9627f6756605..5c666b9829f17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/RowsPerMatch.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/RowsPerMatch.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SemiJoinNode.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SemiJoinNode.java index 9585da45e778c..01aa85389abbe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SemiJoinNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SemiJoinNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SetOperationNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SetOperationNode.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SetOperationNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SetOperationNode.java index be21bcb90b226..f350764b046f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SetOperationNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SetOperationNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SkipToPosition.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SkipToPosition.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SkipToPosition.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SkipToPosition.java index 6c1e6ac4c9855..f9824f851803c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SkipToPosition.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SkipToPosition.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SortNode.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SortNode.java index c539f5b8c2d98..02add19e7bbb3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/SortNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SortNode.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/StreamSortNode.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/StreamSortNode.java index 99b76592ccc87..32bc1942faef3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/StreamSortNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/StreamSortNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TableFunctionNode.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TableFunctionNode.java index 3b673ea87380e..f33b3566e5e37 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TableFunctionNode.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.function.TableFunctionFactory; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.function.TableFunctionFactory; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java index 677e2da553ab4..5d135711046bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.function.TableFunctionFactory; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.function.TableFunctionFactory; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TopKNode.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TopKNode.java index 7b4966550eb17..72c968c0e7107 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TopKNode.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TopKRankingNode.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TopKRankingNode.java index 5edc569da7eb9..eda5b6f40a0f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/TopKRankingNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TopKRankingNode.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/UnionNode.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/UnionNode.java index 7ef9cd11d5680..ac4f79993cc1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/UnionNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/UnionNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ValueFillNode.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ValueFillNode.java index 29cc5b301039e..dafe43909ad19 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValueFillNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ValueFillNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ValuesNode.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ValuesNode.java index 0614061bdfbd8..c38e4c99cbfc4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/ValuesNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ValuesNode.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/WindowNode.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/WindowNode.java index be58e21d8ca21..c44a31b15ec9b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/node/WindowNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/WindowNode.java @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.db.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; + +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -55,9 +55,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Iterables.concat; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_PRECEDING; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_PRECEDING; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; public class WindowNode extends SingleChildProcessNode { private final Set prePartitionedInputs; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/AggregationLabelSet.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/AggregationLabelSet.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/AggregationLabelSet.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/AggregationLabelSet.java index ad0268b2d3219..d677b33d6476f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/AggregationLabelSet.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/AggregationLabelSet.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/AggregationValuePointer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/AggregationValuePointer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/AggregationValuePointer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/AggregationValuePointer.java index 9113c1eeffa1f..3425bfaed1928 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/AggregationValuePointer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/AggregationValuePointer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ClassifierValuePointer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ClassifierValuePointer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ClassifierValuePointer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ClassifierValuePointer.java index 7f5f4a7705e9c..73d39db351272 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ClassifierValuePointer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ClassifierValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java index a4e065528fd0f..52d42be148fb5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -35,7 +35,7 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; public class ExpressionAndValuePointers { public static final ExpressionAndValuePointers TRUE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrAlternation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrAlternation.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrAlternation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrAlternation.java index 528ea1478ce73..82a02e457b760 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrAlternation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrAlternation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrAnchor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrAnchor.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrAnchor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrAnchor.java index bd426f7dcebc0..e4b407d48fc0a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrAnchor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrAnchor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -27,7 +27,7 @@ import java.util.Objects; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_START; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_START; public class IrAnchor extends IrRowPattern { public enum Type { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrConcatenation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrConcatenation.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrConcatenation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrConcatenation.java index 9026b4319a2f9..1b619ee94b806 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrConcatenation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrConcatenation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrEmpty.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrEmpty.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrEmpty.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrEmpty.java index 40c6e783e0d52..4dccac82dbad2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrEmpty.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrEmpty.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrExclusion.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrExclusion.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrExclusion.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrExclusion.java index a3ba52f47c33b..7ff7a07952ee7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrExclusion.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrExclusion.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrLabel.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrLabel.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrLabel.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrLabel.java index f1146f7d0f1c7..c2d2135159b23 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrLabel.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrLabel.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java index 98260783d06c8..71d5a6cbdaf9a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import com.google.common.collect.ImmutableList; @@ -25,7 +25,7 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.toImmutableList; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; /** * Remove empty pattern from pattern alternation and replace it with quantification of a diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrPermutation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrPermutation.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrPermutation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrPermutation.java index 1e580c570cac5..009b435c3cc90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrPermutation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrPermutation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrQuantified.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrQuantified.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrQuantified.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrQuantified.java index 0f5d0a352dfaf..19af6c0fba57f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrQuantified.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrQuantified.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrQuantifier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrQuantifier.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrQuantifier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrQuantifier.java index 0443255f062e8..8a52ad0d8fddb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrQuantifier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrQuantifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPattern.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPattern.java index 19c2b4fe940e4..4d0145c6d74a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPattern.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPatternFlattener.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPatternFlattener.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPatternFlattener.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPatternFlattener.java index 4c2c13f2882f9..fcaaf05b918ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPatternFlattener.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPatternFlattener.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPatternVisitor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPatternVisitor.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPatternVisitor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPatternVisitor.java index 25f31e5b76650..296918f14e31d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/IrRowPatternVisitor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPatternVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/LogicalIndexPointer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/LogicalIndexPointer.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/LogicalIndexPointer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/LogicalIndexPointer.java index 611794e0d51b2..09c77cf4f14f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/LogicalIndexPointer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/LogicalIndexPointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/MatchNumberValuePointer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/MatchNumberValuePointer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/MatchNumberValuePointer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/MatchNumberValuePointer.java index 7b063ffa724b3..d54036b41fd87 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/MatchNumberValuePointer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/MatchNumberValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/Patterns.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/Patterns.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/Patterns.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/Patterns.java index 61ec656c95459..71f8dfc61b47b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/Patterns.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/Patterns.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; import com.google.common.collect.ImmutableList; import java.util.Optional; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_END; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_START; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.oneOrMore; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrMore; -import static org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_END; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_START; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.oneOrMore; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrMore; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; public class Patterns { private Patterns() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ScalarValuePointer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ScalarValuePointer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ScalarValuePointer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ScalarValuePointer.java index 275e5386e8907..6953ba6d93f60 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ScalarValuePointer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ScalarValuePointer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; -import org.apache.iotdb.db.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ValuePointer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ValuePointer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ValuePointer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ValuePointer.java index 9991f170248ed..c871210ce9f8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/planner/rowpattern/ValuePointer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ValuePointer.java @@ -12,6 +12,6 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; public interface ValuePointer {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/security/Identity.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/security/Identity.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/security/Identity.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/security/Identity.java index 9591e603ea4fe..fdf9e82e21f48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/security/Identity.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/security/Identity.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.security; +package org.apache.iotdb.commons.node_commons.plan.relational.security; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AliasedRelation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AliasedRelation.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AliasedRelation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AliasedRelation.java index 2f1942204477a..bd16888a7d94d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AliasedRelation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AliasedRelation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AllColumns.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AllColumns.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AllColumns.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AllColumns.java index 81c9c48a94db4..3b6268af11c04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AllColumns.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AllColumns.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AllRows.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AllRows.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AllRows.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AllRows.java index 5d0af4ce17641..34e3e8344faea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AllRows.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AllRows.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AnchorPattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AnchorPattern.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AnchorPattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AnchorPattern.java index 9af2abdd77e4b..61967638469e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AnchorPattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AnchorPattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java index 50d94a49d38ab..9c365ba1c099d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java index 24d0ec949723b..4d32dc8b0682f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AstMemoryEstimationHelper.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AstMemoryEstimationHelper.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AstMemoryEstimationHelper.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AstMemoryEstimationHelper.java index a4af76cc2b1d2..e25751c35263e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/AstMemoryEstimationHelper.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AstMemoryEstimationHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.Accountable; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BetweenPredicate.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BetweenPredicate.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BetweenPredicate.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BetweenPredicate.java index 41b9384479736..c3a1d5f06bcb8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BetweenPredicate.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BetweenPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BinaryLiteral.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BinaryLiteral.java index c94074b4676fb..da68533b12a2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BinaryLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BinaryLiteral.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; import com.google.common.base.CharMatcher; import com.google.common.io.BaseEncoding; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BooleanLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BooleanLiteral.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BooleanLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BooleanLiteral.java index bc0411289ef26..98a2d91aa7ae3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/BooleanLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BooleanLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Cast.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Cast.java index 70be10cc96597..449fa37b98764 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Cast.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Cast.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CoalesceExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CoalesceExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CoalesceExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CoalesceExpression.java index 3066135f90da2..9757d18218bef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CoalesceExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CoalesceExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Columns.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Columns.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Columns.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Columns.java index 5514acf0ba2cd..9adef260c9e71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Columns.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Columns.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java index c5a14b6485bef..7b8f8b5e93bf7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ComparisonExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ComparisonExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ComparisonExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ComparisonExpression.java index 19a87074ea08f..1ac69c24b4bba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ComparisonExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ComparisonExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentDatabase.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentDatabase.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentDatabase.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentDatabase.java index d94f93438b81a..91f77fa271c95 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentDatabase.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentDatabase.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentTime.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentTime.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentTime.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentTime.java index 419b138b2a990..3f3b5136dd7cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentTime.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentTime.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentUser.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentUser.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentUser.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentUser.java index d019ddcda13f0..44e29efd487e0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/CurrentUser.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentUser.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DataType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DataType.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DataType.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DataType.java index 2f417c7fdf888..9498e3697cc05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DataType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DataType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DataTypeParameter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DataTypeParameter.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DataTypeParameter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DataTypeParameter.java index a7edaf707ea59..da0455a08a141 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DataTypeParameter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DataTypeParameter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DecimalLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DecimalLiteral.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DecimalLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DecimalLiteral.java index c058fe836e77b..7dd1c07780954 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DecimalLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DecimalLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DereferenceExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DereferenceExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DereferenceExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DereferenceExpression.java index 9ce7383e9ad01..7cbd434eb12ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DereferenceExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DereferenceExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DoubleLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DoubleLiteral.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DoubleLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DoubleLiteral.java index 987ca6f11c4c3..3ab9dbf484a86 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/DoubleLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DoubleLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/EmptyPattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/EmptyPattern.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/EmptyPattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/EmptyPattern.java index ffd04baec1c13..172c2fc137954 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/EmptyPattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/EmptyPattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Except.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Except.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Except.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Except.java index 7e8275dbcb988..8ecbc43e0efe1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Except.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Except.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ExcludedPattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ExcludedPattern.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ExcludedPattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ExcludedPattern.java index 99301435bc16b..54710330d8049 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ExcludedPattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ExcludedPattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ExistsPredicate.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ExistsPredicate.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ExistsPredicate.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ExistsPredicate.java index 1071d8bd6c4b3..8069303829cf0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ExistsPredicate.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ExistsPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Expression.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Expression.java index 2fdda909a4c17..36cd5a674c5b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Expression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Expression.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.util.ExpressionFormatter; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Extract.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Extract.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Extract.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Extract.java index 82b68ccd0f470..984d79253afa7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Extract.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Extract.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.Immutable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FieldReference.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FieldReference.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FieldReference.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FieldReference.java index d5452169cee6a..9fb22519a67e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FieldReference.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FieldReference.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Fill.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Fill.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Fill.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Fill.java index 70ae6b40959db..12e2932d7fb92 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Fill.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Fill.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FloatLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FloatLiteral.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FloatLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FloatLiteral.java index 360cd812bda46..93bae4dd6fc68 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FloatLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FloatLiteral.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FrameBound.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FrameBound.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FrameBound.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FrameBound.java index 2e764265facfd..8245d2aab2aac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FrameBound.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FrameBound.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FunctionCall.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FunctionCall.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FunctionCall.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FunctionCall.java index 477ef633660f9..90b5045c07726 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/FunctionCall.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FunctionCall.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericDataType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GenericDataType.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericDataType.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GenericDataType.java index 51926cabf4336..697bee780b904 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericDataType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GenericDataType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GenericLiteral.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GenericLiteral.java index f265b16a7f5e6..62e72a1e6d08e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GenericLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GenericLiteral.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupBy.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupBy.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupBy.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupBy.java index 656f4f55430ec..c972a3de6316e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupBy.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupBy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupingElement.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupingElement.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupingElement.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupingElement.java index 5ebaf9fb79d44..4cf1704a09c45 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupingElement.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupingElement.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupingSets.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupingSets.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupingSets.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupingSets.java index 0563d5599551c..ae07f2b893ff2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/GroupingSets.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupingSets.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IAstVisitor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IAstVisitor.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IAstVisitor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IAstVisitor.java index 64cc95e9f330f..82bb186dc0103 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IAstVisitor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IAstVisitor.java @@ -12,6 +12,6 @@ * limitations under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; public interface IAstVisitor {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Identifier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Identifier.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Identifier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Identifier.java index 12e11a8c5c4c2..0ba70c1e440c9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Identifier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Identifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.base.CharMatcher; import com.google.common.base.Strings; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IfExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IfExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IfExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IfExpression.java index e5d62ba9541b2..649e8d05c7d69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IfExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IfExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InListExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/InListExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InListExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/InListExpression.java index 5a42fd9fa59d4..8df66af98ae5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InListExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/InListExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InPredicate.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/InPredicate.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InPredicate.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/InPredicate.java index 624bb079dd34f..28311e5f8fe22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/InPredicate.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/InPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Intersect.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Intersect.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Intersect.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Intersect.java index 03899734dac87..67f887aeecbdb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Intersect.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Intersect.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java index 39c2666013147..fdde84442e91b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNullPredicate.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IsNullPredicate.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNullPredicate.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IsNullPredicate.java index 1126799be73c6..96cb7d905a239 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/IsNullPredicate.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IsNullPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Join.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Join.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Join.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Join.java index 6fe95fc2b1118..252d3812b9918 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Join.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Join.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinCriteria.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinCriteria.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinCriteria.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinCriteria.java index 5b306fbab96f7..705644ebb1180 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinCriteria.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinCriteria.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinOn.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinOn.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinOn.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinOn.java index 8e1100ceabf9c..ed9d5c2f50aa6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinOn.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinOn.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinUsing.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinUsing.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinUsing.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinUsing.java index bfa78f32ab90c..58ca5430dd71b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/JoinUsing.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinUsing.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LikePredicate.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LikePredicate.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LikePredicate.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LikePredicate.java index b4e5bff48eda6..fa8ae5a2f4f31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LikePredicate.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LikePredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Limit.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Limit.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Limit.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Limit.java index e1c2f26e329e0..4af648658810d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Limit.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Limit.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Literal.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Literal.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Literal.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Literal.java index cdcc1ca2be82e..69b3b0529dbd8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Literal.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Literal.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LogicalExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LogicalExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LogicalExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LogicalExpression.java index 5c3a9d6f9fb86..e747d8462bc85 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LogicalExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LogicalExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LongLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LongLiteral.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LongLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LongLiteral.java index f12552681560e..8933c12d09ef8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/LongLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LongLiteral.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/MeasureDefinition.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/MeasureDefinition.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/MeasureDefinition.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/MeasureDefinition.java index 9293e3f154a85..168cb8d0ff66b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/MeasureDefinition.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/MeasureDefinition.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NaturalJoin.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NaturalJoin.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NaturalJoin.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NaturalJoin.java index efe1bfde4ed77..af48799f8aa8e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NaturalJoin.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NaturalJoin.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Node.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Node.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Node.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Node.java index b028bf0ef523e..7a6f81c262782 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Node.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Node.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NodeLocation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NodeLocation.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NodeLocation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NodeLocation.java index 0708f08c4b5bb..dac4e4c4213e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NodeLocation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NodeLocation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NotExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NotExpression.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NotExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NotExpression.java index 95c5eb2a5fc2b..ee4f7c48b22a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NotExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NotExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullIfExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NullIfExpression.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullIfExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NullIfExpression.java index 5aeaba493fb52..39c18f126180f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullIfExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NullIfExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NullLiteral.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NullLiteral.java index daaecf72136a2..6e1e90d2311f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NullLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NullLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NumericParameter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NumericParameter.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NumericParameter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NumericParameter.java index c779c3a31ba68..e27241c98b3d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/NumericParameter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NumericParameter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Offset.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Offset.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Offset.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Offset.java index a7eb3bd9056fa..b2885a2ae6371 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Offset.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Offset.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/OneOrMoreQuantifier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/OneOrMoreQuantifier.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/OneOrMoreQuantifier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/OneOrMoreQuantifier.java index 2a682c6f40d47..99ee7234b256a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/OneOrMoreQuantifier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/OneOrMoreQuantifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/OrderBy.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/OrderBy.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/OrderBy.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/OrderBy.java index 46c5149be4db9..96029d40e4462 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/OrderBy.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/OrderBy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Parameter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Parameter.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Parameter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Parameter.java index 78ffb44998ec0..39da7cf9a70ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Parameter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Parameter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternAlternation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternAlternation.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternAlternation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternAlternation.java index 42a324d52ba50..52d18a9023580 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternAlternation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternAlternation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternConcatenation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternConcatenation.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternConcatenation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternConcatenation.java index 0b83aca9feeb9..889aa2d01bae0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternConcatenation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternConcatenation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternPermutation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternPermutation.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternPermutation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternPermutation.java index 84c55c27a43f7..060d2d80f576f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternPermutation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternPermutation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternQuantifier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternQuantifier.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternQuantifier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternQuantifier.java index 51aee17ff43b9..e53632be90d3c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternQuantifier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternQuantifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternRecognitionRelation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternRecognitionRelation.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternRecognitionRelation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternRecognitionRelation.java index 05aacbf2f71ba..8e2cfd4c662fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternRecognitionRelation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternRecognitionRelation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternVariable.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternVariable.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternVariable.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternVariable.java index 4130de8503be2..94c1da36173ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/PatternVariable.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternVariable.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ProcessingMode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ProcessingMode.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ProcessingMode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ProcessingMode.java index 8d76e87d329a3..c5768e071c8c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ProcessingMode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ProcessingMode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QualifiedName.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QualifiedName.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QualifiedName.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QualifiedName.java index 0bf8da13b9168..ed6f7065e17df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QualifiedName.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QualifiedName.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuantifiedComparisonExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuantifiedComparisonExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuantifiedComparisonExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuantifiedComparisonExpression.java index 8a7519bd4f2bc..444157804c165 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuantifiedComparisonExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuantifiedComparisonExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuantifiedPattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuantifiedPattern.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuantifiedPattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuantifiedPattern.java index f6e4ae23d176f..55636978699dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuantifiedPattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuantifiedPattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Query.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Query.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Query.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Query.java index f085ae6e503e7..5de7f23b5b33c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Query.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Query.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; -import org.apache.iotdb.db.node_commons.utils.cte.CteDataStore; +import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QueryBody.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QueryBody.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QueryBody.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QueryBody.java index a6e8c91729b5b..dda26be51c8f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QueryBody.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QueryBody.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuerySpecification.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuerySpecification.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuerySpecification.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuerySpecification.java index ba3e87dcfb2a6..a100aeac73b1f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/QuerySpecification.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuerySpecification.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/RangeQuantifier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/RangeQuantifier.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/RangeQuantifier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/RangeQuantifier.java index c7e42e59c0bcc..fb7a6f8bad7ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/RangeQuantifier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/RangeQuantifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Relation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Relation.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Relation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Relation.java index 44c7b8c759eb0..9732901b6121c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Relation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Relation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; public abstract class Relation extends Node { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Row.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Row.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Row.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Row.java index 9cdedda1ccd60..d340051ee77a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Row.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Row.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/RowPattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/RowPattern.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/RowPattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/RowPattern.java index a9e54c2808618..4e1758e9faf64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/RowPattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/RowPattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; public abstract class RowPattern extends Node { protected RowPattern(NodeLocation location) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java index f79c3d5ef4a12..22533a1e17110 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.external.commons.lang3.Validate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Select.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Select.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Select.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Select.java index 0781bac309f22..eeb8858d6cb29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Select.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Select.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SelectItem.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SelectItem.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SelectItem.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SelectItem.java index 86b240d0e263e..85a58478d61cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SelectItem.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SelectItem.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; public abstract class SelectItem extends Node { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SetOperation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SetOperation.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SetOperation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SetOperation.java index aa2ae381e6330..11e3e952d216b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SetOperation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SetOperation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java index ced50868b047a..bd0b5b6999218 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.external.commons.lang3.Validate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleGroupBy.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SimpleGroupBy.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleGroupBy.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SimpleGroupBy.java index 740e2d3c16a98..ef546f50f018b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SimpleGroupBy.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SimpleGroupBy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SingleColumn.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SingleColumn.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SingleColumn.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SingleColumn.java index 22cec904abb41..0d15231b58191 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SingleColumn.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SingleColumn.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SkipTo.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SkipTo.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SkipTo.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SkipTo.java index 28828eb58559a..50996b8158970 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SkipTo.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SkipTo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -29,10 +29,10 @@ import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.Position.FIRST; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.Position.LAST; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.Position.NEXT; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SkipTo.Position.PAST_LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.Position.FIRST; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.Position.LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.Position.NEXT; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.Position.PAST_LAST; public class SkipTo extends Node { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(SkipTo.class); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SortItem.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SortItem.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SortItem.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SortItem.java index fe5b6cb1cfb89..3691d885c17f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SortItem.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SortItem.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Statement.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Statement.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Statement.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Statement.java index 17574273e1519..a8ce86b26b7e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Statement.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Statement.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StringLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/StringLiteral.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StringLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/StringLiteral.java index 9ac6f57330495..256d987ad866e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/StringLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/StringLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubqueryExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SubqueryExpression.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubqueryExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SubqueryExpression.java index 992327968c108..b0319587d3ba3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubqueryExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SubqueryExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubsetDefinition.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SubsetDefinition.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubsetDefinition.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SubsetDefinition.java index 1b3883af0bfa0..7be25c6692f67 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SubsetDefinition.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SubsetDefinition.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SymbolReference.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SymbolReference.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SymbolReference.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SymbolReference.java index 8def8bc64b395..df2fc79fc0ee5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/SymbolReference.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SymbolReference.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Table.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Table.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Table.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Table.java index ade146f6e88ab..c9c765cd23184 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Table.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Table.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableExpressionType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableExpressionType.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableExpressionType.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableExpressionType.java index 95b90c73f48e1..7a4f2d299fed6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableExpressionType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableExpressionType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; public enum TableExpressionType { ARITHMETIC_BINARY((short) 1), diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionArgument.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionArgument.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionArgument.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionArgument.java index e68beb5c5e2c3..1496c2f635115 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionArgument.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionArgument.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionInvocation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionInvocation.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionInvocation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionInvocation.java index 5918339a40577..979015ded2c34 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionInvocation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionInvocation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionTableArgument.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionTableArgument.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionTableArgument.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionTableArgument.java index 57d200b8f7755..edac4264ecc49 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableFunctionTableArgument.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionTableArgument.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -28,7 +28,7 @@ import java.util.stream.Collectors; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter.formatSortItems; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.util.ExpressionFormatter.formatSortItems; public class TableFunctionTableArgument extends Node { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableSubquery.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableSubquery.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableSubquery.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableSubquery.java index b1c939dc89342..2ddcff26bd8f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TableSubquery.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableSubquery.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Trim.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Trim.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Trim.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Trim.java index ecd1585bcb4c6..e9ef649bafdf2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Trim.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Trim.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TypeParameter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TypeParameter.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TypeParameter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TypeParameter.java index 59e19df73532d..4174a6403a8ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/TypeParameter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TypeParameter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Union.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Union.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Union.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Union.java index b11b2d3b36ae6..158ced1cde303 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Union.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Union.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Values.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Values.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Values.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Values.java index ea1312604c557..d59cde8471e3d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Values.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Values.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/VariableDefinition.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/VariableDefinition.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/VariableDefinition.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/VariableDefinition.java index e1324f67edd5e..02f3a42254196 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/VariableDefinition.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/VariableDefinition.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WhenClause.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WhenClause.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WhenClause.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WhenClause.java index 60426feab544d..23370cbd2ec94 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WhenClause.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WhenClause.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Window.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Window.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Window.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Window.java index d3c2de57a9f20..d1d5959dce813 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/Window.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Window.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowDefinition.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowDefinition.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowDefinition.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowDefinition.java index 14909ce3bc086..2d31964d907c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowDefinition.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowDefinition.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowFrame.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowFrame.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowFrame.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowFrame.java index 2ef6aa9a69374..f326b6998fdee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowFrame.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowFrame.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowReference.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowReference.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowReference.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowReference.java index 0656223e44af8..b2a8b2fd6118b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowReference.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowReference.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowSpecification.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowSpecification.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowSpecification.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowSpecification.java index 5e22e6762841f..d9a7ab7cfa949 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WindowSpecification.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowSpecification.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/With.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/With.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/With.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/With.java index c2bec8c63dde3..fda32ab98a705 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/With.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/With.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WithQuery.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WithQuery.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WithQuery.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WithQuery.java index bc707acad4c00..05b945e443ba0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/WithQuery.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WithQuery.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ZeroOrMoreQuantifier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ZeroOrMoreQuantifier.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ZeroOrMoreQuantifier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ZeroOrMoreQuantifier.java index d8dc9aac340fe..d2a5064b7c504 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ZeroOrMoreQuantifier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ZeroOrMoreQuantifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ZeroOrOneQuantifier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ZeroOrOneQuantifier.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ZeroOrOneQuantifier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ZeroOrOneQuantifier.java index e942a68c468b2..b1124c86994e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/ast/ZeroOrOneQuantifier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ZeroOrOneQuantifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/parser/CaseInsensitiveStream.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/parser/CaseInsensitiveStream.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/parser/CaseInsensitiveStream.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/parser/CaseInsensitiveStream.java index 774e761f6265e..9640eab83c426 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/parser/CaseInsensitiveStream.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/parser/CaseInsensitiveStream.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.parser; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.parser; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.IntStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/parser/ParsingException.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/parser/ParsingException.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/parser/ParsingException.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/parser/ParsingException.java index c2a03bbc969a8..9968c9ff5a5cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/parser/ParsingException.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/parser/ParsingException.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.parser; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.parser; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; import org.antlr.v4.runtime.RecognitionException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/CommonQuerySqlFormatter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/CommonQuerySqlFormatter.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/CommonQuerySqlFormatter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/CommonQuerySqlFormatter.java index fa2a9542f9720..c6c5af93728a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/CommonQuerySqlFormatter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/CommonQuerySqlFormatter.java @@ -17,43 +17,43 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.util; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Except; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Intersect; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Join; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinCriteria; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinOn; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.JoinUsing; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Limit; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Select; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionArgument; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableFunctionTableArgument; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Union; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Values; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WithQuery; -import org.apache.iotdb.db.node_commons.plan.statement.component.FillPolicy; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.util; + +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Except; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Fill; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Intersect; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinUsing; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Limit; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NaturalJoin; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Select; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionArgument; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionInvocation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionTableArgument; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Union; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Values; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; import com.google.common.base.Joiner; import com.google.common.base.Strings; @@ -68,8 +68,8 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.joining; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter.formatOrderBy; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.RowPatternFormatter.formatPattern; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.util.ExpressionFormatter.formatOrderBy; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.util.RowPatternFormatter.formatPattern; public class CommonQuerySqlFormatter implements CommonQueryAstVisitor { @@ -404,7 +404,7 @@ public Void visitQuerySpecification(QuerySpecification node, Integer indent) { indent, "GROUP BY " + (groupBy.isDistinct() ? " DISTINCT " : "") - + org.apache.iotdb.db.node_commons.plan.relational.sql.util + + org.apache.iotdb.commons.node_commons.plan.relational.sql.util .ExpressionFormatter.formatGroupBy(groupBy.getGroupingElements())) .append('\n')); @@ -426,7 +426,7 @@ public Void visitSelect(Select node, Integer indent) { if (node.getSelectItems().size() > 1) { boolean first = true; - for (org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SelectItem item : + for (org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SelectItem item : node.getSelectItems()) { builder.append("\n").append(indentString(indent)).append(first ? " " : ", "); process(item, indent); @@ -597,7 +597,8 @@ public Void visitPatternRecognitionRelation(PatternRecognitionRelation node, Int .append( node.getPartitionBy().stream() .map( - org.apache.iotdb.db.node_commons.plan.relational.sql.util.ExpressionFormatter + org.apache.iotdb.commons.node_commons.plan.relational.sql.util + .ExpressionFormatter ::formatExpression) .collect(joining(", "))) .append("\n"); @@ -679,7 +680,7 @@ public Void visitPatternRecognitionRelation(PatternRecognitionRelation node, Int + " = " + subset.getIdentifiers().stream() .map( - org.apache.iotdb.db.node_commons.plan.relational.sql.util + org.apache.iotdb.commons.node_commons.plan.relational.sql.util .ExpressionFormatter ::formatExpression) .collect(joining(", ", "(", ")"))) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/ExpressionFormatter.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/ExpressionFormatter.java index 513eca0f70b7c..37092ab618849 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ExpressionFormatter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/ExpressionFormatter.java @@ -17,71 +17,71 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.util; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AllRows; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Columns; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DecimalLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingElement; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GroupingSets; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SimpleGroupBy; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Window; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowReference; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.WindowSpecification; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.util; + +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllRows; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Columns; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Window; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowSpecification; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; @@ -98,9 +98,9 @@ import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.util.CommonQuerySqlFormatter.formatName; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.util.ReservedIdentifiers.reserved; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.CommonQuerySqlFormatter.formatName; -import static org.apache.iotdb.db.node_commons.plan.relational.sql.util.ReservedIdentifiers.reserved; public final class ExpressionFormatter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ReservedIdentifiers.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/ReservedIdentifiers.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ReservedIdentifiers.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/ReservedIdentifiers.java index 032bac80769f9..a09824ff04d45 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/ReservedIdentifiers.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/ReservedIdentifiers.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.util; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.util; -import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.CaseInsensitiveStream; -import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.CaseInsensitiveStream; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlLexer; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlParser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/RowPatternFormatter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/RowPatternFormatter.java similarity index 75% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/RowPatternFormatter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/RowPatternFormatter.java index e74c5e03e08ee..1ce3643c29edb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/sql/util/RowPatternFormatter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/RowPatternFormatter.java @@ -17,23 +17,23 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.sql.util; - -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.AnchorPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.EmptyPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.OneOrMoreQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternAlternation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternConcatenation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternPermutation; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.PatternVariable; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.QuantifiedPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrMoreQuantifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.ZeroOrOneQuantifier; +package org.apache.iotdb.commons.node_commons.plan.relational.sql.util; + +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AnchorPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.EmptyPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExcludedPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OneOrMoreQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternAlternation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternConcatenation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternPermutation; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternVariable; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ZeroOrMoreQuantifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ZeroOrOneQuantifier; import static java.util.stream.Collectors.joining; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/InternalTypeManager.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/InternalTypeManager.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/InternalTypeManager.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/InternalTypeManager.java index 31fc49e862709..ede1253b2e992 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/InternalTypeManager.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/InternalTypeManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.type; +package org.apache.iotdb.commons.node_commons.plan.relational.type; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/NamedTypeSignature.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/NamedTypeSignature.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/NamedTypeSignature.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/NamedTypeSignature.java index 12a4e1e3065b8..50ddc76c936e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/NamedTypeSignature.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/NamedTypeSignature.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.type; +package org.apache.iotdb.commons.node_commons.plan.relational.type; import com.google.errorprone.annotations.Immutable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/ParameterKind.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/ParameterKind.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/ParameterKind.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/ParameterKind.java index bc146af909346..b8127002af25f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/ParameterKind.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/ParameterKind.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.type; +package org.apache.iotdb.commons.node_commons.plan.relational.type; public enum ParameterKind { TYPE, diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/RowFieldName.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/RowFieldName.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/RowFieldName.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/RowFieldName.java index c061153377799..eb5c4fbfe5078 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/RowFieldName.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/RowFieldName.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.type; +package org.apache.iotdb.commons.node_commons.plan.relational.type; import com.google.errorprone.annotations.Immutable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/StandardTypes.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/StandardTypes.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/StandardTypes.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/StandardTypes.java index 7c0bfc5c72f8a..88e34c785da3b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/StandardTypes.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/StandardTypes.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.type; +package org.apache.iotdb.commons.node_commons.plan.relational.type; public class StandardTypes { public static final String BIGINT = "bigint"; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeId.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeId.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeId.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeId.java index ed92d7ec81815..ca522a6d5308f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeId.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeId.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.type; +package org.apache.iotdb.commons.node_commons.plan.relational.type; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeManager.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeManager.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeManager.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeManager.java index 4f7147a522c4b..b499a039cdc32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeManager.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.type; +package org.apache.iotdb.commons.node_commons.plan.relational.type; import org.apache.tsfile.read.common.type.Type; @@ -25,7 +25,7 @@ public interface TypeManager { /** * Gets the type with the specified signature. * - * @throws org.apache.iotdb.db.node_commons.plan.relational.type.TypeNotFoundException if not + * @throws org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException if not * found */ Type getType(TypeSignature signature); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeNotFoundException.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeNotFoundException.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeNotFoundException.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeNotFoundException.java index e118433972b17..18a44e2ff12c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeNotFoundException.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeNotFoundException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.type; +package org.apache.iotdb.commons.node_commons.plan.relational.type; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignature.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignature.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignature.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignature.java index b58195470804c..65ff6f2577ce7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignature.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignature.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.type; +package org.apache.iotdb.commons.node_commons.plan.relational.type; import com.google.errorprone.annotations.FormatMethod; import com.google.errorprone.annotations.Immutable; @@ -31,8 +31,8 @@ import static java.lang.String.format; import static java.util.Arrays.asList; -import static org.apache.iotdb.db.node_commons.plan.relational.type.StandardTypes.TIME_WITH_TIME_ZONE; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureParameter.typeParameter; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.StandardTypes.TIME_WITH_TIME_ZONE; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureParameter.typeParameter; @Immutable public class TypeSignature { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureParameter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignatureParameter.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureParameter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignatureParameter.java index eb4a4ffb92990..04504df2e7128 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureParameter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignatureParameter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.type; +package org.apache.iotdb.commons.node_commons.plan.relational.type; import com.google.errorprone.annotations.Immutable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureTranslator.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignatureTranslator.java similarity index 80% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureTranslator.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignatureTranslator.java index 14f7a2e160c48..275e345f43c38 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/type/TypeSignatureTranslator.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignatureTranslator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.type; +package org.apache.iotdb.commons.node_commons.plan.relational.type; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.DataTypeParameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.NumericParameter; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataTypeParameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TypeParameter; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.Type; @@ -35,9 +35,9 @@ import java.util.Set; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureParameter.numericParameter; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureParameter.typeParameter; -import static org.apache.iotdb.db.node_commons.plan.relational.type.TypeSignatureParameter.typeVariable; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureParameter.numericParameter; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureParameter.typeParameter; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureParameter.typeVariable; public class TypeSignatureTranslator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/ResultColumnAppender.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/utils/ResultColumnAppender.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/ResultColumnAppender.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/utils/ResultColumnAppender.java index 297164467d1ad..9d791f6f3c433 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/ResultColumnAppender.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/utils/ResultColumnAppender.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.utils; +package org.apache.iotdb.commons.node_commons.plan.relational.utils; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/TypeUtil.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/utils/TypeUtil.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/TypeUtil.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/utils/TypeUtil.java index 5da7eb1d6212d..44ea64086c2a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/relational/utils/TypeUtil.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/utils/TypeUtil.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.node_commons.plan.relational.utils; +package org.apache.iotdb.commons.node_commons.plan.relational.utils; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHashStrategy; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.HashStrategy; -import org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.XxHash64; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHashStrategy; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.HashStrategy; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.XxHash64; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -48,8 +48,8 @@ import static java.lang.Double.doubleToLongBits; import static java.lang.Float.floatToIntBits; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.XxHash64.FALSE_XX_HASH; -import static org.apache.iotdb.db.node_commons.execution.operator.source.relational.aggregation.grouped.hash.XxHash64.TRUE_XX_HASH; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.XxHash64.FALSE_XX_HASH; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.XxHash64.TRUE_XX_HASH; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DateType.DATE; import static org.apache.tsfile.read.common.type.IntType.INT32; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/statement/component/FillPolicy.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/statement/component/FillPolicy.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/statement/component/FillPolicy.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/statement/component/FillPolicy.java index e7e888322c0bd..bc89154d858fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/statement/component/FillPolicy.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/statement/component/FillPolicy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.statement.component; +package org.apache.iotdb.commons.node_commons.plan.statement.component; public enum FillPolicy { PREVIOUS((byte) 0), diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinAggregationFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinAggregationFunction.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinAggregationFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinAggregationFunction.java index b538a9b2373a4..eb72a670f9209 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinAggregationFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinAggregationFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.udf; +package org.apache.iotdb.commons.node_commons.plan.udf; import java.util.Arrays; import java.util.HashSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinScalarFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinScalarFunction.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinScalarFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinScalarFunction.java index 8b087577088a6..694cb711a7781 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinScalarFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinScalarFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.udf; +package org.apache.iotdb.commons.node_commons.plan.udf; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java index cbcee8b874e5f..7174c19eebeb7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.udf; +package org.apache.iotdb.commons.node_commons.plan.udf; import org.apache.iotdb.commons.udf.builtin.String.UDTFConcat; import org.apache.iotdb.commons.udf.builtin.String.UDTFEndsWith; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/TableUDFUtils.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/TableUDFUtils.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/TableUDFUtils.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/TableUDFUtils.java index 91822a9230c2d..e81af57f37b16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/TableUDFUtils.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/TableUDFUtils.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.udf; +package org.apache.iotdb.commons.node_commons.plan.udf; import org.apache.iotdb.common.rpc.thrift.FunctionType; import org.apache.iotdb.common.rpc.thrift.Model; +import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeService; +import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider; import org.apache.iotdb.commons.udf.UDFInformation; -import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeService; -import org.apache.iotdb.db.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.relational.AggregateFunction; import org.apache.iotdb.udf.api.relational.ScalarFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/UDFManagementService.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/UDFManagementService.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/UDFManagementService.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/UDFManagementService.java index 295546a596804..5317f6a4d35c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/UDFManagementService.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/UDFManagementService.java @@ -17,9 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.udf; +package org.apache.iotdb.commons.node_commons.plan.udf; import org.apache.iotdb.common.rpc.thrift.Model; +import org.apache.iotdb.commons.node_commons.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.commons.udf.UDFInformation; import org.apache.iotdb.commons.udf.UDFTable; import org.apache.iotdb.commons.udf.UDFType; @@ -29,7 +30,6 @@ import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.commons.udf.service.UDFExecutableManager; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.node_commons.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.udf.api.UDF; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.exception.UDFManagementException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/UDTFForecast.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/UDTFForecast.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/UDTFForecast.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/UDTFForecast.java index adf5b5c51112d..1e285af3d130f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/plan/udf/UDTFForecast.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/UDTFForecast.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.node_commons.plan.udf; +package org.apache.iotdb.commons.node_commons.plan.udf; import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/DateTimeUtils.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/DateTimeUtils.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/DateTimeUtils.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/DateTimeUtils.java index ca47f57c285d8..5575bfc776b7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/DateTimeUtils.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/DateTimeUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.node_commons.utils; +package org.apache.iotdb.commons.node_commons.utils; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/TimestampPrecisionUtils.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/TimestampPrecisionUtils.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/TimestampPrecisionUtils.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/TimestampPrecisionUtils.java index b40447f381db0..9779cab3e3661 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/TimestampPrecisionUtils.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/TimestampPrecisionUtils.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.node_commons.utils; +package org.apache.iotdb.commons.node_commons.utils; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.db.exception.sql.SemanticException; +import org.apache.iotdb.commons.exception.SemanticException; import java.util.concurrent.TimeUnit; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/cte/CteDataStore.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/cte/CteDataStore.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/cte/CteDataStore.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/cte/CteDataStore.java index f2fe0899083a3..c669753fa3781 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/node_commons/utils/cte/CteDataStore.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/cte/CteDataStore.java @@ -19,12 +19,12 @@ * */ -package org.apache.iotdb.db.node_commons.utils.cte; +package org.apache.iotdb.commons.node_commons.utils.cte; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.node_commons.plan.relational.metadata.TableSchema; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IConsensusRequest.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/request/IConsensusRequest.java similarity index 96% rename from iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IConsensusRequest.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/request/IConsensusRequest.java index cae54c2bcbcbc..541d62eb55ed3 100644 --- a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/common/request/IConsensusRequest.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/request/IConsensusRequest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.consensus.common.request; +package org.apache.iotdb.commons.request; import java.nio.ByteBuffer; From 2c8d6cb1908b8e9971fdf7bcda9b2969947daaf8 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Tue, 21 Apr 2026 10:31:26 +0800 Subject: [PATCH 42/45] move calc_commons --- .../apache/iotdb/mqtt/MPPPublishHandler.java | 4 +- .../table/v1/handler/ExceptionHandler.java | 4 +- .../v1/handler/ExecuteStatementHandler.java | 4 +- .../table/v1/handler/QueryDataSetHandler.java | 4 +- .../handler/StatementConstructionHandler.java | 2 +- .../table/v1/impl/RestApiServiceImpl.java | 4 +- .../protocol/v1/handler/ExceptionHandler.java | 2 +- .../handler/StatementConstructionHandler.java | 2 +- .../protocol/v2/handler/ExceptionHandler.java | 2 +- .../handler/StatementConstructionHandler.java | 2 +- .../protocol/v2/impl/RestApiServiceImpl.java | 2 +- .../apache/iotdb/it/env/cluster/EnvUtils.java | 2 +- .../BuiltinAggregationFunctionEnum.java | 2 +- .../it/partition/IoTDBTimePartitionIT.java | 2 +- .../it/procedure/IoTDBProcedureIT.java | 2 +- .../scalar/IoTDBCastFunctionTableIT.java | 2 +- .../scalar/IoTDBFormatFunctionTableIT.java | 2 +- .../old/query/IoTDBArithmeticTableIT.java | 2 +- .../old/query/IoTDBArithmeticTableViewIT.java | 2 +- .../iotdb/tool/data/AbstractDataTool.java | 4 +- iotdb-core/calc_commons/pom.xml | 456 ++++++++++++++++++ .../calc_commons/src/main/codegen/config.fmpp | 28 ++ .../main/codegen/dataModel/AllDataType.tdd | 58 +++ .../main/codegen/dataModel/CompareType.tdd | 28 ++ .../codegen/dataModel/DecimalDataType.tdd | 38 ++ .../dataModel/MathematicalDataType.tdd | 52 ++ .../dataModel/MathematicalOperator.tdd | 52 ++ .../ArithmeticBinaryColumnTransformer.ftl | 419 ++++++++++++++++ .../ArithmeticColumnTransformerApi.ftl | 230 +++++++++ .../ArithmeticUnaryColumnTransformer.ftl | 85 ++++ .../codegen/templates/ModeAccumulator.ftl | 203 ++++++++ .../main/codegen/templates/constantFill.ftl | 81 ++++ .../src/main/codegen/templates/linearFill.ftl | 122 +++++ .../main/codegen/templates/previousFill.ftl | 109 +++++ .../previousFillWithTimeDuration.ftl | 130 +++++ .../exception/MemoryNotEnoughException.java | 2 +- .../execution/aggregation/Accumulator.java | 2 +- .../aggregation/VarianceAccumulator.java | 2 +- .../execution/operator/AbstractOperator.java | 2 +- .../operator/CommonOperatorContext.java | 4 +- .../operator/GroupedTopNBuilder.java | 2 +- .../GroupedTopNRowNumberAccumulator.java | 8 +- .../operator/GroupedTopNRowNumberBuilder.java | 6 +- .../execution/operator/IdRegistry.java | 4 +- .../execution/operator/Operator.java | 2 +- .../operator/RowIdComparisonStrategy.java | 2 +- .../execution/operator/RowIdHashStrategy.java | 2 +- .../execution/operator/RowReference.java | 2 +- .../operator/RowReferenceTsBlockManager.java | 6 +- .../SimpleTsBlockWithPositionComparator.java | 8 +- .../TsBlockWithPositionComparator.java | 2 +- .../process/AbstractConsumeAllOperator.java | 8 +- .../process/AbstractFillOperator.java | 8 +- .../process/AbstractLinearFillOperator.java | 8 +- .../process/AbstractSortOperator.java | 20 +- .../process/AggregationMergeSortOperator.java | 14 +- .../process/AssignUniqueIdOperator.java | 6 +- .../operator/process/CollectOperator.java | 6 +- .../process/EnforceSingleRowOperator.java | 6 +- .../process/FilterAndProjectOperator.java | 26 +- .../operator/process/LimitOperator.java | 6 +- .../process/MappingCollectOperator.java | 8 +- .../operator/process/MergeSortOperator.java | 12 +- .../operator/process/OffsetOperator.java | 6 +- .../process/PatternRecognitionOperator.java | 26 +- .../PreviousFillWithGroupOperator.java | 10 +- .../operator/process/ProcessOperator.java | 4 +- .../operator/process/SortOperator.java | 10 +- .../operator/process/TableFillOperator.java | 8 +- .../process/TableLinearFillOperator.java | 8 +- .../TableLinearFillWithGroupOperator.java | 12 +- .../process/TableMergeSortOperator.java | 10 +- .../operator/process/TableSortOperator.java | 12 +- .../process/TableStreamSortOperator.java | 12 +- .../operator/process/TableTopKOperator.java | 10 +- .../operator/process/TopKOperator.java | 12 +- .../operator/process/ValuesOperator.java | 6 +- .../operator/process/fill/IFill.java | 2 +- .../operator/process/fill/IFillFilter.java | 2 +- .../operator/process/fill/ILinearFill.java | 2 +- .../AbstractMonthIntervalFillFilter.java | 4 +- .../fill/filter/FixedIntervalFillFilter.java | 4 +- .../filter/MonthIntervalMSFillFilter.java | 2 +- .../filter/MonthIntervalNSFillFilter.java | 2 +- .../filter/MonthIntervalUSFillFilter.java | 2 +- .../process/fill/identity/IdentityFill.java | 4 +- .../fill/identity/IdentityLinearFill.java | 4 +- .../process/fill/linear/LinearFill.java | 4 +- .../process/function/PartitionRecognizer.java | 10 +- .../function/TableFunctionLeafOperator.java | 8 +- .../function/TableFunctionOperator.java | 18 +- .../function/partition/PartitionCache.java | 2 +- .../function/partition/PartitionState.java | 2 +- .../process/function/partition/Slice.java | 6 +- .../gapfill/AbstractGapFillOperator.java | 12 +- .../AbstractGapFillWGroupOperator.java | 8 +- .../AbstractGapFillWoGroupOperator.java | 8 +- .../gapfill/GapFillWGroupWMoOperator.java | 10 +- .../gapfill/GapFillWGroupWoMoOperator.java | 10 +- .../gapfill/GapFillWoGroupWMoOperator.java | 8 +- .../gapfill/GapFillWoGroupWoMoOperator.java | 8 +- .../SimpleNestedLoopCrossJoinOperator.java | 12 +- .../join/merge/MergeSortComparator.java | 4 +- .../process/join/merge/SortKeyComparator.java | 4 +- .../AscBinaryTypeJoinKeyComparator.java | 2 +- .../AscBooleanTypeJoinKeyComparator.java | 2 +- .../AscDoubleTypeJoinKeyComparator.java | 2 +- .../AscFloatTypeJoinKeyComparator.java | 2 +- .../AscIntTypeJoinKeyComparator.java | 2 +- ...cLongTypeIgnoreEqualJoinKeyComparator.java | 2 +- .../AscLongTypeJoinKeyComparator.java | 2 +- .../DescBinaryTypeJoinKeyComparator.java | 2 +- .../DescBooleanTypeJoinKeyComparator.java | 2 +- .../DescDoubleTypeJoinKeyComparator.java | 2 +- .../DescFloatTypeJoinKeyComparator.java | 2 +- .../DescIntTypeJoinKeyComparator.java | 2 +- ...cLongTypeIgnoreEqualJoinKeyComparator.java | 2 +- .../DescLongTypeJoinKeyComparator.java | 2 +- .../merge/comparator/JoinKeyComparator.java | 2 +- .../comparator/JoinKeyComparatorFactory.java | 2 +- .../rowpattern/LogicalIndexNavigation.java | 4 +- .../rowpattern/PatternAggregationTracker.java | 6 +- .../process/rowpattern/PatternAggregator.java | 12 +- .../rowpattern/PatternAggregators.java | 2 +- .../rowpattern/PatternPartitionExecutor.java | 18 +- .../rowpattern/PatternVariableRecognizer.java | 10 +- .../PhysicalAggregationPointer.java | 2 +- .../rowpattern/PhysicalValueAccessor.java | 2 +- .../rowpattern/PhysicalValuePointer.java | 2 +- .../expression/ArithmeticOperator.java | 2 +- .../expression/BinaryComputation.java | 2 +- .../rowpattern/expression/BinaryOperator.java | 2 +- .../expression/CastComputation.java | 2 +- .../expression/ComparisonOperator.java | 2 +- .../rowpattern/expression/Computation.java | 2 +- .../expression/ConstantComputation.java | 2 +- .../expression/LogicalOperator.java | 2 +- .../expression/NaryComputation.java | 2 +- .../rowpattern/expression/NaryOperator.java | 2 +- .../PatternExpressionComputation.java | 18 +- .../expression/ReferenceComputation.java | 2 +- .../process/rowpattern/matcher/ArrayView.java | 2 +- .../process/rowpattern/matcher/Done.java | 2 +- .../rowpattern/matcher/Instruction.java | 2 +- .../process/rowpattern/matcher/IntList.java | 2 +- .../rowpattern/matcher/IntMultimap.java | 2 +- .../process/rowpattern/matcher/IntStack.java | 2 +- .../IrRowPatternToProgramRewriter.java | 2 +- .../process/rowpattern/matcher/Jump.java | 2 +- .../process/rowpattern/matcher/MatchEnd.java | 2 +- .../rowpattern/matcher/MatchLabel.java | 2 +- .../rowpattern/matcher/MatchResult.java | 2 +- .../rowpattern/matcher/MatchStart.java | 2 +- .../process/rowpattern/matcher/Matcher.java | 10 +- .../rowpattern/matcher/PatternCaptures.java | 4 +- .../process/rowpattern/matcher/Program.java | 2 +- .../process/rowpattern/matcher/Save.java | 2 +- .../process/rowpattern/matcher/Split.java | 2 +- .../process/window/RowNumberOperator.java | 10 +- .../process/window/TableWindowOperator.java | 30 +- .../process/window/TopKRankingOperator.java | 16 +- .../window/function/WindowFunction.java | 4 +- .../function/WindowFunctionFactory.java | 24 +- .../aggregate/AggregationWindowFunction.java | 6 +- .../function/aggregate/WindowAggregator.java | 10 +- .../function/rank/CumeDistFunction.java | 4 +- .../function/rank/DenseRankFunction.java | 4 +- .../window/function/rank/NTileFunction.java | 4 +- .../function/rank/PercentRankFunction.java | 4 +- .../window/function/rank/RankFunction.java | 4 +- .../function/rank/RankWindowFunction.java | 6 +- .../function/rank/RowNumberFunction.java | 4 +- .../function/value/FirstValueFunction.java | 4 +- .../window/function/value/LagFunction.java | 4 +- .../function/value/LastValueFunction.java | 4 +- .../window/function/value/LeadFunction.java | 4 +- .../function/value/NthValueFunction.java | 4 +- .../function/value/ValueWindowFunction.java | 6 +- .../process/window/partition/Partition.java | 6 +- .../window/partition/PartitionExecutor.java | 22 +- .../process/window/partition/frame/Frame.java | 4 +- .../window/partition/frame/FrameInfo.java | 2 +- .../window/partition/frame/GroupsFrame.java | 10 +- .../window/partition/frame/RangeFrame.java | 16 +- .../window/partition/frame/RowsFrame.java | 6 +- .../process/window/utils/ColumnList.java | 2 +- .../operator/process/window/utils/Range.java | 2 +- .../process/window/utils/RowComparator.java | 2 +- .../AbstractAsofMergeSortJoinOperator.java | 8 +- .../AbstractMergeSortJoinOperator.java | 16 +- .../AsofMergeSortInnerJoinOperator.java | 8 +- .../AsofMergeSortLeftJoinOperator.java | 8 +- .../relational/MarkDistinctOperator.java | 12 +- .../MergeSortFullOuterJoinOperator.java | 10 +- .../MergeSortInnerJoinOperator.java | 8 +- .../relational/MergeSortLeftJoinOperator.java | 8 +- .../relational/MergeSortSemiJoinOperator.java | 8 +- ...AbstractApproxMostFrequentAccumulator.java | 4 +- .../AbstractApproxPercentileAccumulator.java | 4 +- .../aggregation/AccumulatorFactory.java | 64 +-- .../aggregation/AggregationMask.java | 2 +- .../aggregation/AggregationOperator.java | 12 +- .../ApproxCountDistinctAccumulator.java | 8 +- .../ApproxPercentileAccumulator.java | 2 +- ...ApproxPercentileWithWeightAccumulator.java | 2 +- .../aggregation/AvgAccumulator.java | 2 +- .../BinaryApproxMostFrequentAccumulator.java | 8 +- .../BlobApproxMostFrequentAccumulator.java | 2 +- .../BooleanApproxMostFrequentAccumulator.java | 8 +- .../aggregation/CountAccumulator.java | 2 +- .../aggregation/CountAllAccumulator.java | 2 +- .../aggregation/CountIfAccumulator.java | 2 +- .../DoubleApproxMostFrequentAccumulator.java | 8 +- .../aggregation/ExtremeAccumulator.java | 2 +- .../aggregation/FirstAccumulator.java | 4 +- .../aggregation/FirstByAccumulator.java | 4 +- .../aggregation/FirstByDescAccumulator.java | 2 +- .../aggregation/FirstDescAccumulator.java | 2 +- .../FloatApproxMostFrequentAccumulator.java | 8 +- .../IntApproxMostFrequentAccumulator.java | 8 +- .../aggregation/LastAccumulator.java | 4 +- .../aggregation/LastByAccumulator.java | 4 +- .../aggregation/LastByDescAccumulator.java | 2 +- .../aggregation/LastDescAccumulator.java | 2 +- .../LongApproxMostFrequentAccumulator.java | 8 +- .../aggregation/MaskedRecordIterator.java | 2 +- .../aggregation/MaxAccumulator.java | 2 +- .../aggregation/MinAccumulator.java | 2 +- .../aggregation/RecordIterator.java | 4 +- .../aggregation/SumAccumulator.java | 2 +- .../aggregation/TableAccumulator.java | 2 +- .../aggregation/TableAggregator.java | 8 +- .../aggregation/TableMaxByAccumulator.java | 2 +- .../TableMaxMinByBaseAccumulator.java | 6 +- .../aggregation/TableMinByAccumulator.java | 2 +- .../aggregation/TableModeAccumulator.java | 6 +- .../aggregation/TableVarianceAccumulator.java | 4 +- ...erDefinedAggregateFunctionAccumulator.java | 2 +- .../source/relational/aggregation/Utils.java | 2 +- .../ApproxMostFrequentBucketDeserializer.java | 2 +- .../ApproxMostFrequentBucketSerializer.java | 2 +- .../aggregation/approximate/Counter.java | 2 +- .../approximate/DoublyLinkedList.java | 2 +- .../approximate/ExternalizableUtil.java | 2 +- .../aggregation/approximate/HyperLogLog.java | 2 +- .../approximate/HyperLogLogStateFactory.java | 4 +- .../aggregation/approximate/ITopK.java | 2 +- .../aggregation/approximate/ListNode2.java | 2 +- .../aggregation/approximate/Pair.java | 2 +- .../aggregation/approximate/SpaceSaving.java | 2 +- .../SpaceSavingByteCalculator.java | 2 +- .../approximate/SpaceSavingStateFactory.java | 6 +- .../approximate/StreamSummary.java | 2 +- .../aggregation/approximate/TDigest.java | 2 +- ...tGroupedApproxMostFrequentAccumulator.java | 6 +- ...actGroupedApproxPercentileAccumulator.java | 8 +- ...yGroupedApproxMostFrequentAccumulator.java | 10 +- ...bGroupedApproxMostFrequentAccumulator.java | 2 +- ...nGroupedApproxMostFrequentAccumulator.java | 10 +- ...eGroupedApproxMostFrequentAccumulator.java | 10 +- ...tGroupedApproxMostFrequentAccumulator.java | 10 +- .../grouped/GroupedAccumulator.java | 4 +- .../grouped/GroupedAggregator.java | 6 +- ...GroupedApproxCountDistinctAccumulator.java | 12 +- .../GroupedApproxPercentileAccumulator.java | 6 +- ...ApproxPercentileWithWeightAccumulator.java | 6 +- .../grouped/GroupedAvgAccumulator.java | 8 +- .../grouped/GroupedCountAccumulator.java | 6 +- .../grouped/GroupedCountAllAccumulator.java | 6 +- .../grouped/GroupedCountIfAccumulator.java | 6 +- .../grouped/GroupedExtremeAccumulator.java | 14 +- .../grouped/GroupedFirstAccumulator.java | 18 +- .../grouped/GroupedFirstByAccumulator.java | 18 +- .../grouped/GroupedLastAccumulator.java | 18 +- .../grouped/GroupedLastByAccumulator.java | 18 +- .../grouped/GroupedMaxAccumulator.java | 18 +- .../grouped/GroupedMaxByAccumulator.java | 2 +- .../GroupedMaxMinByBaseAccumulator.java | 18 +- .../grouped/GroupedMinAccumulator.java | 18 +- .../grouped/GroupedMinByAccumulator.java | 2 +- .../grouped/GroupedModeAccumulator.java | 12 +- .../grouped/GroupedSumAccumulator.java | 8 +- ...roupedUserDefinedAggregateAccumulator.java | 10 +- .../grouped/GroupedVarianceAccumulator.java | 10 +- .../grouped/HashAggregationOperator.java | 16 +- ...tGroupedApproxMostFrequentAccumulator.java | 10 +- ...gGroupedApproxMostFrequentAccumulator.java | 10 +- .../grouped/StreamingAggregationOperator.java | 14 +- .../StreamingHashAggregationOperator.java | 20 +- .../aggregation/grouped/array/BigArrays.java | 2 +- .../grouped/array/BinaryBigArray.java | 2 +- .../grouped/array/BooleanBigArray.java | 10 +- .../grouped/array/ByteBigArray.java | 10 +- .../grouped/array/DoubleBigArray.java | 10 +- .../grouped/array/FloatBigArray.java | 10 +- .../grouped/array/HyperLogLogBigArray.java | 4 +- .../grouped/array/IntArrayFIFOQueue.java | 2 +- .../grouped/array/IntBigArray.java | 10 +- .../grouped/array/IntBigArrays.java | 6 +- .../grouped/array/IntComparator.java | 2 +- .../grouped/array/LongBigArray.java | 10 +- .../grouped/array/LongBigArrayFIFOQueue.java | 2 +- .../grouped/array/MapBigArray.java | 2 +- .../grouped/array/ObjectBigArray.java | 10 +- .../grouped/array/ShortBigArray.java | 10 +- .../grouped/array/SpaceSavingBigArray.java | 10 +- .../grouped/array/TDigestBigArray.java | 4 +- .../builder/HashAggregationBuilder.java | 2 +- .../InMemoryHashAggregationBuilder.java | 8 +- .../relational/ColumnTransformerBuilder.java | 266 +++++----- .../metric/QueryExecutionMetricSet.java | 2 +- .../plan/planner/CommonOperatorUtils.java | 20 +- .../ITableOperatorGeneratorContext.java | 2 +- .../plan/planner/TableOperatorGenerator.java | 190 ++++---- .../memory/MemoryReservationManager.java | 2 +- .../metadata/CommonMetadataUtils.java | 2 +- .../relational/metadata/ITypeMetadata.java | 2 +- .../planner/CastToBlobLiteralVisitor.java | 2 +- .../planner/CastToBooleanLiteralVisitor.java | 2 +- .../planner/CastToDateLiteralVisitor.java | 2 +- .../planner/CastToDoubleLiteralVisitor.java | 2 +- .../planner/CastToFloatLiteralVisitor.java | 2 +- .../planner/CastToInt32LiteralVisitor.java | 2 +- .../planner/CastToInt64LiteralVisitor.java | 2 +- .../planner/CastToStringLiteralVisitor.java | 2 +- .../CastToTimestampLiteralVisitor.java | 2 +- .../ir/GlobalTimePredicateExtractVisitor.java | 2 +- .../relational/utils/matching/Capture.java | 2 +- .../relational/utils/matching/Captures.java | 2 +- .../utils/matching/DefaultPrinter.java | 12 +- .../plan/relational/utils/matching/Match.java | 2 +- .../relational/utils/matching/Pattern.java | 10 +- .../utils/matching/PatternVisitor.java | 12 +- .../relational/utils/matching/Property.java | 6 +- .../utils/matching/PropertyPattern.java | 2 +- .../matching/pattern/CapturePattern.java | 12 +- .../utils/matching/pattern/EqualsPattern.java | 10 +- .../utils/matching/pattern/FilterPattern.java | 10 +- .../utils/matching/pattern/TypeOfPattern.java | 10 +- .../utils/matching/pattern/WithPattern.java | 14 +- ...AbstractTemporaryQueryDataFileService.java | 4 +- ...TemporaryQueryDataFileServiceProvider.java | 2 +- .../dag/adapter/PointCollectorAdaptor.java | 2 +- ...AbstractCaseWhenThenColumnTransformer.java | 2 +- .../dag/column/ColumnCache.java | 2 +- .../dag/column/ColumnTransformer.java | 6 +- .../column/FailFunctionColumnTransformer.java | 2 +- .../TableCaseWhenThenColumnTransformer.java | 2 +- .../TreeCaseWhenThenColumnTransformer.java | 2 +- .../ArithmeticAdditionColumnTransformer.java | 4 +- .../ArithmeticBinaryColumnTransformer.java | 4 +- .../ArithmeticDivisionColumnTransformer.java | 4 +- .../ArithmeticModuloColumnTransformer.java | 4 +- ...hmeticMultiplicationColumnTransformer.java | 4 +- ...rithmeticSubtractionColumnTransformer.java | 4 +- .../binary/BinaryColumnTransformer.java | 4 +- .../CompareBinaryColumnTransformer.java | 12 +- .../CompareEqualToColumnTransformer.java | 6 +- .../CompareGreaterEqualColumnTransformer.java | 4 +- .../CompareGreaterThanColumnTransformer.java | 4 +- .../CompareLessEqualColumnTransformer.java | 4 +- .../CompareLessThanColumnTransformer.java | 4 +- .../CompareNonEqualColumnTransformer.java | 6 +- .../column/binary/HmacColumnTransformer.java | 8 +- .../column/binary/Like2ColumnTransformer.java | 6 +- .../binary/LogicAndColumnTransformer.java | 4 +- .../binary/LogicBinaryColumnTransformer.java | 4 +- .../binary/LogicOrColumnTransformer.java | 4 +- .../binary/factory/HmacStrategiesFactory.java | 4 +- .../binary/strategies/HmacStrategy.java | 2 +- .../leaf/ConstantColumnTransformer.java | 2 +- .../leaf/IdentityColumnTransformer.java | 2 +- .../column/leaf/LeafColumnTransformer.java | 4 +- .../column/leaf/NullColumnTransformer.java | 2 +- .../column/leaf/TimeColumnTransformer.java | 2 +- ...bstractGreatestLeastColumnTransformer.java | 4 +- .../BinaryGreatestColumnTransformer.java | 4 +- .../multi/BinaryLeastColumnTransformer.java | 4 +- .../BooleanGreatestColumnTransformer.java | 4 +- .../multi/BooleanLeastColumnTransformer.java | 4 +- .../multi/CoalesceColumnTransformer.java | 4 +- .../DoubleGreatestColumnTransformer.java | 4 +- .../multi/DoubleLeastColumnTransformer.java | 4 +- .../multi/FloatGreatestColumnTransformer.java | 4 +- .../multi/FloatLeastColumnTransformer.java | 4 +- .../multi/InBinaryMultiColumnTransformer.java | 4 +- .../InBooleanMultiColumnTransformer.java | 4 +- .../multi/InDoubleMultiColumnTransformer.java | 4 +- .../multi/InFloatMultiColumnTransformer.java | 4 +- .../multi/InInt32MultiColumnTransformer.java | 4 +- .../multi/InInt64MultiColumnTransformer.java | 4 +- .../multi/InMultiColumnTransformer.java | 4 +- .../multi/Int32GreatestColumnTransformer.java | 4 +- .../multi/Int32LeastColumnTransformer.java | 4 +- .../multi/Int64GreatestColumnTransformer.java | 4 +- .../multi/Int64LeastColumnTransformer.java | 4 +- .../LogicalAndMultiColumnTransformer.java | 4 +- .../multi/LogicalMultiColumnTransformer.java | 4 +- .../LogicalOrMultiColumnTransformer.java | 4 +- .../multi/MappableUDFColumnTransformer.java | 6 +- .../column/multi/MultiColumnTransformer.java | 4 +- .../ternary/BetweenColumnTransformer.java | 12 +- .../CompareTernaryColumnTransformer.java | 4 +- .../ternary/Like3ColumnTransformer.java | 8 +- .../column/ternary/LpadColumnTransformer.java | 6 +- .../column/ternary/RpadColumnTransformer.java | 6 +- .../ternary/TernaryColumnTransformer.java | 4 +- .../ternary/utils/BytePaddingUtils.java | 2 +- .../UserDefineScalarFunctionTransformer.java | 8 +- .../ArithmeticNegationColumnTransformer.java | 4 +- .../dag/column/unary/InColumnTransformer.java | 4 +- .../column/unary/IsNullColumnTransformer.java | 4 +- .../column/unary/LikeColumnTransformer.java | 6 +- .../unary/LogicNotColumnTransformer.java | 4 +- .../unary/RegularColumnTransformer.java | 6 +- .../column/unary/UnaryColumnTransformer.java | 4 +- .../unary/scalar/AbsColumnTransformer.java | 6 +- .../AbstractBitwise2ColumnTransformer.java | 6 +- .../AbstractBitwiseColumnTransformer.java | 6 +- ...AbstractCastFunctionColumnTransformer.java | 10 +- .../AbstractLengthColumnTransformer.java | 6 +- .../unary/scalar/AcosColumnTransformer.java | 6 +- .../unary/scalar/AsinColumnTransformer.java | 6 +- .../unary/scalar/AtanColumnTransformer.java | 6 +- .../scalar/BitCount2ColumnTransformer.java | 8 +- .../scalar/BitCountColumnTransformer.java | 8 +- .../scalar/BitwiseAnd2ColumnTransformer.java | 6 +- .../scalar/BitwiseAndColumnTransformer.java | 6 +- .../BitwiseLeftShift2ColumnTransformer.java | 6 +- .../BitwiseLeftShiftColumnTransformer.java | 6 +- .../scalar/BitwiseNotColumnTransformer.java | 8 +- .../scalar/BitwiseOr2ColumnTransformer.java | 6 +- .../scalar/BitwiseOrColumnTransformer.java | 6 +- .../BitwiseRightShift2ColumnTransformer.java | 6 +- ...ightShiftArithmetic2ColumnTransformer.java | 6 +- ...RightShiftArithmeticColumnTransformer.java | 6 +- .../BitwiseRightShiftColumnTransformer.java | 6 +- .../scalar/BitwiseXor2ColumnTransformer.java | 6 +- .../scalar/BitwiseXorColumnTransformer.java | 6 +- .../scalar/BlobLengthColumnTransformer.java | 4 +- .../BytesToDoubleColumnTransformer.java | 10 +- .../scalar/BytesToFloatColumnTransformer.java | 10 +- .../scalar/BytesToIntColumnTransformer.java | 10 +- .../scalar/BytesToLongColumnTransformer.java | 10 +- .../column/unary/scalar/CRC32Transformer.java | 6 +- .../scalar/CastFunctionColumnTransformer.java | 4 +- .../unary/scalar/CeilColumnTransformer.java | 6 +- .../scalar/Concat2ColumnTransformer.java | 8 +- .../unary/scalar/ConcatColumnTransformer.java | 6 +- .../scalar/ConcatMultiColumnTransformer.java | 6 +- .../unary/scalar/CosColumnTransformer.java | 6 +- .../unary/scalar/CoshColumnTransformer.java | 6 +- .../DateBinFunctionColumnTransformer.java | 6 +- .../scalar/DegreesColumnTransformer.java | 6 +- .../unary/scalar/DiffColumnTransformer.java | 6 +- .../scalar/DiffFunctionColumnTransformer.java | 6 +- .../DoubleToBytesColumnTransformer.java | 8 +- .../scalar/EndsWith2ColumnTransformer.java | 8 +- .../scalar/EndsWithColumnTransformer.java | 8 +- .../unary/scalar/ExpColumnTransformer.java | 6 +- .../unary/scalar/ExtractTransformer.java | 6 +- .../scalar/FloatToBytesColumnTransformer.java | 8 +- .../unary/scalar/FloorColumnTransformer.java | 6 +- .../unary/scalar/FormatColumnTransformer.java | 6 +- .../scalar/GenericCodecColumnTransformer.java | 10 +- .../HmacConstantKeyColumnTransformer.java | 8 +- .../scalar/IntToBytesColumnTransformer.java | 8 +- .../unary/scalar/LTrim2ColumnTransformer.java | 8 +- .../unary/scalar/LTrimColumnTransformer.java | 8 +- .../unary/scalar/LengthColumnTransformer.java | 4 +- .../unary/scalar/LnColumnTransformer.java | 6 +- .../unary/scalar/Log10ColumnTransformer.java | 6 +- .../scalar/LongToBytesColumnTransformer.java | 8 +- .../unary/scalar/LowerColumnTransformer.java | 6 +- .../scalar/ObjectLengthColumnTransformer.java | 6 +- .../unary/scalar/RTrim2ColumnTransformer.java | 8 +- .../unary/scalar/RTrimColumnTransformer.java | 8 +- .../scalar/RadiansColumnTransformer.java | 6 +- .../scalar/RegexpLike2ColumnTransformer.java | 6 +- .../scalar/RegexpLikeColumnTransformer.java | 6 +- .../scalar/Replace2ColumnTransformer.java | 6 +- .../scalar/Replace3ColumnTransformer.java | 6 +- .../ReplaceFunctionColumnTransformer.java | 6 +- .../unary/scalar/RoundColumnTransformer.java | 6 +- .../RoundFunctionColumnTransformer.java | 6 +- .../unary/scalar/SignColumnTransformer.java | 6 +- .../unary/scalar/SinColumnTransformer.java | 6 +- .../unary/scalar/SinhColumnTransformer.java | 6 +- .../unary/scalar/SqrtColumnTransformer.java | 6 +- .../scalar/StartsWith2ColumnTransformer.java | 8 +- .../scalar/StartsWithColumnTransformer.java | 6 +- .../scalar/Strcmp2ColumnTransformer.java | 6 +- .../unary/scalar/StrcmpColumnTransformer.java | 6 +- .../scalar/Strpos2ColumnTransformer.java | 6 +- .../unary/scalar/StrposColumnTransformer.java | 6 +- .../scalar/SubString2ColumnTransformer.java | 6 +- .../scalar/SubString3ColumnTransformer.java | 8 +- .../scalar/SubStringColumnTransformer.java | 6 +- .../unary/scalar/TanColumnTransformer.java | 6 +- .../unary/scalar/TanhColumnTransformer.java | 6 +- .../unary/scalar/Trim2ColumnTransformer.java | 8 +- .../unary/scalar/TrimColumnTransformer.java | 6 +- .../TryCastFunctionColumnTransformer.java | 4 +- .../unary/scalar/UpperColumnTransformer.java | 6 +- .../factory/CodecStrategiesFactory.java | 8 +- .../NumericCodecStrategiesFactory.java | 2 +- .../unary/scalar/inteface/CodecStrategy.java | 2 +- .../column/unary/scalar/util/HexUtils.java | 2 +- .../unary/scalar/util/SpookyHashV2Utils.java | 2 +- .../scalar/util/TransformerDebugUtils.java | 6 +- .../dag/udf/UDFParametersFactory.java | 2 +- .../transformation/dag/udf/UDTFExecutor.java | 8 +- .../transformation/dag/util/BitwiseUtils.java | 2 +- .../dag/util/CastFunctionUtils.java | 2 +- .../dag/util/CommonTransformUtils.java | 2 +- .../dag/util/InputRowUtils.java | 2 +- .../transformation/datastructure/Cache.java | 2 +- .../datastructure/SerializableList.java | 4 +- .../iterator/ListForwardIterator.java | 2 +- .../iterator/RowListForwardIterator.java | 6 +- .../iterator/TVListForwardIterator.java | 6 +- .../row/ElasticSerializableRowList.java | 8 +- .../row/SerializableRowList.java | 8 +- .../tv/ElasticSerializableBinaryTVList.java | 8 +- .../tv/ElasticSerializableTVList.java | 6 +- .../datastructure/tv/SerializableTVList.java | 8 +- .../datastructure/util/BinaryUtils.java | 2 +- .../calc_commons/utils/HeapTraversal.java | 2 +- .../utils/IObjectFileService.java | 2 +- .../utils/IObjectFileServiceProvider.java | 2 +- .../calc_commons/utils/IObjectPath.java | 2 +- .../calc_commons/utils/ObjectTypeUtils.java | 2 +- .../utils/constant/SqlConstant.java | 2 +- .../utils/datastructure/MergeSortHeap.java | 2 +- .../utils/datastructure/MergeSortKey.java | 2 +- .../utils/datastructure/SortKey.java | 2 +- .../calc_commons/utils/sort/DiskSpiller.java | 4 +- .../utils/sort/FileSpillerReader.java | 4 +- .../calc_commons/utils/sort/MemoryReader.java | 4 +- .../utils/sort/SortBufferManager.java | 4 +- .../calc_commons/utils/sort/SortReader.java | 4 +- .../utils/sort/TableDiskSpiller.java | 4 +- .../utils/sort/TreeDiskSpiller.java | 2 +- .../request/read/ttl/ShowTTLPlan.java | 2 +- .../confignode/manager/ProcedureManager.java | 2 +- iotdb-core/datanode/pom.xml | 5 + .../aggregate/AggregateProcessor.java | 2 +- .../queryengine/common/MPPQueryContext.java | 2 +- .../aggregation/AccumulatorFactory.java | 4 +- .../execution/aggregation/AvgAccumulator.java | 2 +- .../aggregation/CountAccumulator.java | 2 +- .../aggregation/CountIfAccumulator.java | 2 +- .../aggregation/CountTimeAccumulator.java | 2 +- .../aggregation/ExtremeAccumulator.java | 2 +- .../aggregation/FirstValueAccumulator.java | 2 +- .../aggregation/LastValueAccumulator.java | 2 +- .../aggregation/MaxMinByBaseAccumulator.java | 2 +- .../aggregation/MaxTimeAccumulator.java | 2 +- .../aggregation/MaxValueAccumulator.java | 2 +- .../aggregation/MinTimeAccumulator.java | 2 +- .../aggregation/MinValueAccumulator.java | 2 +- .../execution/aggregation/SumAccumulator.java | 2 +- .../aggregation/TimeDurationAccumulator.java | 2 +- .../execution/aggregation/TreeAggregator.java | 8 +- .../aggregation/UDAFAccumulator.java | 4 +- .../EmptyQueueSlidingWindowAggregator.java | 2 +- ...MonotonicQueueSlidingWindowAggregator.java | 2 +- .../NormalQueueSlidingWindowAggregator.java | 2 +- .../SlidingWindowAggregator.java | 2 +- .../SlidingWindowAggregatorFactory.java | 2 +- .../SmoothQueueSlidingWindowAggregator.java | 2 +- .../TableDateBinTimeRangeIterator.java | 2 +- .../execution/driver/DataDriver.java | 4 +- .../queryengine/execution/driver/Driver.java | 8 +- .../execution/driver/SchemaDriver.java | 2 +- .../fragment/FragmentInstanceContext.java | 2 +- .../fragment/FragmentInstanceExecution.java | 2 +- .../fragment/FragmentInstanceManager.java | 4 +- .../execution/operator/EmptyDataOperator.java | 2 +- .../operator/ExplainAnalyzeOperator.java | 4 +- .../execution/operator/OperatorContext.java | 4 +- .../process/AbstractIntoOperator.java | 4 +- .../process/AbstractTreeIntoOperator.java | 2 +- .../ActiveRegionScanMergeOperator.java | 4 +- .../operator/process/AggregationOperator.java | 4 +- .../process/ColumnInjectOperator.java | 4 +- .../process/DeviceViewIntoOperator.java | 2 +- .../operator/process/DeviceViewOperator.java | 4 +- .../operator/process/ProjectOperator.java | 4 +- .../process/RawDataAggregationOperator.java | 2 +- .../process/SingleDeviceViewOperator.java | 4 +- .../SingleInputAggregationOperator.java | 4 +- .../SlidingWindowAggregationOperator.java | 2 +- .../operator/process/TableIntoOperator.java | 2 +- .../process/TagAggregationOperator.java | 4 +- .../operator/process/TransformOperator.java | 4 +- .../operator/process/TreeFillOperator.java | 6 +- .../operator/process/TreeIntoOperator.java | 2 +- .../process/TreeLinearFillOperator.java | 6 +- .../process/TreeMergeSortOperator.java | 6 +- .../operator/process/TreeSortOperator.java | 8 +- .../operator/process/TreeTopKOperator.java | 6 +- .../process/ai/InferenceOperator.java | 4 +- .../process/copyto/TableCopyToOperator.java | 4 +- .../copyto/tsfile/CopyToTsFileOptions.java | 2 +- .../join/FullOuterTimeJoinOperator.java | 4 +- .../join/HorizontallyConcatOperator.java | 4 +- .../process/join/InnerTimeJoinOperator.java | 4 +- .../join/LeftOuterTimeJoinOperator.java | 4 +- .../join/TableLeftOuterTimeJoinOperator.java | 2 +- .../join/merge/MergeSortComparatorUtils.java | 4 +- .../last/AbstractUpdateLastCacheOperator.java | 4 +- .../last/AlignedUpdateLastCacheOperator.java | 2 +- ...lignedUpdateViewPathLastCacheOperator.java | 2 +- .../last/LastQueryCollectOperator.java | 4 +- .../process/last/LastQueryMergeOperator.java | 4 +- .../process/last/LastQueryOperator.java | 4 +- .../process/last/LastQuerySortOperator.java | 4 +- .../last/LastQueryTransformOperator.java | 4 +- .../process/last/UpdateLastCacheOperator.java | 2 +- .../last/UpdateViewPathLastCacheOperator.java | 2 +- .../CountGroupByLevelMergeOperator.java | 4 +- .../operator/schema/CountMergeOperator.java | 4 +- .../schema/NodeManageMemoryMergeOperator.java | 4 +- .../schema/NodePathsConvertOperator.java | 4 +- .../schema/NodePathsCountOperator.java | 4 +- .../schema/SchemaFetchMergeOperator.java | 4 +- .../schema/SchemaQueryMergeOperator.java | 4 +- .../SchemaQueryOrderByHeatOperator.java | 4 +- .../schema/source/DeviceAttributeUpdater.java | 6 +- .../source/DeviceBlackListConstructor.java | 4 +- .../schema/source/DevicePredicateFilter.java | 4 +- .../schema/source/DevicePredicateHandler.java | 6 +- .../operator/schema/source/DeviceUpdater.java | 4 +- .../operator/sink/IdentitySinkOperator.java | 2 +- .../operator/sink/ShuffleHelperOperator.java | 2 +- .../execution/operator/sink/SinkOperator.java | 2 +- .../source/AbstractSourceOperator.java | 2 +- .../operator/source/SourceOperator.java | 2 +- .../AbstractAggTableScanOperator.java | 4 +- .../AbstractDefaultAggTableScanOperator.java | 2 +- .../relational/AbstractTableScanOperator.java | 2 +- .../DeviceIteratorScanOperator.java | 4 +- ...formationSchemaContentSupplierFactory.java | 2 +- .../LastQueryAggTableScanOperator.java | 10 +- .../MeasurementToTableViewAdaptorUtils.java | 2 +- ...gnedDeviceViewAggregationScanOperator.java | 6 +- .../TreeToTableViewAdaptorOperator.java | 4 +- .../execution/schedule/DriverScheduler.java | 2 +- .../execution/schedule/IDriverScheduler.java | 2 +- .../plan/analyze/AnalyzeVisitor.java | 6 +- .../plan/analyze/ExpressionAnalyzer.java | 2 +- .../plan/analyze/ExpressionTypeAnalyzer.java | 2 +- .../analyze/TemplatedAggregationAnalyze.java | 2 +- .../TreeSchemaAutoCreatorAndVerifier.java | 2 +- .../schema/ClusterSchemaFetchExecutor.java | 2 +- .../plan/execution/QueryExecution.java | 4 +- .../executor/ClusterConfigTaskExecutor.java | 2 +- .../plan/expression/Expression.java | 2 +- .../expression/binary/BinaryExpression.java | 2 +- .../plan/expression/leaf/LeafOperand.java | 2 +- .../expression/multi/FunctionExpression.java | 2 +- .../builtin/BuiltInScalarFunctionHelper.java | 2 +- .../builtin/helper/CastFunctionHelper.java | 6 +- .../builtin/helper/DiffFunctionHelper.java | 4 +- .../builtin/helper/ReplaceFunctionHelper.java | 8 +- .../builtin/helper/RoundFunctionHelper.java | 6 +- .../helper/SubStringFunctionHelper.java | 12 +- .../other/CaseWhenThenExpression.java | 2 +- .../other/GroupByTimeExpression.java | 2 +- .../expression/ternary/TernaryExpression.java | 2 +- .../expression/unary/UnaryExpression.java | 2 +- .../visitor/ColumnTransformerVisitor.java | 58 +-- .../CountTimeAggregationAmountVisitor.java | 2 +- .../visitor/IntermediateLayerVisitor.java | 2 +- .../visitor/ReconstructVisitor.java | 2 +- .../BindSchemaForExpressionVisitor.java | 4 +- .../BindSchemaForPredicateVisitor.java | 4 +- ...viceAndBindSchemaForExpressionVisitor.java | 4 +- ...oncatExpressionWithSuffixPathsVisitor.java | 2 +- .../optimization/AggregationPushDown.java | 2 +- .../queryengine/plan/parser/ASTVisitor.java | 26 +- .../plan/parser/StatementGenerator.java | 2 +- .../DataNodeTableOperatorGenerator.java | 44 +- .../planner/LocalExecutionPlanContext.java | 4 +- .../plan/planner/LocalExecutionPlanner.java | 4 +- .../plan/planner/LogicalPlanBuilder.java | 4 +- .../plan/planner/OperatorGeneratorUtil.java | 2 +- .../plan/planner/OperatorTreeGenerator.java | 24 +- .../plan/planner/PipelineDriverFactory.java | 2 +- .../planner/distribution/SourceRewriter.java | 12 +- ...umeAllChildrenPipelineMemoryEstimator.java | 2 +- ...ildrenOneByOnePipelineMemoryEstimator.java | 2 +- .../memory/FakedMemoryReservationManager.java | 2 +- ...NotThreadSafeMemoryReservationManager.java | 2 +- .../memory/PipelineMemoryEstimator.java | 2 +- .../PipelineMemoryEstimatorFactory.java | 2 +- .../planner/plan/node/write/ObjectNode.java | 2 +- .../plan/parameter/AggregationDescriptor.java | 6 +- .../CrossSeriesAggregationDescriptor.java | 2 +- .../analyzer/ExpressionAnalyzer.java | 16 +- .../analyzer/StatementAnalyzer.java | 4 +- .../ConvertPredicateToFilterVisitor.java | 6 +- ...ConvertSchemaPredicateToFilterVisitor.java | 2 +- .../plan/relational/metadata/Metadata.java | 2 +- .../metadata/TableMetadataImpl.java | 6 +- .../fetcher/TableHeaderSchemaValidator.java | 2 +- .../planner/IrExpressionInterpreter.java | 4 +- .../relational/planner/LiteralEncoder.java | 6 +- .../plan/relational/planner/QueryPlanner.java | 2 +- .../planner/TableLogicalPlanner.java | 2 +- .../TableDistributedPlanGenerator.java | 2 +- .../GapFillStartAndEndTimeExtractVisitor.java | 2 +- .../planner/iterative/IterativeOptimizer.java | 8 +- .../relational/planner/iterative/Rule.java | 4 +- .../planner/iterative/RuleIndex.java | 4 +- .../EliminateLimitProjectWithTableScan.java | 8 +- .../rule/EliminateLimitWithTableScan.java | 8 +- .../rule/EvaluateEmptyIntersect.java | 4 +- .../rule/ExpressionRewriteRuleSet.java | 4 +- .../iterative/rule/GatherAndMergeWindows.java | 10 +- .../iterative/rule/ImplementExceptAll.java | 4 +- .../rule/ImplementExceptDistinctAsUnion.java | 4 +- .../iterative/rule/ImplementIntersectAll.java | 4 +- .../ImplementIntersectDistinctAsUnion.java | 4 +- .../rule/ImplementPatternRecognition.java | 4 +- .../rule/ImplementTableFunctionSource.java | 4 +- .../iterative/rule/InlineProjections.java | 8 +- .../planner/iterative/rule/MergeExcept.java | 4 +- .../planner/iterative/rule/MergeFilters.java | 8 +- .../iterative/rule/MergeIntersect.java | 4 +- .../MergeLimitOverProjectWithMergeSort.java | 8 +- .../rule/MergeLimitOverProjectWithSort.java | 8 +- .../rule/MergeLimitWithMergeSort.java | 8 +- .../iterative/rule/MergeLimitWithSort.java | 8 +- .../planner/iterative/rule/MergeLimits.java | 8 +- .../planner/iterative/rule/MergeUnion.java | 4 +- ...ipleDistinctAggregationToMarkDistinct.java | 4 +- .../iterative/rule/OptimizeRowPattern.java | 4 +- .../rule/ProjectOffPushDownRule.java | 8 +- .../rule/PruneAggregationSourceColumns.java | 4 +- .../iterative/rule/PruneApplyCorrelation.java | 4 +- .../rule/PruneApplySourceColumns.java | 4 +- .../iterative/rule/PruneCopyToColumns.java | 4 +- .../rule/PruneCorrelatedJoinCorrelation.java | 4 +- .../rule/PruneDistinctAggregation.java | 4 +- .../rule/PruneExceptSourceColumns.java | 4 +- .../rule/PruneExplainAnalyzeColumns.java | 4 +- .../rule/PruneIntersectSourceColumns.java | 4 +- .../rule/PruneJoinChildrenColumns.java | 4 +- .../rule/PruneOutputSourceColumns.java | 4 +- .../PrunePatternRecognitionSourceColumns.java | 4 +- ...neTableFunctionProcessorSourceColumns.java | 4 +- .../rule/PruneUnionSourceColumns.java | 4 +- .../rule/PushDownFilterIntoWindow.java | 8 +- .../rule/PushDownLimitIntoWindow.java | 8 +- .../rule/PushDownOffsetIntoTableScan.java | 8 +- .../rule/PushLimitThroughOffset.java | 8 +- .../rule/PushLimitThroughProject.java | 8 +- .../iterative/rule/PushLimitThroughUnion.java | 8 +- .../rule/PushProjectionThroughUnion.java | 8 +- .../iterative/rule/PushTopKThroughUnion.java | 8 +- .../rule/RemoveEmptyExceptBranches.java | 4 +- .../rule/RemoveEmptyUnionBranches.java | 4 +- .../RemoveRedundantEnforceSingleRowNode.java | 4 +- .../iterative/rule/RemoveRedundantExists.java | 4 +- .../RemoveRedundantIdentityProjections.java | 4 +- .../iterative/rule/RemoveRedundantWindow.java | 4 +- .../iterative/rule/RemoveTrivialFilters.java | 4 +- .../RemoveUnreferencedScalarApplyNodes.java | 4 +- .../RemoveUnreferencedScalarSubqueries.java | 4 +- .../rule/ReplaceWindowWithRowNumber.java | 4 +- .../rule/SetOperationNodeTranslator.java | 4 +- .../rule/SimplifyCountOverConstant.java | 10 +- .../SingleDistinctAggregationToGroupBy.java | 4 +- ...atedDistinctAggregationWithProjection.java | 10 +- ...dDistinctAggregationWithoutProjection.java | 10 +- ...elatedGlobalAggregationWithProjection.java | 12 +- ...tedGlobalAggregationWithoutProjection.java | 12 +- ...latedGroupedAggregationWithProjection.java | 10 +- ...edGroupedAggregationWithoutProjection.java | 10 +- .../rule/TransformCorrelatedJoinToJoin.java | 6 +- .../TransformCorrelatedScalarSubquery.java | 8 +- .../TransformExistsApplyToCorrelatedJoin.java | 4 +- ...TransformFilteringSemiJoinToInnerJoin.java | 8 +- ...rrelatedInPredicateSubqueryToSemiJoin.java | 6 +- .../TransformUncorrelatedSubqueryToJoin.java | 6 +- .../node/AggregationTableScanNode.java | 4 +- .../relational/planner/node/Patterns.java | 10 +- .../PushPredicateIntoTableScan.java | 2 +- .../plan/relational/sql/ast/DeleteDevice.java | 6 +- .../relational/sql/parser/AstBuilder.java | 6 +- .../plan/scheduler/ClusterScheduler.java | 4 +- .../FragmentInstanceDispatcherImpl.java | 4 +- .../plan/statement/crud/QueryStatement.java | 2 +- ...eRowRecordListBackedMultiColumnWindow.java | 2 +- ...rdListBackedMultiColumnWindowIterator.java | 2 +- ...rializableTVListBackedSingleColumnRow.java | 2 +- ...lizableTVListBackedSingleColumnWindow.java | 2 +- ...VListBackedSingleColumnWindowIterator.java | 2 +- .../dag/input/QueryDataSetInputLayer.java | 4 +- .../dag/input/TsBlockInputDataSet.java | 2 +- .../dag/intermediate/MultiInputLayer.java | 4 +- .../SingleInputMultiReferenceLayer.java | 4 +- .../SingleInputSingleReferenceLayer.java | 4 +- .../transformation/dag/memory/SafetyLine.java | 2 +- .../binary/CompareEqualToTransformer.java | 2 +- .../CompareGreaterEqualTransformer.java | 2 +- .../binary/CompareGreaterThanTransformer.java | 2 +- .../binary/CompareLessEqualTransformer.java | 2 +- .../binary/CompareLessThanTransformer.java | 2 +- .../binary/CompareNonEqualTransformer.java | 2 +- .../multi/MappableUDFQueryRowTransformer.java | 2 +- .../multi/UDFQueryRowTransformer.java | 2 +- .../multi/UDFQueryRowWindowTransformer.java | 2 +- .../multi/UDFQueryTransformer.java | 2 +- .../multi/UniversalUDFQueryTransformer.java | 6 +- .../ternary/BetweenTransformer.java | 2 +- .../unary/scalar/CastFunctionTransformer.java | 2 +- .../SubStringFunctionColumnTransformer.java | 4 +- .../scalar/SubStringFunctionTransformer.java | 2 +- .../dag/udf/UDAFInformationInferrer.java | 2 +- .../transformation/dag/udf/UDTFContext.java | 4 +- .../dag/udf/UDTFInformationInferrer.java | 2 +- .../dag/util/LayerCacheUtils.java | 4 +- .../impl/SchemaRegionMemoryImpl.java | 8 +- .../utils/ResourceByPathUtils.java | 2 +- .../table/DataNodeTableCache.java | 2 +- .../org/apache/iotdb/db/service/DataNode.java | 2 +- ...TemporaryQueryDataFileServiceProvider.java | 4 +- .../TemporaryQueryDataFileService.java | 2 +- .../metrics/DataNodeMetricsHelper.java | 2 +- .../storageengine/dataregion/DataRegion.java | 4 +- .../memtable/AbstractWritableMemChunk.java | 4 +- .../dataregion/memtable/TsFileProcessor.java | 4 +- .../reader/chunk/DiskAlignedChunkLoader.java | 2 +- .../read/reader/chunk/DiskChunkLoader.java | 2 +- .../reader/common/PriorityMergeReader.java | 2 +- .../DataRegionTableSizeQueryContext.java | 2 +- .../apache/iotdb/db/utils/CommonUtils.java | 2 +- .../db/utils/DataNodeObjectFileService.java | 4 +- .../DataNodeObjectFileServiceProvider.java | 4 +- .../apache/iotdb/db/utils/SchemaUtils.java | 2 +- .../iotdb/db/utils/TypeInferenceUtils.java | 2 +- ...ce.ITemporaryQueryDataFileServiceProvider} | 0 ..._commons.utils.IObjectFileServiceProvider} | 0 .../iotdb/db/qp/sql/ASTVisitorTest.java | 2 +- .../queryengine/execution/DataDriverTest.java | 2 +- .../aggregation/AccumulatorTest.java | 2 +- .../FragmentInstanceExecutionTest.java | 2 +- .../AggregationMergeSortOperatorTest.java | 6 +- .../operator/AggregationOperatorTest.java | 4 +- .../DeviceIteratorScanOperatorTest.java | 2 +- .../operator/DeviceViewIntoOperatorTest.java | 2 +- .../operator/DeviceViewOperatorTest.java | 2 +- .../execution/operator/FillOperatorTest.java | 6 +- .../operator/LastQueryMergeOperatorTest.java | 2 +- .../execution/operator/LimitOperatorTest.java | 2 +- .../operator/MergeTreeSortOperatorTest.java | 4 +- ...nedTreeDeviceViewScanOperatorTreeTest.java | 8 +- .../operator/OffsetOperatorTest.java | 4 +- .../operator/OperatorMemoryTest.java | 22 +- .../RawDataAggregationOperatorTest.java | 2 +- .../operator/SortOperatorSortBranchTest.java | 6 +- .../operator/TransformOperatorTest.java | 2 +- .../operator/TreeIntoOperatorTest.java | 2 +- .../operator/TreeLinearFillOperatorTest.java | 8 +- .../operator/TreeSortOperatorTest.java | 4 +- .../operator/TreeTopKOperatorTest.java | 2 +- .../ViewFromTreeAdaptorOperatorTest.java | 2 +- .../process/TableStreamSortOperatorTest.java | 10 +- .../operator/process/ValuesOperatorTest.java | 4 +- .../filter/MonthIntervalFillFilterTest.java | 6 +- .../gapfill/GapFillWGroupWMoOperatorTest.java | 14 +- .../GapFillWGroupWoMoOperatorTest.java | 14 +- .../GapFillWoGroupWMoOperatorTest.java | 10 +- .../GapFillWoGroupWoMoOperatorTest.java | 8 +- .../join/InnerTimeJoinOperatorTest.java | 2 +- .../join/LeftOuterTimeJoinOperatorTest.java | 2 +- .../process/rowpattern/MatcherTest.java | 16 +- .../rowpattern/PatternExpressionTest.java | 10 +- .../tvf/TableFunctionOperatorTest.java | 10 +- .../process/window/RowNumberOperatorTest.java | 6 +- .../window/TableWindowOperatorTest.java | 12 +- .../window/TableWindowOperatorTestUtils.java | 2 +- .../window/TopKRankingOperatorTest.java | 6 +- .../window/function/FunctionTestUtils.java | 14 +- .../AggregationWindowFunctionTest.java | 8 +- .../function/rank/CumeDistFunctionTest.java | 6 +- .../function/rank/DenseRankFunctionTest.java | 6 +- .../function/rank/NTileFunctionTest.java | 6 +- .../rank/PercentRankFunctionTest.java | 6 +- .../function/rank/RankFunctionTest.java | 6 +- .../function/rank/RowNumberFunctionTest.java | 6 +- .../value/FirstValueFunctionTest.java | 8 +- .../function/value/LagFunctionTest.java | 6 +- .../function/value/LastValueFunctionTest.java | 8 +- .../function/value/LeadFunctionTest.java | 6 +- .../function/value/NthValueFunctionTest.java | 8 +- .../partition/frame/FrameTestUtils.java | 18 +- .../partition/frame/GroupsFrameTest.java | 2 +- .../partition/frame/RangeFrameTest.java | 2 +- .../window/partition/frame/RowsFrameTest.java | 2 +- .../SinkOperatorDownStreamNodeIdTest.java | 2 +- .../schedule/DriverSchedulerTest.java | 2 +- .../plan/planner/PipelineBuilderTest.java | 2 +- .../AggregationTableScanTest.java | 20 +- .../analyzer/AggregationCornerCaseTest.java | 14 +- .../analyzer/AsofInnerJoinOperatorTest.java | 8 +- .../plan/relational/analyzer/JoinTest.java | 6 +- .../relational/analyzer/TSBSMetadata.java | 6 +- .../relational/analyzer/TestMetadata.java | 6 +- .../builder/EvaluationDAGBuilderTest.java | 2 +- ...AndCompareBinaryColumnTransformerTest.java | 24 +- .../LogicBinaryColumnTransformerTest.java | 8 +- .../hmac/HmacMd5ColumnTransformerTest.java | 10 +- .../hmac/HmacSha1ColumnTransformerTest.java | 10 +- .../hmac/HmacSha256ColumnTransformerTest.java | 10 +- .../hmac/HmacSha512ColumnTransformerTest.java | 10 +- .../ternary/LpadColumnTransformerTest.java | 4 +- .../ternary/RpadColumnTransformerTest.java | 4 +- .../unary/UnaryColumnTransformerTest.java | 16 +- .../BlobLengthColumnTransformerTest.java | 4 +- .../unary/scalar/DateBinFunctionTest.java | 2 +- .../FromBigEndian32ColumnTransformerTest.java | 6 +- .../FromBigEndian64ColumnTransformerTest.java | 6 +- ...E754_32BigEndianColumnTransformerTest.java | 6 +- ...E754_64BigEndianColumnTransformerTest.java | 6 +- ...omLittleEndian32ColumnTransformerTest.java | 6 +- ...omLittleEndian64ColumnTransformerTest.java | 6 +- .../ToBigEndian32ColumnTransformerTest.java | 6 +- .../ToBigEndian64ColumnTransformerTest.java | 6 +- ...E754_32BigEndianColumnTransformerTest.java | 6 +- ...E754_64BigEndianColumnTransformerTest.java | 6 +- ...ToLittleEndian32ColumnTransformerTest.java | 6 +- ...ToLittleEndian64ColumnTransformerTest.java | 6 +- .../scalar/ReverseColumnTransformerTest.java | 6 +- .../FromBase32ColumnTransformerTest.java | 6 +- .../FromBase64ColumnTransformerTest.java | 6 +- .../FromBase64UrlColumnTransformerTest.java | 6 +- .../ToBase32ColumnTransformerTest.java | 6 +- .../ToBase64ColumnTransformerTest.java | 6 +- .../ToBase64UrlColumnTransformerTest.java | 6 +- .../hashing/Crc32ColumnTransformerTest.java | 4 +- .../hashing/Md5ColumnTransformerTest.java | 6 +- .../hashing/Murmur3ColumnTransformerTest.java | 6 +- .../hashing/Sha1ColumnTransformerTest.java | 6 +- .../hashing/Sha256ColumnTransformerTest.java | 6 +- .../hashing/Sha512ColumnTransformerTest.java | 6 +- .../SpookyHashV2_32ColumnTransformerTest.java | 6 +- .../SpookyHashV2_64ColumnTransformerTest.java | 6 +- .../XxHash64ColumnTransformerTest.java | 6 +- .../FromHexColumnTransformerTest.java | 6 +- .../ToHexColumnTransformerTest.java | 6 +- .../dag/util/BitwiseUtilsTest.java | 18 +- .../ElasticSerializableRowListTest.java | 6 +- .../ElasticSerializableTVListTest.java | 6 +- .../datastructure/LRUCache.java | 2 +- .../SerializableRowListTest.java | 2 +- .../datastructure/SerializableTVListTest.java | 2 +- .../memtable/PrimitiveMemTableTest.java | 4 +- .../iotdb/db/utils/SchemaUtilsTest.java | 2 +- .../datastructure/MergeSortHeapTest.java | 6 +- .../iotdb/db/utils/sort/SortUtilTest.java | 14 +- iotdb-core/pom.xml | 1 + 965 files changed, 4862 insertions(+), 2765 deletions(-) create mode 100644 iotdb-core/calc_commons/pom.xml create mode 100644 iotdb-core/calc_commons/src/main/codegen/config.fmpp create mode 100644 iotdb-core/calc_commons/src/main/codegen/dataModel/AllDataType.tdd create mode 100644 iotdb-core/calc_commons/src/main/codegen/dataModel/CompareType.tdd create mode 100644 iotdb-core/calc_commons/src/main/codegen/dataModel/DecimalDataType.tdd create mode 100644 iotdb-core/calc_commons/src/main/codegen/dataModel/MathematicalDataType.tdd create mode 100644 iotdb-core/calc_commons/src/main/codegen/dataModel/MathematicalOperator.tdd create mode 100644 iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl create mode 100644 iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl create mode 100644 iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl create mode 100644 iotdb-core/calc_commons/src/main/codegen/templates/ModeAccumulator.ftl create mode 100644 iotdb-core/calc_commons/src/main/codegen/templates/constantFill.ftl create mode 100644 iotdb-core/calc_commons/src/main/codegen/templates/linearFill.ftl create mode 100644 iotdb-core/calc_commons/src/main/codegen/templates/previousFill.ftl create mode 100644 iotdb-core/calc_commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/exception/MemoryNotEnoughException.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/aggregation/Accumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/aggregation/VarianceAccumulator.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/AbstractOperator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/CommonOperatorContext.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/GroupedTopNBuilder.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/IdRegistry.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/Operator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/RowIdComparisonStrategy.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/RowIdHashStrategy.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/RowReference.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/RowReferenceTsBlockManager.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/TsBlockWithPositionComparator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/AbstractFillOperator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/AbstractLinearFillOperator.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/AbstractSortOperator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/AggregationMergeSortOperator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/AssignUniqueIdOperator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/CollectOperator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/EnforceSingleRowOperator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/FilterAndProjectOperator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/LimitOperator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/MappingCollectOperator.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/MergeSortOperator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/OffsetOperator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/PatternRecognitionOperator.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/ProcessOperator.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/SortOperator.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/TableFillOperator.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/TableLinearFillOperator.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/TableMergeSortOperator.java (83%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/TableSortOperator.java (82%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/TableStreamSortOperator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/TableTopKOperator.java (84%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/TopKOperator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/ValuesOperator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/fill/IFill.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/fill/IFillFilter.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/fill/ILinearFill.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/fill/identity/IdentityFill.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/fill/linear/LinearFill.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/function/PartitionRecognizer.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/function/TableFunctionOperator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/function/partition/PartitionCache.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/function/partition/PartitionState.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/function/partition/Slice.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java (83%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java (82%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java (81%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java (82%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java (82%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/expression/Computation.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/Done.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/Program.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/Save.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/rowpattern/matcher/Split.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/RowNumberOperator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/TableWindowOperator.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/TopKRankingOperator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/WindowFunction.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java (62%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/rank/RankFunction.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/value/LagFunction.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/value/LeadFunction.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java (84%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/partition/Partition.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/partition/frame/Frame.java (83%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/utils/ColumnList.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/utils/Range.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/process/window/utils/RowComparator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/Utils.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java (80%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/execution/relational/ColumnTransformerBuilder.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/metric/QueryExecutionMetricSet.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/planner/CommonOperatorUtils.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/planner/ITableOperatorGeneratorContext.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/planner/TableOperatorGenerator.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/planner/memory/MemoryReservationManager.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/metadata/CommonMetadataUtils.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/metadata/ITypeMetadata.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/utils/matching/Capture.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/utils/matching/Captures.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/utils/matching/DefaultPrinter.java (79%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/utils/matching/Match.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/utils/matching/Pattern.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/utils/matching/PatternVisitor.java (70%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/utils/matching/Property.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/utils/matching/PropertyPattern.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java (75%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java (79%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java (81%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java (80%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java (78%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/service/AbstractTemporaryQueryDataFileService.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/ColumnCache.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/ColumnTransformer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java (84%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java (84%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/InColumnTransformer.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java (84%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java (84%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java (84%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java (84%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java (84%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java (88%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java (84%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java (84%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java (85%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java (90%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java (86%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java (89%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java (91%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java (87%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/udf/UDFParametersFactory.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/udf/UDTFExecutor.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/util/BitwiseUtils.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/util/CastFunctionUtils.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/util/CommonTransformUtils.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/dag/util/InputRowUtils.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/datastructure/Cache.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/datastructure/SerializableList.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/datastructure/row/SerializableRowList.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/datastructure/tv/SerializableTVList.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/transformation/datastructure/util/BinaryUtils.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/HeapTraversal.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/IObjectFileService.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/IObjectFileServiceProvider.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/IObjectPath.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/ObjectTypeUtils.java (99%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/constant/SqlConstant.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/datastructure/MergeSortHeap.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/datastructure/MergeSortKey.java (96%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/datastructure/SortKey.java (94%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/sort/DiskSpiller.java (98%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/sort/FileSpillerReader.java (97%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/sort/MemoryReader.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/sort/SortBufferManager.java (95%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/sort/SortReader.java (92%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/sort/TableDiskSpiller.java (93%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db => calc_commons/src/main/java/org/apache/iotdb}/calc_commons/utils/sort/TreeDiskSpiller.java (96%) rename iotdb-core/datanode/src/main/resources/META-INF/services/{org.apache.iotdb.db.calc_commons.service.ITemporaryQueryDataFileServiceProvider => org.apache.iotdb.calc_commons.service.ITemporaryQueryDataFileServiceProvider} (100%) rename iotdb-core/datanode/src/main/resources/META-INF/services/{org.apache.iotdb.db.calc_commons.utils.IObjectFileServiceProvider => org.apache.iotdb.calc_commons.utils.IObjectFileServiceProvider} (100%) diff --git a/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java b/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java index 7d06d8b782b62..eca0a4e70062a 100644 --- a/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java +++ b/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java @@ -20,13 +20,13 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.protocol.session.MqttClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.plan.Coordinator; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java index a072e4d2c16f6..505ebb5fff08a 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java @@ -21,13 +21,13 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.DatabaseNotSetException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.rest.protocol.model.ExecutionStatus; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExecuteStatementHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExecuteStatementHandler.java index 646f5759c8baa..3bc5bcf5373d2 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExecuteStatementHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExecuteStatementHandler.java @@ -17,8 +17,8 @@ package org.apache.iotdb.rest.protocol.table.v1.handler; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DescribeTable; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/QueryDataSetHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/QueryDataSetHandler.java index 1b3ea44b245a1..8e1a60cb421e7 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/QueryDataSetHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/QueryDataSetHandler.java @@ -18,8 +18,8 @@ package org.apache.iotdb.rest.protocol.table.v1.handler; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; import org.apache.iotdb.rest.protocol.model.ExecutionStatus; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/StatementConstructionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/StatementConstructionHandler.java index 0fd72c1178e35..15c8f21224ef7 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/StatementConstructionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/StatementConstructionHandler.java @@ -18,10 +18,10 @@ package org.apache.iotdb.rest.protocol.table.v1.handler; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.WriteProcessRejectException; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; import org.apache.iotdb.rest.protocol.table.v1.model.InsertTabletRequest; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java index 87f60bddd7df0..5b6c2094b9b75 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java @@ -18,11 +18,11 @@ package org.apache.iotdb.rest.protocol.table.v1.impl; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor; -import org.apache.iotdb.db.node_commons.common.SqlDialect; -import org.apache.iotdb.db.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.protocol.thrift.OperationType; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/ExceptionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/ExceptionHandler.java index 6edcb57ab4d9a..525cf8a5e440e 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/ExceptionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/ExceptionHandler.java @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.DatabaseNotSetException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; import org.apache.iotdb.rest.protocol.v1.model.ExecutionStatus; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/StatementConstructionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/StatementConstructionHandler.java index 752772bc97055..25647fdfb324e 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/StatementConstructionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/StatementConstructionHandler.java @@ -18,9 +18,9 @@ package org.apache.iotdb.rest.protocol.v1.handler; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.db.exception.WriteProcessRejectException; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; import org.apache.iotdb.rest.protocol.v1.model.InsertTabletRequest; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/ExceptionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/ExceptionHandler.java index 931ec0cec002b..c0c04088d3867 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/ExceptionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/ExceptionHandler.java @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.DatabaseNotSetException; import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; import org.apache.iotdb.rest.protocol.model.ExecutionStatus; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/StatementConstructionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/StatementConstructionHandler.java index ffeed55b568ab..6175bd9111731 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/StatementConstructionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/StatementConstructionHandler.java @@ -18,10 +18,10 @@ package org.apache.iotdb.rest.protocol.v2.handler; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.db.exception.WriteProcessRejectException; import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException; -import org.apache.iotdb.db.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowsStatement; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/impl/RestApiServiceImpl.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/impl/RestApiServiceImpl.java index 6a7f08c6d8b80..5b206179c5033 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/impl/RestApiServiceImpl.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/impl/RestApiServiceImpl.java @@ -18,11 +18,11 @@ package org.apache.iotdb.rest.protocol.v2.impl; import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor; -import org.apache.iotdb.db.node_commons.common.SessionInfo; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.protocol.thrift.OperationType; diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java index 50f53166266a6..74e5228b98937 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java @@ -35,7 +35,7 @@ import static org.apache.iotdb.consensus.ConsensusFactory.IOT_CONSENSUS_V2; import static org.apache.iotdb.consensus.ConsensusFactory.RATIS_CONSENSUS; import static org.apache.iotdb.consensus.ConsensusFactory.SIMPLE_CONSENSUS; -import static org.apache.iotdb.db.node_commons.utils.DateTimeUtils.convertLongToDate; +import static org.apache.iotdb.commons.node_commons.utils.DateTimeUtils.convertLongToDate; import static org.apache.iotdb.it.env.cluster.ClusterConstant.CLUSTER_CONFIGURATIONS; import static org.apache.iotdb.it.env.cluster.ClusterConstant.DEFAULT_CONFIG_NODE_NUM; import static org.apache.iotdb.it.env.cluster.ClusterConstant.DEFAULT_DATA_NODE_NUM; diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java b/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java index b63defb8a41a5..673b7bd81bf61 100644 --- a/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java @@ -19,7 +19,7 @@ package org.apache.iotdb.itbase.constant; -import org.apache.iotdb.db.node_commons.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; import java.util.Arrays; import java.util.HashSet; 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 2ef679cee46eb..951582bbcc2a5 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 @@ -28,7 +28,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowDatabaseStatement; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; 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/confignode/it/procedure/IoTDBProcedureIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/procedure/IoTDBProcedureIT.java index 9b70e707109cc..39d27ff2ea245 100644 --- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/procedure/IoTDBProcedureIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/procedure/IoTDBProcedureIT.java @@ -28,7 +28,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp; import org.apache.iotdb.confignode.rpc.thrift.TTestOperation; import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowDatabaseStatement; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; 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/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java index 8f53c398c264b..132b8a0343929 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java @@ -19,7 +19,7 @@ package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; 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/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java index 1bf34a529d984..d3ef2fb8d7845 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java @@ -14,7 +14,7 @@ package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; 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/IoTDBArithmeticTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBArithmeticTableIT.java index ab9505b351cdd..e9d985d733c70 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBArithmeticTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBArithmeticTableIT.java @@ -19,7 +19,7 @@ package org.apache.iotdb.relational.it.query.old.query; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; 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/view/old/query/IoTDBArithmeticTableViewIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/view/old/query/IoTDBArithmeticTableViewIT.java index 9599f9e21eaa7..d6a3817c44a9b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/view/old/query/IoTDBArithmeticTableViewIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/view/old/query/IoTDBArithmeticTableViewIT.java @@ -19,7 +19,7 @@ package org.apache.iotdb.relational.it.query.view.old.query; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.TableClusterIT; 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 6924db234f78f..0cc52f86fd817 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 @@ -24,10 +24,10 @@ import org.apache.iotdb.cli.utils.IoTPrinter; import org.apache.iotdb.cli.utils.JlineUtils; import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.utils.PathUtils; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; -import org.apache.iotdb.db.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.exception.ArgsErrorException; import org.apache.iotdb.isession.SessionDataSet; import org.apache.iotdb.rpc.IoTDBConnectionException; diff --git a/iotdb-core/calc_commons/pom.xml b/iotdb-core/calc_commons/pom.xml new file mode 100644 index 0000000000000..fe2a0acabd84d --- /dev/null +++ b/iotdb-core/calc_commons/pom.xml @@ -0,0 +1,456 @@ + + + 4.0.0 + + org.apache.iotdb + iotdb-core + 2.0.7-SNAPSHOT + + + calc_commons + IoTDB: Core: Calc Commons + Common modules of the server and stream node + + ${calc.test.skip} + false + ${calc.test.skip} + + + + + org.apache.iotdb + service-rpc + 2.0.7-SNAPSHOT + + + org.apache.iotdb + iotdb-subscription + 2.0.7-SNAPSHOT + + + org.apache.iotdb + iotdb-consensus + 2.0.7-SNAPSHOT + + + org.apache.tsfile + common + ${tsfile.version} + + + org.apache.tsfile + tsfile + ${tsfile.version} + + + org.apache.iotdb + external-api + 2.0.7-SNAPSHOT + + + org.apache.iotdb + node-commons + 2.0.7-SNAPSHOT + + + org.apache.iotdb + isession + 2.0.7-SNAPSHOT + + + org.apache.iotdb + iotdb-antlr + 2.0.7-SNAPSHOT + + + org.apache.iotdb + iotdb-relational-grammar + 2.0.7-SNAPSHOT + + + org.apache.iotdb + iotdb-thrift-commons + 2.0.7-SNAPSHOT + + + org.apache.iotdb + iotdb-thrift-consensus + 2.0.7-SNAPSHOT + + + org.apache.iotdb + external-service-api + 2.0.7-SNAPSHOT + + + org.apache.iotdb + udf-api + 2.0.7-SNAPSHOT + + + org.apache.iotdb + trigger-api + 2.0.7-SNAPSHOT + + + org.apache.iotdb + metrics-interface + 2.0.7-SNAPSHOT + + + org.apache.iotdb + iotdb-thrift + 2.0.7-SNAPSHOT + + + org.apache.iotdb + iotdb-thrift-confignode + 2.0.7-SNAPSHOT + + + org.apache.iotdb + iotdb-thrift-ainode + 2.0.7-SNAPSHOT + + + org.apache.iotdb + pipe-api + 2.0.7-SNAPSHOT + + + org.apache.iotdb + iotdb-session + 2.0.7-SNAPSHOT + + + io.airlift + units + + + com.google.code.findbugs + jsr305 + + + com.google.errorprone + error_prone_annotations + true + + + org.apache.thrift + libthrift + + + io.netty + netty-common + + + org.apache.ratis + ratis-common + + + io.dropwizard.metrics + metrics-core + + + org.slf4j + slf4j-api + + + net.java.dev.jna + jna + + + net.java.dev.jna + jna-platform + + + org.eclipse.milo + stack-core + + + org.eclipse.milo + sdk-core + + + org.eclipse.milo + stack-server + + + org.eclipse.milo + stack-client + + + org.eclipse.milo + sdk-client + + + org.bouncycastle + bcprov-jdk18on + + + org.apache.commons + commons-pool2 + + + org.antlr + antlr4-runtime + + + io.airlift + airline + + + org.eclipse.milo + sdk-server + + + commons-cli + commons-cli + + + jakarta.validation + jakarta.validation-api + + + org.reflections + reflections + test + + + org.javassist + javassist + + + + + com.google.code.gson + gson + + + com.github.ben-manes.caffeine + caffeine + + + + org.checkerframework + checker-qual + + + + + com.google.guava + guava + + + org.java-websocket + Java-WebSocket + + + at.yawk.lz4 + lz4-java + + + junit + junit + test + + + + org.apache.iotdb + metrics-core + 2.0.7-SNAPSHOT + + + org.mockito + mockito-core + test + + + org.apache.ratis + ratis-thirdparty-misc + runtime + + + org.powermock + powermock-core + test + + + org.powermock + powermock-module-junit4 + test + + + org.powermock + powermock-api-mockito2 + test + + + org.awaitility + awaitility + test + + + com.tngtech.archunit + archunit + 1.3.0 + test + + + + + + + + org.apache.felix + maven-bundle-plugin + + true + + <_include>-bnd.bnd + <_removeheaders>Bnd-LastModified,Built-By + dependencies + + + + + bundle-manifest + process-classes + + manifest + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + true + true + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${calc.ut.skip} + false + random + + + + org.apache.maven.plugins + maven-resources-plugin + + + + copy-fmpp-resources + + copy-resources + + initialize + + ${project.build.directory}/codegen + + + src/main/codegen + false + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + ${calc.test.skip} + ${calc.it.skip} + false + random + + + + run-integration-tests + integration-test + + integration-test + verify + + + + + + + + + skipCalcTests + + + skipTests + true + + + + true + true + true + + + + skipUT_CalcTests + + + skipUTs + true + + + + true + + + + get-jar-with-dependencies + + + + org.apache.maven.plugins + maven-assembly-plugin + + + jar-with-dependencies + + + + + make-assembly + + + single + + + package + + + + + + + + \ No newline at end of file diff --git a/iotdb-core/calc_commons/src/main/codegen/config.fmpp b/iotdb-core/calc_commons/src/main/codegen/config.fmpp new file mode 100644 index 0000000000000..46b529484ab65 --- /dev/null +++ b/iotdb-core/calc_commons/src/main/codegen/config.fmpp @@ -0,0 +1,28 @@ +<#-- +* 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. +--> + +data: { + allDataTypes: tdd(../dataModel/AllDataType.tdd), + decimalDataTypes: tdd(../dataModel/DecimalDataType.tdd), + compareTypes: tdd(../dataModel/CompareType.tdd), + mathematicalOperator: tdd(../dataModel/MathematicalOperator.tdd), + mathematicalDataType: tdd(../dataModel/MathematicalDataType.tdd) +} +freemarkerLinks: { + includes: includes/ +} diff --git a/iotdb-core/calc_commons/src/main/codegen/dataModel/AllDataType.tdd b/iotdb-core/calc_commons/src/main/codegen/dataModel/AllDataType.tdd new file mode 100644 index 0000000000000..018b24956a9bc --- /dev/null +++ b/iotdb-core/calc_commons/src/main/codegen/dataModel/AllDataType.tdd @@ -0,0 +1,58 @@ +<#-- +* 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. +--> + +{ + "types": [ + { + "dataType": "boolean", + "column": "BooleanColumn", + "javaBoxName": "Boolean", + "tsDataType": "TSDataType.BOOLEAN" + } + ,{ + "dataType": "int", + "column": "IntColumn", + "javaBoxName": "Integer", + "tsDataType": "TSDataType.INT32" + } + ,{ + "dataType": "long", + "column": "LongColumn", + "javaBoxName": "Long", + "tsDataType": "TSDataType.INT64" + } + ,{ + "dataType": "float", + "column": "FloatColumn", + "javaBoxName": "Float", + "tsDataType": "TSDataType.FLOAT" + } + ,{ + "dataType": "double", + "column": "DoubleColumn", + "javaBoxName": "Double", + "tsDataType": "TSDataType.DOUBLE" + } + ,{ + "dataType": "Binary", + "column": "BinaryColumn", + "javaBoxName": "Binary", + "tsDataType": "TSDataType.TEXT" + } + ] +} diff --git a/iotdb-core/calc_commons/src/main/codegen/dataModel/CompareType.tdd b/iotdb-core/calc_commons/src/main/codegen/dataModel/CompareType.tdd new file mode 100644 index 0000000000000..00eb05280cdfd --- /dev/null +++ b/iotdb-core/calc_commons/src/main/codegen/dataModel/CompareType.tdd @@ -0,0 +1,28 @@ +<#-- +* 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. +--> + +{ + "types": [ + { + "compareType": "equal" + } + ,{ + "compareType": "variation" + } + ] +} \ No newline at end of file diff --git a/iotdb-core/calc_commons/src/main/codegen/dataModel/DecimalDataType.tdd b/iotdb-core/calc_commons/src/main/codegen/dataModel/DecimalDataType.tdd new file mode 100644 index 0000000000000..28a94a8a7f695 --- /dev/null +++ b/iotdb-core/calc_commons/src/main/codegen/dataModel/DecimalDataType.tdd @@ -0,0 +1,38 @@ +<#-- +* 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. +--> + +{ + "types": [ + { + "dataType": "int", + "column": "IntColumn" + } + ,{ + "dataType": "long", + "column": "LongColumn" + } + ,{ + "dataType": "float", + "column": "FloatColumn" + } + ,{ + "dataType": "double", + "column": "DoubleColumn" + } + ] +} diff --git a/iotdb-core/calc_commons/src/main/codegen/dataModel/MathematicalDataType.tdd b/iotdb-core/calc_commons/src/main/codegen/dataModel/MathematicalDataType.tdd new file mode 100644 index 0000000000000..f60d818c6d91f --- /dev/null +++ b/iotdb-core/calc_commons/src/main/codegen/dataModel/MathematicalDataType.tdd @@ -0,0 +1,52 @@ +<#-- +* 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. +--> + +{ + "types": [ + { + "type": "IntType", + "dataType": "int", + "instance": "INT" + }, + { + "type": "LongType", + "dataType": "long", + "instance": "LONG" + }, + { + "type": "FloatType", + "dataType": "float", + "instance": "FLOAT" + }, + { + "type": "DoubleType", + "dataType": "double", + "instance": "DOUBLE" + }, + { + "type": "DateType", + "dataType": "int", + "instance": "DATE" + }, + { + "type": "TimestampType", + "dataType": "long", + "instance": "TIMESTAMP" + } + ] +} diff --git a/iotdb-core/calc_commons/src/main/codegen/dataModel/MathematicalOperator.tdd b/iotdb-core/calc_commons/src/main/codegen/dataModel/MathematicalOperator.tdd new file mode 100644 index 0000000000000..722b32bc43e20 --- /dev/null +++ b/iotdb-core/calc_commons/src/main/codegen/dataModel/MathematicalOperator.tdd @@ -0,0 +1,52 @@ +<#-- +* 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. +--> + +{ + "binaryOperators": [ + { + "name": "Addition", + "operator": "ADD", + "symbol": "+" + }, + { + "name": "Subtraction", + "operator": "SUBTRACT", + "symbol": "-" + }, + { + "name": "Multiplication", + "operator": "MULTIPLY", + "symbol": "*" + }, + { + "name": "Division", + "operator": "DIVIDE", + "symbol": "/" + }, + { + "name": "Modulus", + "operator": "MODULUS", + "symbol": "%" + } + ], + "unaryOperators": [ + { + "operator": "NEGATION" + } + ] +} \ No newline at end of file diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl b/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl new file mode 100644 index 0000000000000..2b8f23b9d4723 --- /dev/null +++ b/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl @@ -0,0 +1,419 @@ +/* + * 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. + */ +<@pp.dropOutputFile /> +<#list mathematicalOperator.binaryOperators as operator> +<#list mathematicalDataType.types as first> +<#list mathematicalDataType.types as second> +<#--Parting line--> +<#assign className = "${first.type?replace('Type','')}${operator.name}${second.type?replace('Type','')}ColumnTransformer"> + +<#--Main Part--> +<#if (first.instance == "DATE" || first.instance == "TIMESTAMP") && (second.instance == "INT" || second.instance == "LONG")><#if operator.name == "Addition" || operator.name == "Subtraction"> +<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/${className}.java" /> +<#--Date + int || Date + long || Timestamp + int || Timestamp + long--> +<#--Date - int || Date - long || Timestamp - int || Timestamp - long--> +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; + +import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; + +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.read.common.type.Type; +import org.apache.tsfile.utils.DateUtils; + +import java.time.ZoneId; + +<#if first.instance == "DATE"> +import java.time.format.DateTimeParseException; + +import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE; + +<#if first.dataType == "int" || second.dataType == "int" || first.dataType == "long" || second.dataType == "long"> +import static org.apache.iotdb.rpc.TSStatusCode.NUMERIC_VALUE_OUT_OF_RANGE; + + +public class ${className} extends BinaryColumnTransformer { + + private static ZoneId zoneId; + + public ${className}( + Type returnType, ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { + super(returnType, leftTransformer, rightTransformer); + this.zoneId = zoneId; + } + + @Override + protected void doTransform( + Column leftColumn, Column rightColumn, ColumnBuilder builder, int positionCount) { + for (int i = 0; i < positionCount; i++) { + if (!leftColumn.isNull(i) && !rightColumn.isNull(i)) { + returnType.write${first.dataType?cap_first}( + builder, + transform( + leftTransformer.getType().get${first.dataType?cap_first}(leftColumn, i), + rightTransformer.getType().get${second.dataType?cap_first}(rightColumn, i))); + } else { + builder.appendNull(); + } + } + } + + @Override + protected void doTransform( + Column leftColumn, + Column rightColumn, + ColumnBuilder builder, + int positionCount, + boolean[] selection){ + for (int i = 0; i < positionCount; i++) { + if (!leftColumn.isNull(i) && !rightColumn.isNull(i) && selection[i]) { + returnType.write${first.dataType?cap_first}( + builder, + transform( + leftTransformer.getType().get${first.dataType?cap_first}(leftColumn, i), + rightTransformer.getType().get${second.dataType?cap_first}(rightColumn, i))); + } else { + builder.appendNull(); + } + } + } + + @Override + protected void checkType() { + // do nothing + } + + public static ${first.dataType} transform(${first.dataType} left, ${second.dataType} right) { + <#switch operator.name> + <#case "Addition"> + <#if first.instance == "DATE"> + <#--Date + int || Date + long--> + try{ + long timestamp = + Math.addExact( + DateTimeUtils.correctPrecision(DateUtils.parseIntToTimestamp(left,zoneId)), right); + return DateUtils.parseDateExpressionToInt( + DateTimeUtils.convertToLocalDate(timestamp, zoneId)); + }catch (ArithmeticException e){ + throw new IoTDBRuntimeException( + String.format("long ${operator.name} overflow: %s + %s", left, right), + NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), + true); + }catch (DateTimeParseException e) { + throw new IoTDBRuntimeException( + "Year must be between 1000 and 9999.", + DATE_OUT_OF_RANGE.getStatusCode(), + true); + } + <#else> + <#--Timestamp + int || Timestamp + long--> + try{ + return Math.addExact(left, right); + }catch (ArithmeticException e){ + throw new IoTDBRuntimeException(String.format("long ${operator.name} overflow: %s + %s", left, right),NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(),true); + } + + <#break> + <#case "Subtraction"> + <#if first.instance == "DATE"> + <#--Date - int || Date - long--> + try{ + long timestamp = + Math.subtractExact( + DateTimeUtils.correctPrecision(DateUtils.parseIntToTimestamp(left, zoneId)), right); + return DateUtils.parseDateExpressionToInt( + DateTimeUtils.convertToLocalDate(timestamp, zoneId)); + }catch (ArithmeticException e){ + throw new IoTDBRuntimeException( + String.format("long ${operator.name} overflow: %s - %s", left, right), + NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), + true); + }catch (DateTimeParseException e) { + throw new IoTDBRuntimeException( + "Year must be between 1000 and 9999.", + DATE_OUT_OF_RANGE.getStatusCode(), + true); + } + <#else> + <#--Timestamp - int || Timestamp - long--> + try{ + return Math.subtractExact(left, right); + }catch (ArithmeticException e){ + throw new IoTDBRuntimeException( + String.format("long ${operator.name} overflow: %s - %s", left, right), + NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), + true); + } + + <#break> + + } +} + +<#elseif (second.instance == "DATE" || second.instance =="TIMESTAMP") && (first.instance == "INT" || first.instance == "LONG")> + <#if operator.name == "Addition"> +<#--int + Date || long + Date || int + Timestamp || long + Timestamp--> +<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/${className}.java" /> +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; + +import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; + +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.read.common.type.Type; +import org.apache.tsfile.utils.DateUtils; + +import java.time.ZoneId; +<#if second.instance == "DATE"> +import java.time.format.DateTimeParseException; + + +<#if first.dataType == "int" || second.dataType == "int" || first.dataType == "long" || second.dataType == "long"> +<#if second.instance == "DATE"> +import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE; + +import static org.apache.iotdb.rpc.TSStatusCode.NUMERIC_VALUE_OUT_OF_RANGE; + + +public class ${className} extends BinaryColumnTransformer { + + private static ZoneId zoneId; + + public ${className}( + Type returnType, ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { + super(returnType, leftTransformer, rightTransformer); + this.zoneId = zoneId; + } + + @Override + protected void doTransform( + Column leftColumn, Column rightColumn, ColumnBuilder builder, int positionCount) { + for (int i = 0; i < positionCount; i++) { + if (!leftColumn.isNull(i) && !rightColumn.isNull(i)) { + returnType.write${second.dataType?cap_first}( + builder, + transform( + leftTransformer.getType().get${first.dataType?cap_first}(leftColumn, i), + rightTransformer.getType().get${second.dataType?cap_first}(rightColumn, i))); + } else { + builder.appendNull(); + } + } + } + + @Override + protected void doTransform( + Column leftColumn, + Column rightColumn, + ColumnBuilder builder, + int positionCount, + boolean[] selection){ + for (int i = 0; i < positionCount; i++) { + if (!leftColumn.isNull(i) && !rightColumn.isNull(i) && selection[i]) { + returnType.write${second.dataType?cap_first}( + builder, + transform( + leftTransformer.getType().get${first.dataType?cap_first}(leftColumn, i), + rightTransformer.getType().get${second.dataType?cap_first}(rightColumn, i))); + } else { + builder.appendNull(); + } + } + } + + @Override + protected void checkType() { + // do nothing + } + + public static ${second.dataType} transform(${first.dataType} left, ${second.dataType} right) { + <#if second.instance == "DATE"> + try{ + long timestamp = Math.addExact(left,DateTimeUtils.correctPrecision(DateUtils.parseIntToTimestamp(right, zoneId))); + return DateUtils.parseDateExpressionToInt(DateTimeUtils.convertToLocalDate(timestamp, zoneId)); + }catch (ArithmeticException e){ + throw new IoTDBRuntimeException( + String.format("long ${operator.name} overflow: %s + %s", left, right), + NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), + true); + }catch (DateTimeParseException e) { + throw new IoTDBRuntimeException( + "Year must be between 1000 and 9999.", + DATE_OUT_OF_RANGE.getStatusCode(), + true); + } + <#else> + try{ + return Math.addExact(left, right); + }catch (ArithmeticException e){ + throw new IoTDBRuntimeException( + String.format("long ${operator.name} overflow: %s + %s", left, right), + NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), + true); + } + + } +} + +<#elseif first.instance != "DATE" && first.instance != "TIMESTAMP" && second.instance != "DATE" && second.instance != "TIMESTAMP"> +<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/${className}.java" /> +<#--int、long、float、double with + - * / %--> +<#--assign resultType--> +<#if first.dataType == "double" || second.dataType == "double"> + <#assign resultType = "double" /> +<#elseif first.dataType == "float" || second.dataType == "float"> + <#assign resultType = "float" /> +<#elseif first.dataType == "long" || second.dataType == "long"> + <#assign resultType = "long" /> +<#else> + <#assign resultType = "int" /> + +<#--Parting line--> +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; + +import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; + +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.read.common.type.Type; + +<#if operator.name == "Division" || operator.name == "Modulus"> +import static org.apache.iotdb.rpc.TSStatusCode.DIVISION_BY_ZERO; + +<#if first.dataType == "int" || second.dataType == "int" || first.dataType == "long" || second.dataType == "long"> +import static org.apache.iotdb.rpc.TSStatusCode.NUMERIC_VALUE_OUT_OF_RANGE; + + +public class ${className} extends BinaryColumnTransformer { + public ${className}( + Type returnType, ColumnTransformer leftTransformer, ColumnTransformer rightTransformer) { + super(returnType, leftTransformer, rightTransformer); + } + + @Override + protected void doTransform( + Column leftColumn, Column rightColumn, ColumnBuilder builder, int positionCount) { + for (int i = 0; i < positionCount; i++) { + if (!leftColumn.isNull(i) && !rightColumn.isNull(i)) { + returnType.write${resultType?cap_first}( + builder, + transform( + leftTransformer.getType().get${first.dataType?cap_first}(leftColumn, i), + rightTransformer.getType().get${second.dataType?cap_first}(rightColumn, i))); + } else { + builder.appendNull(); + } + } + } + + @Override + protected void doTransform( + Column leftColumn, + Column rightColumn, + ColumnBuilder builder, + int positionCount, + boolean[] selection){ + for (int i = 0; i < positionCount; i++) { + if (!leftColumn.isNull(i) && !rightColumn.isNull(i) && selection[i]) { + returnType.write${resultType?cap_first}( + builder, + transform( + leftTransformer.getType().get${first.dataType?cap_first}(leftColumn, i), + rightTransformer.getType().get${second.dataType?cap_first}(rightColumn, i))); + } else { + builder.appendNull(); + } + } + } + + @Override + protected void checkType() { + // do nothing + } + + public static ${resultType} transform(${first.dataType} left, ${second.dataType} right) { + <#if (first.dataType == "int" || first.dataType == "long") && (second.dataType == "int" || second.dataType =="long")> + <#switch operator.name> + <#case "Addition"> + try{ + return Math.addExact(left, right); + }catch (ArithmeticException e){ + throw new IoTDBRuntimeException( + String.format("${resultType} ${operator.name} overflow: %s + %s", left, right), + NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), + false); + } + <#break> + <#case "Subtraction"> + try{ + return Math.subtractExact(left, right); + }catch (ArithmeticException e){ + throw new IoTDBRuntimeException( + String.format("${resultType} ${operator.name} overflow: %s - %s", left, right), + NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), + false); + } + <#break> + <#case "Multiplication"> + try{ + return Math.multiplyExact(left, right); + }catch (ArithmeticException e){ + throw new IoTDBRuntimeException( + String.format("${resultType} ${operator.name} overflow: %s * %s", left, right), + NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), + true); + } + <#break> + <#case "Division"> + try{ + if (left == <#if first.dataType == "int">Integer.MIN_VALUE<#elseif first.dataType == "long">Long.MIN_VALUE && right == -1) { + throw new IoTDBRuntimeException( + String.format("${resultType} overflow: %s / %s", left, right), + NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), + true); + } + return left / right; + }catch (ArithmeticException e){ + throw new IoTDBRuntimeException("Division by zero",DIVISION_BY_ZERO.getStatusCode(),true); + } + <#break> + <#case "Modulus"> + try{ + return left % right; + }catch (ArithmeticException e){ + throw new IoTDBRuntimeException("Division by zero",DIVISION_BY_ZERO.getStatusCode(),true); + } + <#break> + + <#else> + return left ${operator.symbol} right; + + } +} + +<#--Parting line--> + + + \ No newline at end of file diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl b/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl new file mode 100644 index 0000000000000..d6ff9c9fdbdf2 --- /dev/null +++ b/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl @@ -0,0 +1,230 @@ +/* + * 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. + */ + +<@pp.dropOutputFile /> +<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticColumnTransformerApi.java" /> +package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; + +import org.apache.tsfile.read.common.type.Type; + +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.AdditionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.DivisionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.ModulusResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.DoubleNegationColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.FloatNegationColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.IntNegationColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LongNegationColumnTransformer; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.TimestampNegationColumnTransformer; + +import java.time.ZoneId; +import java.util.Arrays; +import java.util.List; + +public class ArithmeticColumnTransformerApi { + <#list mathematicalOperator.binaryOperators as operator> + + public static ColumnTransformer get${operator.name}Transformer( + ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { + switch (leftTransformer.getType().getTypeEnum()) { + case INT32: + return getInt${operator.name}Transformer(leftTransformer, rightTransformer, zoneId); + case INT64: + return getLong${operator.name}Transformer(leftTransformer, rightTransformer, zoneId); + case FLOAT: + return getFloat${operator.name}Transformer(leftTransformer, rightTransformer, zoneId); + case DOUBLE: + return getDouble${operator.name}Transformer(leftTransformer, rightTransformer, zoneId); + <#if operator.name == "Addition" || operator.name == "Subtraction"> + case DATE: + return getDate${operator.name}Transformer(leftTransformer, rightTransformer, zoneId); + case TIMESTAMP: + return getTimestamp${operator.name}Transformer(leftTransformer, rightTransformer, zoneId); + + default: + throw new UnsupportedOperationException("Unsupported Type"); + } + } + + + public static ColumnTransformer getNegationTransformer(ColumnTransformer columnTransformer) { + switch (columnTransformer.getType().getTypeEnum()) { + case INT32: + return new IntNegationColumnTransformer( + columnTransformer.getType(), columnTransformer); + case INT64: + return new LongNegationColumnTransformer( + columnTransformer.getType(), columnTransformer); + case FLOAT: + return new FloatNegationColumnTransformer( + columnTransformer.getType(), columnTransformer); + case DOUBLE: + return new DoubleNegationColumnTransformer( + columnTransformer.getType(), columnTransformer); + case TIMESTAMP: + return new TimestampNegationColumnTransformer( + columnTransformer.getType(), columnTransformer); + default: + throw new UnsupportedOperationException("Unsupported Type"); + } + } + <#-- Parting line --> + <#list mathematicalOperator.binaryOperators as operator> + <#list mathematicalDataType.types as first> + <#assign firstType = first.type?replace("Type","")> + <#-- The getTransformer method without Date and Timesatmp --> + <#if firstType != "Date" && firstType != "Timestamp"> + + private static ColumnTransformer get${firstType}${operator.name}Transformer( + ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { + List argumentTypes = + Arrays.asList(leftTransformer.getType(), rightTransformer.getType()); + switch (rightTransformer.getType().getTypeEnum()) { + case INT32: + return new ${firstType}${operator.name}IntColumnTransformer( + ${operator.name}Resolver.checkConditions(argumentTypes).get(), + leftTransformer, + rightTransformer); + case INT64: + return new ${firstType}${operator.name}LongColumnTransformer( + ${operator.name}Resolver.checkConditions(argumentTypes).get(), + leftTransformer, + rightTransformer); + case FLOAT: + return new ${firstType}${operator.name}FloatColumnTransformer( + ${operator.name}Resolver.checkConditions(argumentTypes).get(), + leftTransformer, + rightTransformer); + case DOUBLE: + return new ${firstType}${operator.name}DoubleColumnTransformer( + ${operator.name}Resolver.checkConditions(argumentTypes).get(), + leftTransformer, + rightTransformer); + <#if operator.name == "Addition" && (firstType == "Int" || firstType == "Long")> + case DATE: + return new ${firstType}${operator.name}DateColumnTransformer( + ${operator.name}Resolver.checkConditions(argumentTypes).get(), + leftTransformer, + rightTransformer, + zoneId); + case TIMESTAMP: + return new ${firstType}${operator.name}TimestampColumnTransformer( + ${operator.name}Resolver.checkConditions(argumentTypes).get(), + leftTransformer, + rightTransformer, + zoneId); + + default: + throw new UnsupportedOperationException("Unsupported Type"); + } + } + + + + + private static ColumnTransformer getDateAdditionTransformer( + ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { + List argumentTypes = + Arrays.asList(leftTransformer.getType(), rightTransformer.getType()); + switch (rightTransformer.getType().getTypeEnum()) { + case INT32: + return new DateAdditionIntColumnTransformer( + AdditionResolver.checkConditions(argumentTypes).get(), + leftTransformer, + rightTransformer, + zoneId); + case INT64: + return new DateAdditionLongColumnTransformer( + AdditionResolver.checkConditions(argumentTypes).get(), + leftTransformer, + rightTransformer, + zoneId); + default: + throw new UnsupportedOperationException("Unsupported Type"); + } + } + + private static ColumnTransformer getTimestampAdditionTransformer( + ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { + List argumentTypes = + Arrays.asList(leftTransformer.getType(), rightTransformer.getType()); + switch (rightTransformer.getType().getTypeEnum()) { + case INT32: + return new TimestampAdditionIntColumnTransformer( + AdditionResolver.checkConditions(argumentTypes).get(), + leftTransformer, + rightTransformer, + zoneId); + case INT64: + return new TimestampAdditionLongColumnTransformer( + AdditionResolver.checkConditions(argumentTypes).get(), + leftTransformer, + rightTransformer, + zoneId); + default: + throw new UnsupportedOperationException("Unsupported Type"); + } + } + + private static ColumnTransformer getDateSubtractionTransformer( + ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { + List argumentTypes = + Arrays.asList(leftTransformer.getType(), rightTransformer.getType()); + switch (rightTransformer.getType().getTypeEnum()) { + case INT32: + return new DateSubtractionIntColumnTransformer( + AdditionResolver.checkConditions(argumentTypes).get(), + leftTransformer, + rightTransformer, + zoneId); + case INT64: + return new DateSubtractionLongColumnTransformer( + AdditionResolver.checkConditions(argumentTypes).get(), + leftTransformer, + rightTransformer, + zoneId); + default: + throw new UnsupportedOperationException("Unsupported Type"); + } + } + + private static ColumnTransformer getTimestampSubtractionTransformer( + ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { + List argumentTypes = + Arrays.asList(leftTransformer.getType(), rightTransformer.getType()); + switch (rightTransformer.getType().getTypeEnum()) { + case INT32: + return new TimestampSubtractionIntColumnTransformer( + AdditionResolver.checkConditions(argumentTypes).get(), + leftTransformer, + rightTransformer, + zoneId); + case INT64: + return new TimestampSubtractionLongColumnTransformer( + AdditionResolver.checkConditions(argumentTypes).get(), + leftTransformer, + rightTransformer, + zoneId); + default: + throw new UnsupportedOperationException("Unsupported Type"); + } + } +} diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl b/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl new file mode 100644 index 0000000000000..3080829c754a2 --- /dev/null +++ b/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl @@ -0,0 +1,85 @@ +/* + * 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. + */ + +<@pp.dropOutputFile /> +<#list mathematicalDataType.types as type> + <#assign newType = type.type?replace("Type","")> + <#assign className = "${newType}NegationColumnTransformer"> +<#if newType != "Date"> + <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/${className}.java" /> +package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; + +import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; + +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.read.common.type.Type; + +import static org.apache.iotdb.rpc.TSStatusCode.NUMERIC_VALUE_OUT_OF_RANGE; + +public class ${className} extends UnaryColumnTransformer { + + public ${className}( + Type returnType, ColumnTransformer childColumnTransformer) { + super(returnType, childColumnTransformer); + } + + @Override + protected void doTransform( + Column column, ColumnBuilder columnBuilder) { + for (int i = 0, n = column.getPositionCount(); i < n; i++) { + if (!column.isNull(i)) { + returnType.write${type.dataType?cap_first}( + columnBuilder, transform(childColumnTransformer.getType().get${type.dataType?cap_first}(column, i))); + } else { + columnBuilder.appendNull(); + } + } + } + + @Override + protected void doTransform( + Column column, ColumnBuilder columnBuilder, boolean[] selection) { + for (int i = 0, n = column.getPositionCount(); i < n; i++) { + if (selection[i] && !column.isNull(i)) { + returnType.write${type.dataType?cap_first}( + columnBuilder, transform(childColumnTransformer.getType().get${type.dataType?cap_first}(column, i))); + } else { + columnBuilder.appendNull(); + } + } + } + + @Override + protected void checkType() { + // do nothing + } + + public static ${type.dataType} transform(${type.dataType} value){ + <#if type.dataType == "int" || type.dataType == "long"> + if(value == <#if type.dataType == "int">Integer<#else>Long.MIN_VALUE){ + throw new IoTDBRuntimeException(String.format("The %s is out of range of ${type.dataType}.", value), NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), true); + } + + return -value; + } +} + + diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/ModeAccumulator.ftl b/iotdb-core/calc_commons/src/main/codegen/templates/ModeAccumulator.ftl new file mode 100644 index 0000000000000..7a3f154f002fb --- /dev/null +++ b/iotdb-core/calc_commons/src/main/codegen/templates/ModeAccumulator.ftl @@ -0,0 +1,203 @@ +/* + * 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. + */ +<@pp.dropOutputFile /> + +<#list allDataTypes.types as type> + + <#assign className = "${type.dataType?cap_first}ModeAccumulator"> + <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/aggregation/${className}.java" /> + +package org.apache.iotdb.db.calc_commons.execution.aggregation; + +import com.google.common.collect.ImmutableList; +import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.tsfile.external.commons.collections4.comparators.ComparatorChain; +import org.apache.tsfile.enums.TSDataType; +import org.apache.tsfile.file.metadata.statistics.Statistics; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.block.column.ColumnBuilder; +import org.apache.tsfile.utils.Binary; +import org.apache.tsfile.utils.BitMap; +import org.apache.tsfile.utils.Pair; +import org.apache.tsfile.utils.ReadWriteIOUtils; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import static com.google.common.base.Preconditions.checkArgument; + +/* +* This class is generated using freemarker and the ${.template_name} template. +*/ +@SuppressWarnings("unused") +public class ${className} implements Accumulator { + // pair left records count of element, pair right records min time of element + private final Map<${type.javaBoxName}, Pair> countMap = new HashMap<>(); + + <#if type.dataType != "boolean"> + private final int MAP_SIZE_THRESHOLD = CommonDescriptor.getInstance().getConfig().getModeMapSizeThreshold(); + + + @Override + public void addInput(Column[] column, BitMap bitMap) { + int count = column[0].getPositionCount(); + for (int i = 0; i < count; i++) { + if (bitMap != null && !bitMap.isMarked(i)) { + continue; + } + if (!column[1].isNull(i)) { + final long time = column[0].getLong(i); + countMap.compute( + column[1].get${type.dataType?cap_first}(i), + (k, v) -> + v == null ? new Pair<>(1L, time) : new Pair<>(v.left + 1, Math.min(v.right, time))); + <#if type.dataType != "boolean"> + + if (countMap.size() > MAP_SIZE_THRESHOLD) { + throw new RuntimeException( + String.format( + "distinct values has exceeded the threshold %s when calculate Mode", + MAP_SIZE_THRESHOLD)); + } + + } + } + } + + @Override + public void addIntermediate(Column[] partialResult) { + checkArgument(partialResult.length == 1, "partialResult of Mode should be 1"); + checkArgument(!partialResult[0].isNull(0), "partialResult of Mode should not be null"); + deserializeAndMergeCountMap(partialResult[0].getBinary(0)); + } + + @Override + public void addStatistics(Statistics statistics) { + throw new UnsupportedOperationException(getClass().getName()); + } + + @Override + public void setFinal(Column finalResult) { + if (finalResult.isNull(0)) { + return; + } + + // Step of ModeAccumulator is STATIC, + // countMap only need to record one entry which key is finalResult + countMap.put(finalResult.get${type.dataType?cap_first}(0), new Pair<>(0L, Long.MIN_VALUE)); + } + + @Override + public void outputIntermediate(ColumnBuilder[] tsBlockBuilder) { + tsBlockBuilder[0].writeBinary(serializeCountMap()); + } + + @Override + public void outputFinal(ColumnBuilder tsBlockBuilder) { + if (countMap.isEmpty()) { + tsBlockBuilder.appendNull(); + } else { + tsBlockBuilder.write${type.dataType?cap_first}( + Collections.max( + countMap.entrySet(), + Map.Entry.comparingByValue( + new ComparatorChain<>( + ImmutableList.of( + (v1, v2) -> v1.left.compareTo(v2.left), + (v1, v2) -> v2.right.compareTo(v1.right))))) + .getKey()); + } + } + + @Override + public void reset() { + countMap.clear(); + } + + @Override + public boolean hasFinalResult() { + return false; + } + + @Override + public TSDataType[] getIntermediateType() { + return new TSDataType[] {TSDataType.TEXT}; + } + + @Override + public TSDataType getFinalType() { + return ${type.tsDataType}; + } + + private Binary serializeCountMap() { + ByteArrayOutputStream stream = new ByteArrayOutputStream(); + try { + ReadWriteIOUtils.write(countMap.size(), stream); + for (Map.Entry<${type.javaBoxName}, Pair> entry : countMap.entrySet()) { + ReadWriteIOUtils.write(entry.getKey(), stream); + ReadWriteIOUtils.write(entry.getValue().left, stream); + ReadWriteIOUtils.write(entry.getValue().right, stream); + } + } catch (IOException e) { + // Totally memory operation. This case won't happen. + } + return new Binary(stream.toByteArray()); + } + + private void deserializeAndMergeCountMap(Binary partialResult) { + InputStream stream = new ByteArrayInputStream(partialResult.getValues()); + try { + int size = ReadWriteIOUtils.readInt(stream); + for (int i = 0; i < size; i++) { + countMap.compute( + ReadWriteIOUtils.read${type.dataType?cap_first}(stream), + (k, v) -> { + try { + return v == null + ? new Pair<>( + ReadWriteIOUtils.readLong(stream), ReadWriteIOUtils.readLong(stream)) + : new Pair<>( + v.left + ReadWriteIOUtils.readLong(stream), + Math.min(v.right, ReadWriteIOUtils.readLong(stream))); + } catch (IOException e) { + throw new RuntimeException(e); + } + }); + <#if type.dataType != "boolean"> + + if (countMap.size() > MAP_SIZE_THRESHOLD) { + throw new RuntimeException( + String.format( + "distinct values has exceeded the threshold %s when calculate Mode", + MAP_SIZE_THRESHOLD)); + } + + } + } catch (IOException e) { + // Totally memory operation. This case won't happen. + } + } +} + + \ No newline at end of file diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/constantFill.ftl b/iotdb-core/calc_commons/src/main/codegen/templates/constantFill.ftl new file mode 100644 index 0000000000000..d4cb860c34115 --- /dev/null +++ b/iotdb-core/calc_commons/src/main/codegen/templates/constantFill.ftl @@ -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. +*/ +<@pp.dropOutputFile /> + +<#list allDataTypes.types as type> + + <#assign className = "${type.dataType?cap_first}ConstantFill"> + <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/constant/${className}.java" /> +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant; + +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.tsfile.read.common.block.column.${type.column}; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; +<#if type.dataType == "Binary"> +import org.apache.tsfile.utils.Binary; + + +import java.util.Optional; + +/* +* This class is generated using freemarker and the ${.template_name} template. +*/ +@SuppressWarnings("unused") +public class ${className} implements IFill { + + // fill value + private final ${type.dataType} value; + // used for constructing RunLengthEncodedColumn, size of it must be 1 + private final ${type.dataType}[] valueArray; + + public ${className}(${type.dataType} value) { + this.value = value; + this.valueArray = new ${type.dataType}[] {value}; + } + + @Override + public Column fill(Column timeColumn, Column valueColumn) { + int size = valueColumn.getPositionCount(); + // if this valueColumn doesn't have any null value, or it's empty, just return itself; + if (!valueColumn.mayHaveNull() || size == 0) { + return valueColumn; + } + // if its values are all null + if (valueColumn instanceof RunLengthEncodedColumn) { + return new RunLengthEncodedColumn(new ${type.column}(1, Optional.empty(), valueArray), size); + } else { + ${type.dataType}[] array = new ${type.dataType}[size]; + for (int i = 0; i < size; i++) { + if (valueColumn.isNull(i)) { + array[i] = value; + } else { + array[i] = valueColumn.get${type.dataType?cap_first}(i); + } + } + return new ${type.column}(size, Optional.empty(), array); + } + } + + @Override + public void reset() { + // do nothing + } +} + + diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/linearFill.ftl b/iotdb-core/calc_commons/src/main/codegen/templates/linearFill.ftl new file mode 100644 index 0000000000000..acc3d72f270f0 --- /dev/null +++ b/iotdb-core/calc_commons/src/main/codegen/templates/linearFill.ftl @@ -0,0 +1,122 @@ +/* +* 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. +*/ +<@pp.dropOutputFile /> + +<#list decimalDataTypes.types as type> + + <#assign className = "${type.dataType?cap_first}LinearFill"> + <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/linear/${className}.java" /> +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear; + +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.read.common.block.column.${type.column}; +import org.apache.tsfile.read.common.block.column.${type.column}Builder; + + +import java.util.Optional; + +/* +* This class is generated using freemarker and the ${.template_name} template. +*/ +@SuppressWarnings("unused") +public class ${className} extends LinearFill { + + // previous value + private ${type.dataType} previousValue; + // next non-null value whose time is closest to the current TsBlock's endTime + private ${type.dataType} nextValue; + + private ${type.dataType} nextValueInCurrentColumn; + + @Override + void fillValue(Column column, int index, Object array) { + ((${type.dataType}[]) array)[index] = column.get${type.dataType?cap_first}(index); + } + + @Override + void fillValue(Object array, int index, double factor) { + ((${type.dataType}[]) array)[index] = getFilledValue(factor); + } + + @Override + Object createValueArray(int size) { + return new ${type.dataType}[size]; + } + + @Override + Column createNullValueColumn() { + return ${type.column}Builder.NULL_VALUE_BLOCK; + } + + @Override + Column createFilledValueColumn(double[] factors, Optional valueIsNull) { + int size = factors.length; + ${type.dataType}[] filledValue = new ${type.dataType}[size]; + + if (valueIsNull.isPresent()) { + // has null value + boolean[] isNull = valueIsNull.get(); + for (int i = 0; i < size; i++) { + if (!isNull[i]) { + filledValue[i] = getFilledValue(factors[i]); + } + } + } else { + for (int i = 0; i < size; i++) { + filledValue[i] = getFilledValue(factors[i]); + } + } + return new ${type.column}(size, valueIsNull, filledValue); + } + + @Override + Column createFilledValueColumn(Object array, boolean[] isNull, boolean hasNullValue, int size) { + if (hasNullValue) { + return new ${type.column}(size, Optional.of(isNull), (${type.dataType}[]) array); + } else { + return new ${type.column}(size, Optional.empty(), (${type.dataType}[]) array); + } + } + + @Override + void updatePreviousValue(Column column, int index) { + previousValue = column.get${type.dataType?cap_first}(index); + } + + @Override + void updateNextValue(Column nextValueColumn, int index) { + this.nextValue = nextValueColumn.get${type.dataType?cap_first}(index); + } + + @Override + void updateNextValueInCurrentColumn(Column nextValueColumn, int index) { + this.nextValueInCurrentColumn = nextValueColumn.get${type.dataType?cap_first}(index); + } + + @Override + void updateNextValueInCurrentColumn() { + this.nextValueInCurrentColumn = this.nextValue; + } + + private ${type.dataType} getFilledValue(double factor) { + return (${type.dataType}) (previousValue + (nextValueInCurrentColumn - previousValue) * factor); + } +} + + diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/previousFill.ftl b/iotdb-core/calc_commons/src/main/codegen/templates/previousFill.ftl new file mode 100644 index 0000000000000..41c5227447a0d --- /dev/null +++ b/iotdb-core/calc_commons/src/main/codegen/templates/previousFill.ftl @@ -0,0 +1,109 @@ +/* +* 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. +*/ +<@pp.dropOutputFile /> + +<#list allDataTypes.types as type> + + <#assign className = "${type.dataType?cap_first}PreviousFill"> + <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/previous/${className}.java" /> +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous; + +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.read.common.block.column.${type.column}; +import org.apache.tsfile.read.common.block.column.${type.column}Builder; +import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; +<#if type.dataType == "Binary"> + import org.apache.tsfile.utils.Binary; + + +import java.util.Optional; + +/* +* This class is generated using freemarker and the ${.template_name} template. +*/ +@SuppressWarnings("unused") +// PreviousFill without time duration parameter +public class ${className} implements IFill { + + // previous value + private ${type.dataType} value; + // previous time + private long previousTime; + // whether previous value is null + private boolean previousIsNull = true; + + @Override + public Column fill(Column timeColumn, Column valueColumn) { + int size = valueColumn.getPositionCount(); + // if this valueColumn is empty, just return itself; + if (size == 0) { + return valueColumn; + } + // if this valueColumn doesn't have any null value, record the last value, and then return + // itself. + if (!valueColumn.mayHaveNull()) { + previousIsNull = false; + // update the value using last non-null value + previousTime = timeColumn.getLong(size - 1); + value = valueColumn.get${type.dataType?cap_first}(size - 1); + return valueColumn; + } + // if its values are all null + if (valueColumn instanceof RunLengthEncodedColumn) { + if (previousIsNull) { + return new RunLengthEncodedColumn(${type.column}Builder.NULL_VALUE_BLOCK, size); + } else { + return new RunLengthEncodedColumn( + new ${type.column}(1, Optional.empty(), new ${type.dataType}[] {value}), size); + } + } + + ${type.dataType}[] array = new ${type.dataType}[size]; + boolean[] isNull = new boolean[size]; + // have null value + boolean hasNullValue = false; + for (int i = 0; i < size; i++) { + if (valueColumn.isNull(i)) { + if (previousIsNull) { + isNull[i] = true; + hasNullValue = true; + } else { + array[i] = value; + } + } else { + array[i] = valueColumn.get${type.dataType?cap_first}(i); + previousTime = timeColumn.getLong(i); + value = array[i]; + previousIsNull = false; + } + } + if (hasNullValue) { + return new ${type.column}(size, Optional.of(isNull), array); + } else { + return new ${type.column}(size, Optional.empty(), array); + } + } + + @Override + public void reset() { + previousIsNull = true; + } +} + diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl b/iotdb-core/calc_commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl new file mode 100644 index 0000000000000..4a740be669ac4 --- /dev/null +++ b/iotdb-core/calc_commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl @@ -0,0 +1,130 @@ +/* +* 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. +*/ +<@pp.dropOutputFile /> + +<#list allDataTypes.types as type> + + <#assign className = "${type.dataType?cap_first}PreviousFillWithTimeDuration"> + <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/previous/${className}.java" /> +package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous; + +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFillFilter; +import org.apache.tsfile.block.column.Column; +import org.apache.tsfile.read.common.block.column.${type.column}; +import org.apache.tsfile.read.common.block.column.${type.column}Builder; +import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; +<#if type.dataType == "Binary"> + import org.apache.tsfile.utils.Binary; + + +import java.util.Optional; + +/* +* This class is generated using freemarker and the ${.template_name} template. +*/ +@SuppressWarnings("unused") +// PreviousFill without time duration parameter +public class ${className} implements IFill { + + // previous value + private ${type.dataType} value; + // previous time + private long previousTime; + // whether previous value is null + private boolean previousIsNull = true; + + private final IFillFilter filter; + + public ${className}(IFillFilter filter) { + this.filter = filter; + } + + @Override + public Column fill(Column timeColumn, Column valueColumn) { + int size = valueColumn.getPositionCount(); + // if this valueColumn is empty, just return itself; + if (size == 0) { + return valueColumn; + } + // if this valueColumn doesn't have any null value, record the last value, and then return itself. + if (!valueColumn.mayHaveNull()) { + if (!timeColumn.mayHaveNull()) { + previousIsNull = false; + // update the value using last non-null value + previousTime = timeColumn.getLong(size - 1); + value = valueColumn.get${type.dataType?cap_first}(size - 1); + } else { + // find the row that last helper column is not null + for (int i = size - 1; i >= 0; i--) { + if (!timeColumn.isNull(i)) { + previousIsNull = false; + // update the value using last non-null value + previousTime = timeColumn.getLong(size - 1); + value = valueColumn.get${type.dataType?cap_first}(size - 1); + break; + } + } + } + return valueColumn; + } + // if its values are all null + if (valueColumn instanceof RunLengthEncodedColumn) { + if (previousIsNull) { + return new RunLengthEncodedColumn(${type.column}Builder.NULL_VALUE_BLOCK, size); + } else if (!timeColumn.mayHaveNull() && filter.needFill(timeColumn.getLong(size - 1), previousTime)) { + return new RunLengthEncodedColumn(new ${type.column}(1, Optional.empty(), new ${type.dataType}[] {value}), size); + } + } + + ${type.dataType}[] array = new ${type.dataType}[size]; + boolean[] isNull = new boolean[size]; + // have null value + boolean hasNullValue = false; + for (int i = 0; i < size; i++) { + boolean helperColumnIsNull = timeColumn.isNull(i); + if (valueColumn.isNull(i)) { + if (previousIsNull || helperColumnIsNull || !filter.needFill(timeColumn.getLong(i), previousTime)) { + isNull[i] = true; + hasNullValue = true; + } else { + array[i] = value; + } + } else { + array[i] = valueColumn.get${type.dataType?cap_first}(i); + if (!helperColumnIsNull) { + previousTime = timeColumn.getLong(i); + value = array[i]; + previousIsNull = false; + } + } + } + if (hasNullValue) { + return new ${type.column}(size, Optional.of(isNull), array); + } else { + return new ${type.column}(size, Optional.empty(), array); + } + } + + @Override + public void reset() { + previousIsNull = true; + } +} + diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/exception/MemoryNotEnoughException.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/exception/MemoryNotEnoughException.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/exception/MemoryNotEnoughException.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/exception/MemoryNotEnoughException.java index c873ffd9955d9..c7ec19d1df38a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/exception/MemoryNotEnoughException.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/exception/MemoryNotEnoughException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.exception; +package org.apache.iotdb.calc_commons.exception; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/aggregation/Accumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/Accumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/aggregation/Accumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/Accumulator.java index 4f6ab0909f96a..40557d36cac43 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/aggregation/Accumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/Accumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.aggregation; +package org.apache.iotdb.calc_commons.execution.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/aggregation/VarianceAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/VarianceAccumulator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/aggregation/VarianceAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/VarianceAccumulator.java index 9057e61254eda..027bf64ae999b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/aggregation/VarianceAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/VarianceAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.aggregation; +package org.apache.iotdb.calc_commons.execution.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/AbstractOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/AbstractOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/AbstractOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/AbstractOperator.java index aa722dd84ec41..76788f44f7706 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/AbstractOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/AbstractOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator; +package org.apache.iotdb.calc_commons.execution.operator; import org.apache.tsfile.common.conf.TSFileDescriptor; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorContext.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/CommonOperatorContext.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorContext.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/CommonOperatorContext.java index d20edfe413716..d2c01e3833d85 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/CommonOperatorContext.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/CommonOperatorContext.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator; +package org.apache.iotdb.calc_commons.execution.operator; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import io.airlift.units.Duration; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNBuilder.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNBuilder.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNBuilder.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNBuilder.java index ae0989f93de05..38dc7e1f4d5fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNBuilder.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator; +package org.apache.iotdb.calc_commons.execution.operator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java index 4c0f6f1acf2ca..f0cb42baf0b91 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator; +package org.apache.iotdb.calc_commons.execution.operator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; -import org.apache.iotdb.db.calc_commons.utils.HeapTraversal; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; +import org.apache.iotdb.calc_commons.utils.HeapTraversal; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java index 0296a406c5520..24f294439e5de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator; +package org.apache.iotdb.calc_commons.execution.operator; import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableList; @@ -35,7 +35,7 @@ import java.util.Iterator; import java.util.List; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class GroupedTopNRowNumberBuilder implements GroupedTopNBuilder { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/IdRegistry.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/IdRegistry.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/IdRegistry.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/IdRegistry.java index 2dec051a9acf2..c1cee59b8a4a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/IdRegistry.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/IdRegistry.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator; +package org.apache.iotdb.calc_commons.execution.operator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntArrayFIFOQueue; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntArrayFIFOQueue; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/Operator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/Operator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/Operator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/Operator.java index 55d1c130d20cc..5fbff1dfbab55 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/Operator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/Operator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator; +package org.apache.iotdb.calc_commons.execution.operator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowIdComparisonStrategy.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdComparisonStrategy.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowIdComparisonStrategy.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdComparisonStrategy.java index 7b4288dbc0697..5167422c4b9bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowIdComparisonStrategy.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdComparisonStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator; +package org.apache.iotdb.calc_commons.execution.operator; public interface RowIdComparisonStrategy { int compare(long leftRowId, long rightRowId); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowIdHashStrategy.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdHashStrategy.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowIdHashStrategy.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdHashStrategy.java index 43382d293aed9..fb7023bcf27ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowIdHashStrategy.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdHashStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator; +package org.apache.iotdb.calc_commons.execution.operator; /** Hash strategy that evaluates over row IDs */ public interface RowIdHashStrategy { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowReference.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReference.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowReference.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReference.java index 4522932cb983b..e45349793d367 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowReference.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReference.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator; +package org.apache.iotdb.calc_commons.execution.operator; /** * Reference to a row. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowReferenceTsBlockManager.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReferenceTsBlockManager.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowReferenceTsBlockManager.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReferenceTsBlockManager.java index c17725a9a5070..f62f438a1ceef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/RowReferenceTsBlockManager.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReferenceTsBlockManager.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator; +package org.apache.iotdb.calc_commons.execution.operator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java index 55b9d5cfbc38f..e65f632163bae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator; +package org.apache.iotdb.calc_commons.execution.operator; import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/TsBlockWithPositionComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/TsBlockWithPositionComparator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/TsBlockWithPositionComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/TsBlockWithPositionComparator.java index 4d482688d6558..8fab4fb2fe6fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/TsBlockWithPositionComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/TsBlockWithPositionComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator; +package org.apache.iotdb.calc_commons.execution.operator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java index 3aec037d012df..61e12c65ec9bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractFillOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractFillOperator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractFillOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractFillOperator.java index 999e845151c45..61e40e35834c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractFillOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractFillOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractLinearFillOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractLinearFillOperator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractLinearFillOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractLinearFillOperator.java index d52ea2ee7b8ac..a3cbd5e7c6041 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractLinearFillOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractLinearFillOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractSortOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractSortOperator.java index 7364b519284d2..381f72c8f5e46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AbstractSortOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractSortOperator.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortHeap; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.calc_commons.utils.sort.DiskSpiller; -import org.apache.iotdb.db.calc_commons.utils.sort.MemoryReader; -import org.apache.iotdb.db.calc_commons.utils.sort.SortBufferManager; -import org.apache.iotdb.db.calc_commons.utils.sort.SortReader; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.utils.sort.DiskSpiller; +import org.apache.iotdb.calc_commons.utils.sort.MemoryReader; +import org.apache.iotdb.calc_commons.utils.sort.SortBufferManager; +import org.apache.iotdb.calc_commons.utils.sort.SortReader; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AggregationMergeSortOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AggregationMergeSortOperator.java index b58da44cd339d..a26623782fcfe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AggregationMergeSortOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AggregationMergeSortOperator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortHeap; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AssignUniqueIdOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AssignUniqueIdOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AssignUniqueIdOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AssignUniqueIdOperator.java index c54ca5c951459..0e7b4c87a3ff1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/AssignUniqueIdOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AssignUniqueIdOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/CollectOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/CollectOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/CollectOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/CollectOperator.java index 7da15b65ecdef..6676c82be9f1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/CollectOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/CollectOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/EnforceSingleRowOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/EnforceSingleRowOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/EnforceSingleRowOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/EnforceSingleRowOperator.java index a37c8075535f2..d87b41acd5474 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/EnforceSingleRowOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/EnforceSingleRowOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/FilterAndProjectOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/FilterAndProjectOperator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/FilterAndProjectOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/FilterAndProjectOperator.java index beea21124f692..4fb249913e2d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/FilterAndProjectOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/FilterAndProjectOperator.java @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.AbstractCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MappableUDFColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.transformation.dag.column.AbstractCaseWhenThenColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.MappableUDFColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/LimitOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/LimitOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/LimitOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/LimitOperator.java index f2f2c50428a20..476a9f13d41c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/LimitOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/LimitOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MappingCollectOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MappingCollectOperator.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MappingCollectOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MappingCollectOperator.java index 2384c9b831d0e..81062dbfff6f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MappingCollectOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MappingCollectOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MergeSortOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MergeSortOperator.java index 21f436225811c..1307fdcbe8b8e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/MergeSortOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MergeSortOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortHeap; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/OffsetOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/OffsetOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/OffsetOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/OffsetOperator.java index eff087c40c762..e515cc6d67127 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/OffsetOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/OffsetOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PatternRecognitionOperator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PatternRecognitionOperator.java index 8085ac508cefe..577508bf738ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PatternRecognitionOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PatternRecognitionOperator.java @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternPartitionExecutor; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternPartitionExecutor; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -50,8 +50,8 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class PatternRecognitionOperator implements ProcessOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java index f2f5550ba91d0..0723ca09f7351 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ProcessOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ProcessOperator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ProcessOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ProcessOperator.java index b5afe991e457e..48efd400ae87f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ProcessOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ProcessOperator.java @@ -17,8 +17,8 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; public interface ProcessOperator extends Operator {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/SortOperator.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/SortOperator.java index f86bd9e86ab84..fa1df3ce73d52 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/SortOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/SortOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.calc_commons.utils.sort.DiskSpiller; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.utils.sort.DiskSpiller; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableFillOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableFillOperator.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableFillOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableFillOperator.java index fd23ce74b85e5..8634b27f31617 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableFillOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableFillOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillOperator.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillOperator.java index 8cc55a8270d93..3d5d59c139bc5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java index 8edbe38a88b5c..77922812418f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableMergeSortOperator.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableMergeSortOperator.java index b2ec1adf3bb04..2c1bc996dcb6f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableMergeSortOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableMergeSortOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableSortOperator.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableSortOperator.java index 93228769356ac..b3ab294256c1c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableSortOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableSortOperator.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.calc_commons.utils.sort.TableDiskSpiller; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.utils.sort.TableDiskSpiller; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableStreamSortOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableStreamSortOperator.java index c06e4e3633336..4b6e9e4647164 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableStreamSortOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableStreamSortOperator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.calc_commons.utils.sort.TableDiskSpiller; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.utils.sort.TableDiskSpiller; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableTopKOperator.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableTopKOperator.java index efb5ed43804bb..7d161d54a1aa7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TableTopKOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableTopKOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TopKOperator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TopKOperator.java index 8609268301739..20d19904f86b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/TopKOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TopKOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortHeap; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ValuesOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ValuesOperator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ValuesOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ValuesOperator.java index ec40100ebf53e..4a9cff82c3d3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/ValuesOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ValuesOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process; +package org.apache.iotdb.calc_commons.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/IFill.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFill.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/IFill.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFill.java index ea52a14e1fb4e..34e000a47c9f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/IFill.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFill.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill; +package org.apache.iotdb.calc_commons.execution.operator.process.fill; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/IFillFilter.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFillFilter.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/IFillFilter.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFillFilter.java index 631ceefaeb3aa..4d0b111cb76ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/IFillFilter.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFillFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill; +package org.apache.iotdb.calc_commons.execution.operator.process.fill; public interface IFillFilter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/ILinearFill.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/ILinearFill.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/ILinearFill.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/ILinearFill.java index e270b572b6b12..297c2679996c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/ILinearFill.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/ILinearFill.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill; +package org.apache.iotdb.calc_commons.execution.operator.process.fill; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java index 5ec13d39f05c3..5e464e7ddc239 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter; +package org.apache.iotdb.calc_commons.execution.operator.process.fill.filter; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFillFilter; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFillFilter; import java.time.ZoneId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java index 9ccd6275a912b..79148eda56eb0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter; +package org.apache.iotdb.calc_commons.execution.operator.process.fill.filter; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFillFilter; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFillFilter; public class FixedIntervalFillFilter implements IFillFilter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java index 1fe26846eef8f..48bf75c638ef6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter; +package org.apache.iotdb.calc_commons.execution.operator.process.fill.filter; import java.time.Instant; import java.time.LocalDateTime; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java index 6260c679bb686..be94145a2da0f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter; +package org.apache.iotdb.calc_commons.execution.operator.process.fill.filter; import java.time.Instant; import java.time.LocalDateTime; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java index d8af68bb626ab..02b8b8eca1a76 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter; +package org.apache.iotdb.calc_commons.execution.operator.process.fill.filter; import java.time.Instant; import java.time.LocalDateTime; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/identity/IdentityFill.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityFill.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/identity/IdentityFill.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityFill.java index f3329598b100f..807fae6153f73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/identity/IdentityFill.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityFill.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity; +package org.apache.iotdb.calc_commons.execution.operator.process.fill.identity; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java index c87820757b39f..756215c05863e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity; +package org.apache.iotdb.calc_commons.execution.operator.process.fill.identity; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/linear/LinearFill.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/linear/LinearFill.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/linear/LinearFill.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/linear/LinearFill.java index e1813795cadf2..037613c03b789 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/linear/LinearFill.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/linear/LinearFill.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear; +package org.apache.iotdb.calc_commons.execution.operator.process.fill.linear; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/PartitionRecognizer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/PartitionRecognizer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/PartitionRecognizer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/PartitionRecognizer.java index 040679c8d91ce..fb1e47d886ed0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/PartitionRecognizer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/PartitionRecognizer.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.function; +package org.apache.iotdb.calc_commons.execution.operator.process.function; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionState; +import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.type.Type; import org.apache.tsfile.enums.TSDataType; @@ -33,7 +33,7 @@ import java.util.stream.Collectors; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; +import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; public class PartitionRecognizer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java index 603a67287627c..7a36146fc12d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.function; +package org.apache.iotdb.calc_commons.execution.operator.process.function; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; import org.apache.iotdb.udf.api.relational.table.processor.TableFunctionLeafProcessor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionOperator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionOperator.java index d86adbe6a5192..112bd2b23db7a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/TableFunctionOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionOperator.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.function; +package org.apache.iotdb.calc_commons.execution.operator.process.function; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.AggregationMergeSortOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionCache; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.AggregationMergeSortOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionCache; +import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionState; +import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; import org.apache.iotdb.udf.api.relational.table.processor.TableFunctionDataProcessor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/PartitionCache.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionCache.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/PartitionCache.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionCache.java index 29ea1afce3e26..3b29e3da0266c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/PartitionCache.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionCache.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition; +package org.apache.iotdb.calc_commons.execution.operator.process.function.partition; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/PartitionState.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionState.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/PartitionState.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionState.java index fa0583d75b094..5dd0159082b17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/PartitionState.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionState.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition; +package org.apache.iotdb.calc_commons.execution.operator.process.function.partition; public class PartitionState { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/Slice.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/Slice.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/Slice.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/Slice.java index 2eb8ce4c580ff..90b2c0c8c1d05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/function/partition/Slice.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/Slice.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition; +package org.apache.iotdb.calc_commons.execution.operator.process.function.partition; -import org.apache.iotdb.db.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.type.Type; @@ -39,7 +39,7 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.RecordIterator.OBJECT_ERR_MSG; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.RecordIterator.OBJECT_ERR_MSG; import static org.apache.iotdb.udf.api.type.Type.OBJECT; /** Parts of partition. */ diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java index 15a70cd52796d..9a11fdc8819ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; +package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java index f6c7e4e7755e3..4cfd205761fdc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; +package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java index 887179f8b60a9..0f0c76a716dc5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; +package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java index 07dbb3390a3f4..731a3435235cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; +package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; @@ -30,7 +30,7 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; // with month interval public class GapFillWGroupWMoOperator extends AbstractGapFillWGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java index a3467eae7c25b..44599c4ffc3eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; +package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; // without month interval -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; @@ -31,7 +31,7 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWGroupWoMoOperator extends AbstractGapFillWGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java index 221a45c7b1901..5f9e6feecfff3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; +package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.tsfile.enums.TSDataType; import java.time.ZoneId; import java.util.List; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWoGroupWMoOperator extends AbstractGapFillWoGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java similarity index 82% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java index 68b846a837bdf..fcf73c46ce463 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill; +package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.tsfile.enums.TSDataType; import java.util.List; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWoGroupWoMoOperator extends AbstractGapFillWoGroupOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java index 91efe049c1f80..98c7d5d5bfd14 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join; +package org.apache.iotdb.calc_commons.execution.operator.process.join; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java index 74eb0e0a29e89..efebb4e50a5d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge; import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.external.commons.collections4.comparators.ComparatorChain; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java index fdbb2d60dd548..5a5b479704950 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import java.util.Comparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java index 73d5a26d07c23..e040340237065 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java index 1bf4eed51703f..6528a3248415f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java index 4b78007a964ff..da857846c0701 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java index eafb053e2f17a..7b271a6cba360 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java index 2a7b2b19c7c79..41ce8b0192db8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java index d20b6aa73b6cb..d5d45d1b90a51 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java index 383eb43e023c3..0b3f214e56a4e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java index 48ac9205c37d5..66568c34041a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java index 87f33e1cee106..11a4d94cb8fcb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java index eae1de899226c..3ddd161a9f735 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java index 983dce239932b..eb345672218bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java index d85e0364bc963..92c7d7b8ea529 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java index d6a701d2e6fd0..8c2ce4d9e3971 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java index cf06e9d3acf38..dff8ae79aef29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java index f93bf21de29f7..5314432381a6f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java index 9dd06f4574600..9560ed860fb11 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java index 6397fef28e1c0..66d93a25e975f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; import java.util.Collections; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java index ef8e3cbbc0bb2..1871d3d91ed72 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.IntList; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.IntList; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java index 1b7ab5b197756..31a9e5b5a26cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -33,7 +33,7 @@ import java.util.List; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; /** * This class computes an aggregate function result in row pattern recognition context. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java index 4d1d0200c674b..9372711c34e4c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; import java.util.Arrays; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java index 0b44cbcac437d..2258eb8638aec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer.PatternVariableComputation; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.MatchResult; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer.PatternVariableComputation; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.MatchResult; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java index 3652f6d620057..22b0934a72356 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.Computation; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.Computation; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java index bba6ae5523900..851fbaff78a93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; public class PhysicalAggregationPointer implements PhysicalValueAccessor { private final int index; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java index 71242f8b66b49..b5bd56d31c770 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java @@ -17,6 +17,6 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; public interface PhysicalValueAccessor {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java index 036f7d2b4dc42..0ba9588b1136b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java index efe70453e3a05..ba0f3838a7ea0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java index b2bd75e8d84ce..f9d245157347a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java index 2bc993fef66ef..31779220c8995 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; public interface BinaryOperator { /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java index bd50756b0b285..1455467ed062d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java index 4637c50dc8534..d6d7677f34fdb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/Computation.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/Computation.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/Computation.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/Computation.java index 076ec07c045ea..1d4dede019ef4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/Computation.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/Computation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java index 08db21e9add80..7589cbbe08647 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java index 91ed8e0593860..55b90c66cdfe0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java index 0a3ea4282b3c0..ab78043bdfb6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java index b9cb2d262117e..5e05773859fd3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java index 5ed6dc8275651..5de7728268143 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalAggregationPointer; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValueAccessor; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalAggregationPointer; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValueAccessor; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.type.AbstractIntType; @@ -41,8 +41,8 @@ import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; +import static org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; +import static org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; import static org.apache.tsfile.enums.TSDataType.STRING; public class PatternExpressionComputation { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java index 105fc943d4dd0..fb96771917864 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java index 1b737ffeff1a2..c01bf3cb29c7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; import com.google.common.annotations.VisibleForTesting; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Done.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Done.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Done.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Done.java index e0eb0c4208463..ccf999a18512b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Done.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Done.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; class Done implements Instruction { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java index 269892966d553..e14629263f654 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; interface Instruction { enum Type { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java index 560c111a5942a..1d6f26ae1a962 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java index 1a10dc1340f26..66200a73d6a15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java index 403e246b97c5f..6d0569731ad80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java index 081d8d9cdff6f..63b46e773a727 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAlternation; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAnchor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java index 9db3497cf0a5c..c56b6153cb743 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java index fa30f0af86c09..d631b47b6bfb5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; class MatchEnd implements Instruction { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java index 584f1516e895b..e5d37e7dff0a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java index a2be6d5836694..b9c1e7b086f3a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java index 0d6eed3c748d3..8c519de7fed5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; class MatchStart implements Instruction { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java index e3492d458b6dc..cce19c04a8841 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregators; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregators; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; import org.apache.tsfile.utils.RamUsageEstimator; import java.util.List; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.MatchResult.NO_MATCH; +import static org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.MatchResult.NO_MATCH; public class Matcher { private final Program program; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java index 9e3bd429da231..b903407dd28f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Program.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Program.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Program.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Program.java index a29ab2ad6973c..2a508b06a88e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Program.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Program.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Save.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Save.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Save.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Save.java index f213c16d81f18..8c4c1f8c1a93a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Save.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Save.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; class Save implements Instruction { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Split.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Split.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Split.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Split.java index d8da43120a212..c58d4d9d80d0b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/rowpattern/matcher/Split.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Split.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/RowNumberOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/RowNumberOperator.java index 27536d9e60dc9..5041682290801 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/RowNumberOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/RowNumberOperator.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window; +package org.apache.iotdb.calc_commons.execution.operator.process.window; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -45,7 +45,7 @@ import java.util.Optional; import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class RowNumberOperator implements ProcessOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TableWindowOperator.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TableWindowOperator.java index b23ed420c9cae..c22e1842bd4a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TableWindowOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TableWindowOperator.java @@ -17,22 +17,22 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window; +package org.apache.iotdb.calc_commons.execution.operator.process.window; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.PartitionRecognizer; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionCache; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.function.PartitionRecognizer; +import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionCache; +import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionState; +import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -49,7 +49,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; public class TableWindowOperator implements ProcessOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TopKRankingOperator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TopKRankingOperator.java index 114e01d1e3b32..18a8c97039d83 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/TopKRankingOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TopKRankingOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window; +package org.apache.iotdb.calc_commons.execution.operator.process.window; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; @@ -26,13 +26,13 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.GroupedTopNBuilder; -import org.apache.iotdb.db.calc_commons.execution.operator.GroupedTopNRowNumberBuilder; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.SimpleTsBlockWithPositionComparator; -import org.apache.iotdb.db.calc_commons.execution.operator.TsBlockWithPositionComparator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.GroupedTopNBuilder; +import org.apache.iotdb.calc_commons.execution.operator.GroupedTopNRowNumberBuilder; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.SimpleTsBlockWithPositionComparator; +import org.apache.iotdb.calc_commons.execution.operator.TsBlockWithPositionComparator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/WindowFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunction.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/WindowFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunction.java index dc92585873922..3d2b9a4c396e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/WindowFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java similarity index 62% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java index 41853d836b0ec..8151498f3a5a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.CumeDistFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.DenseRankFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.NTileFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.PercentRankFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RankFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RowNumberFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.FirstValueFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LagFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LastValueFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LeadFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.NthValueFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.CumeDistFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.DenseRankFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.NTileFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.PercentRankFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.RankFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.RowNumberFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.FirstValueFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.LagFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.LastValueFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.LeadFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.NthValueFunction; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java index 495afb677b3ce..f7340df434c09 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java index 20ec45f86223e..5e4e0d164f3c5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java index f407f89117874..33c328c220a1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java index 5413199386f8f..9f1b518543563 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java index 19e97d2765c90..91a8c029699a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java index bb9dd0785b631..722aef5d034a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RankFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankFunction.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RankFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankFunction.java index 6e811f6a4575f..5ec6ed9e78a70 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RankFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java index 10325d423653f..7e918a1c989b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java index 7ea5344ab2fa3..024d32531cbda 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java index 1733a0d05a818..6407dd0ff06a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LagFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LagFunction.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LagFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LagFunction.java index c8d75fb6750f7..415824a961ebc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LagFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LagFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java index e6344e4754e2e..3739aabac6573 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LeadFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LeadFunction.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LeadFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LeadFunction.java index 44651a9d1e7bd..72ba21f97f143 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/LeadFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LeadFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java index 824edefc725bf..43380e8f103ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java index 69f8f838e7b88..e0313d3861f10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value; +package org.apache.iotdb.calc_commons.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/Partition.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/Partition.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/Partition.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/Partition.java index 63d6720eea812..629a8fb23e190 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/Partition.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/Partition.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition; +package org.apache.iotdb.calc_commons.execution.operator.process.window.partition; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java index 50a6fb5025ed7..6bae5110038fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition; - -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.Frame; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.GroupsFrame; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.RangeFrame; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.RowsFrame; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; +package org.apache.iotdb.calc_commons.execution.operator.process.window.partition; + +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.Frame; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.GroupsFrame; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.RangeFrame; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.RowsFrame; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/Frame.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/Frame.java similarity index 83% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/Frame.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/Frame.java index bd6e0349b3be3..3d00d69a05f7a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/Frame.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/Frame.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame; +package org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; public interface Frame { Range getRange(int currentPosition, int currentGroup, int peerGroupStart, int peerGroupEnd); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java index f54115fa22d6b..00a081c8e1e98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame; +package org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame; import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java index 6ace83bd6ea86..35d0f4b00156a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame; +package org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java index 56cef77dfef26..864f9f12d9a36 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame; +package org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.write.UnSupportedDataTypeException; @@ -31,9 +31,9 @@ import java.util.List; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.CURRENT_ROW; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.UNBOUNDED_FOLLOWING; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.UNBOUNDED_PRECEDING; +import static org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.CURRENT_ROW; +import static org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.UNBOUNDED_FOLLOWING; +import static org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.UNBOUNDED_PRECEDING; public class RangeFrame implements Frame { private final Partition partition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java index d94f931889308..5d0cc3191fc71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame; +package org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; import static com.google.common.base.Preconditions.checkArgument; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/ColumnList.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/ColumnList.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/ColumnList.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/ColumnList.java index 2e29be9029576..b12478b150055 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/ColumnList.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/ColumnList.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils; +package org.apache.iotdb.calc_commons.execution.operator.process.window.utils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnEncoding; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/Range.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/Range.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/Range.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/Range.java index 60876bdd02f81..4340a700a2063 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/Range.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/Range.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils; +package org.apache.iotdb.calc_commons.execution.operator.process.window.utils; public class Range { private final int start; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/RowComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/RowComparator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/RowComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/RowComparator.java index 2abeb817456f0..efacfab6098e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/process/window/utils/RowComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/RowComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils; +package org.apache.iotdb.calc_commons.execution.operator.process.window.utils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java index 84cff0ef5aa45..269aec5386a01 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc_commons.execution.operator.source.relational; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java index 202f54896fc0e..f391f0cd01dd6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc_commons.execution.operator.source.relational; -import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; @@ -38,7 +38,7 @@ import java.util.concurrent.TimeUnit; import static com.google.common.util.concurrent.Futures.successfulAsList; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; public abstract class AbstractMergeSortJoinOperator extends AbstractOperator { protected boolean leftFinished; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java index 1e8b46e375e90..93813f9e195f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc_commons.execution.operator.source.relational; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java index 190d7844636f6..77d6262658e44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc_commons.execution.operator.source.relational; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java index f57ce901e95c1..9728ddf0fdd27 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc_commons.execution.operator.source.relational; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; @@ -40,7 +40,7 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; public class MarkDistinctOperator implements ProcessOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java index f21fc2dab6e3b..e1eff8cf136b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc_commons.execution.operator.source.relational; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java index a6161ff4f567f..85fa5e78ce227 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc_commons.execution.operator.source.relational; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java index ddb13cbfa9cd8..6183b14d4752b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc_commons.execution.operator.source.relational; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java index 89a9ee5edca3e..a5db4ecf66fa3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc_commons.execution.operator.source.relational; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java index c193f726e7864..c23d300afc42c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import com.google.gson.Gson; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java index a2e47f6770b69..f65d89171b38d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java index 2e13be2f7af31..3a0ae43b7fd47 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; @@ -26,35 +26,35 @@ import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.execution.aggregation.VarianceAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.BinaryGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.BlobGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.BooleanGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.DoubleGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.FloatGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedApproxCountDistinctAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedApproxPercentileAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedApproxPercentileWithWeightAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAvgAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedCountAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedCountAllAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedCountIfAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedExtremeAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedFirstAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedFirstByAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedLastAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedLastByAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMaxAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMaxByAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMinAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMinByAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedModeAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedSumAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedUserDefinedAggregateAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedVarianceAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.IntGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.VarianceAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.BinaryGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.BlobGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.BooleanGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.DoubleGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.FloatGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedApproxCountDistinctAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedApproxPercentileAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedApproxPercentileWithWeightAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAvgAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedCountAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedCountAllAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedCountIfAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedExtremeAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedFirstAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedFirstByAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedLastAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedLastByAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMaxAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMaxByAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMinAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMinByAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedModeAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedSumAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedUserDefinedAggregateAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedVarianceAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.IntGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.AggregateFunction; @@ -82,8 +82,8 @@ import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.FIRST_BY; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST_BY; -import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isMeasurementColumn; -import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; +import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isMeasurementColumn; +import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; import static org.apache.tsfile.read.common.type.IntType.INT32; public class AccumulatorFactory { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java index d98a8237b6fc5..53504ad9e230a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java index 615d3d716fb12..ff7c0d60c448e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java index 5e3431041542a..65b1940760a02 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLogStateFactory; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLogStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -27,7 +27,7 @@ import org.apache.tsfile.write.UnSupportedDataTypeException; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog.DEFAULT_STANDARD_ERROR; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog.DEFAULT_STANDARD_ERROR; public class ApproxCountDistinctAccumulator implements TableAccumulator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java index 866d08d340b4e..778b0b740bcfc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java index 5356d35f8c665..9a818b0f4f0a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java index c1e8f2f3e9987..e6e9eeb4227f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java index d07a4a98574dd..28376b4ef5c31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java index 156aa9b7d15e2..1ba49c939f026 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import com.google.gson.Gson; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java index 011ed7982da83..75e8a91396e0c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java index 0cde3980d3388..10cc5bafc1ec4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java index 970ab6c97b72a..70961399f61b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java index 1791475015851..60208f548eca8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java index e0dcfa0ba48f2..84dc6dd7c683e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java index 759b427f7b458..c2f4a2a7aa6c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java index e77cd07d8e381..b020491c918d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -36,7 +36,7 @@ import java.nio.charset.StandardCharsets; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; public class FirstAccumulator implements TableAccumulator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java index 6df04956c51f0..2a91587697423 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -35,7 +35,7 @@ import java.nio.charset.StandardCharsets; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; public class FirstByAccumulator implements TableAccumulator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java index da721bfd3b645..b7342876693bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java index fbd88495cbd5c..636ec0370fb83 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java index 1daddd80c9ef2..096d7da883645 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java index f5fdec5940701..b744db7f19146 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java index 27ce31f42e3ca..d920c1742a00e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -36,7 +36,7 @@ import java.nio.charset.StandardCharsets; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; public class LastAccumulator implements TableAccumulator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java index c7b1d5daebb05..1aa2433a89512 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -33,7 +33,7 @@ import org.apache.tsfile.write.UnSupportedDataTypeException; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; public class LastByAccumulator implements TableAccumulator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java index 16531c5eb524c..99498e4b2e5a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java index e8e8727c6a56f..5ae072230abec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java index c5571ed68b89e..170854833018c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java index 0148c950d379d..5d1fea18497a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java index f749e766ad994..bb7f57aaa3446 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java index 97b76de2b0534..95da7a46dbeb8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java index 61d0ba36a986c..d727133f4eef9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java index d2f4ee99adba5..59c049aa463f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java index 1df3575839953..c258fc92da569 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java index 680182f0473c8..ffc60d5822fc5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; @@ -36,7 +36,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.AGGREGATION_FROM_RAW_DATA; +import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.AGGREGATION_FROM_RAW_DATA; public class TableAggregator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java index 37ca08186e672..a525afe3dc261 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java index f42c8403d5358..db3df64b6c404 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -35,8 +35,8 @@ import java.util.Collections; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.calcTypeSize; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeValue; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.calcTypeSize; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeValue; /** max(x,y) returns the value of x associated with the maximum value of y over all input values. */ public abstract class TableMaxMinByBaseAccumulator implements TableAccumulator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java index 4bffe0cfc9f70..cebe39e8e8f7e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java index 59e240c9bfea3..684baaa965493 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.conf.CommonDescriptor; @@ -36,8 +36,8 @@ import java.util.Map; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.UNSUPPORTED_TYPE_MESSAGE; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeBinaryValue; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.UNSUPPORTED_TYPE_MESSAGE; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeBinaryValue; import static org.apache.tsfile.utils.BytesUtils.bytesToBool; import static org.apache.tsfile.utils.BytesUtils.bytesToLongFromOffset; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java index 249832afcf8c4..3ef5db78dfccc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.VarianceAccumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.VarianceAccumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java index 1a586744213e8..71f6a42f35ad3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.iotdb.udf.api.State; import org.apache.iotdb.udf.api.customizer.analysis.AggregateFunctionAnalysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/Utils.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/Utils.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/Utils.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/Utils.java index 41998b9510c41..f52aa951799fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/Utils.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/Utils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java index 311ffefbf2a0e..fb7b29b447769 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java index 74c3669918b0c..90dfbc7e7b4f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java index 5c5d1634d62da..4bed977c7288d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.io.Externalizable; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java index 9f0219e165eb1..158b31871b31b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.util.ConcurrentModificationException; import java.util.Iterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java index 6c289948a0aea..0336043077b34 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.io.ByteArrayOutputStream; import java.io.Externalizable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java index 248a326fd6da6..ac60ade5b8d4e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java index c2f13423ff3a1..c83ef5ab98b1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.HyperLogLogBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.HyperLogLogBigArray; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java index a14129ef2baba..f0604f702d7f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java index 054e2bf0ce7be..0a3007d4dd256 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; public class ListNode2 { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java index e0a845aeda32f..6b6fd4c42e8b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; public class Pair { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java index c6412bfd7ac79..1ac5af1ee9442 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; import com.google.common.collect.ImmutableMap; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java index 333615e3024c8..5797b7a535ace 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java index e2aaa1cce89da..7bd98b309442e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java @@ -12,14 +12,14 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.utils.RamUsageEstimator; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving.getDefaultEstimatedSize; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving.getDefaultEstimatedSize; public class SpaceSavingStateFactory { public static SingleSpaceSavingState createSingleState() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java index 5a706733d54dd..ee739feb6aca9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; import java.io.ByteArrayInputStream; import java.io.Externalizable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java index 1a22cc791f821..711cd8258867d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java index 6ec7a24d21951..a22300b9d075d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import com.google.gson.Gson; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java index fa9005921c057..08b1b8426dbbd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.TDigestBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.TDigestBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java index 0828e9bf3b622..680269fe3ec42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java @@ -12,13 +12,13 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.BinaryApproxMostFrequentAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.BinaryApproxMostFrequentAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java index b6469834a15d3..2d8ee10e07c98 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import com.google.gson.Gson; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java index c50503438ada1..0d20896142321 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java @@ -12,13 +12,13 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.BooleanApproxMostFrequentAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.BooleanApproxMostFrequentAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java index 03dd95897ca09..8cb50733c4371 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java @@ -12,13 +12,13 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.DoubleApproxMostFrequentAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.DoubleApproxMostFrequentAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java index 211942dcd0b84..c2c087687f274 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java @@ -12,13 +12,13 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.FloatApproxMostFrequentAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.FloatApproxMostFrequentAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java index 26fb7f0bae2a1..b964b0cdb5921 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java index b66624637e5d0..0df41609bb5c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java index 06de04d0ca8ea..72122a06d6482 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLogStateFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.HyperLogLogBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLogStateFactory; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.HyperLogLogBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -26,7 +26,7 @@ import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.write.UnSupportedDataTypeException; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog.DEFAULT_STANDARD_ERROR; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog.DEFAULT_STANDARD_ERROR; public class GroupedApproxCountDistinctAccumulator implements GroupedAccumulator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java index fd39f3677d8c8..a9dbe8383eeaf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java index 81dc0b79d4ac7..ccbcf17e7619c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java index 4bcecc1349d25..8bc7209265c6c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java index 4a3fcc03943a9..272dc15762626 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java index 38ff56d2a2159..2846cc9cdef62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java index cd41ced42066f..45ff245a8f1f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java index 47806eb1ddf43..a36b3520b7c84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java index a974ab90ee95b..3a1dbe6b7166c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java index 615808f3e6f1d..3b6decc8a2ce2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java index c7826f456aeea..3f2c68168cfa4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java index 9e98baeaf2297..e35c9986dc85b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java index 59b292e6649f2..1b55199032173 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java index 8757b3724d43b..ca4946e37f7cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java index fd204747a4de8..1e6859b531dc0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java index 37bf836d9395b..2ceff8bc5cc31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java index ad08f997d59cd..031efc8f140a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java index 0bdc0755dbf39..7a942a2b43cef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.MapBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.MapBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -39,8 +39,8 @@ import java.util.Map; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.UNSUPPORTED_TYPE_MESSAGE; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeBinaryValue; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.UNSUPPORTED_TYPE_MESSAGE; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeBinaryValue; import static org.apache.tsfile.utils.BytesUtils.bytesToBool; import static org.apache.tsfile.utils.BytesUtils.bytesToLongFromOffset; import static org.apache.tsfile.utils.TsPrimitiveType.getByType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java index 19f6c31aa315e..f7220bf01bd84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java index 034e6193faf62..09b37e5cda753 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.MaskedRecordIterator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.RecordIterator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.ObjectBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.MaskedRecordIterator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.RecordIterator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.ObjectBigArray; import org.apache.iotdb.udf.api.State; import org.apache.iotdb.udf.api.relational.AggregateFunction; import org.apache.iotdb.udf.api.utils.ResultValue; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java index d04991791556e..07ee48babd3cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.db.calc_commons.execution.aggregation.VarianceAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc_commons.execution.aggregation.VarianceAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java index c04b8f34aeb23..7edf988b19052 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -39,7 +39,7 @@ import static com.google.common.base.Preconditions.checkState; import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; public class HashAggregationOperator extends AbstractOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java index 077018c612f7e..e4023bc5381c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java @@ -12,13 +12,13 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.IntApproxMostFrequentAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.IntApproxMostFrequentAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java index 5a5974872e247..cafcdfbf28af5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java @@ -12,13 +12,13 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LongApproxMostFrequentAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LongApproxMostFrequentAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java index 084de210e2e57..d8ca305900038 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java index 5fd9c8845fe63..93806ea370f8e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; @@ -46,8 +46,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.MAX_USED_MEMORY; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.MAX_USED_MEMORY; public class StreamingHashAggregationOperator extends AbstractOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java index 4b763d7b11d5b..4fd3f80f5039d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; // Note: this code was forked from fastutil (http://fastutil.di.unimi.it/) // Copyright (C) 2010-2013 Sebastiano Vigna diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java index acbd46d80e706..803368ca6b394 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java index 326776c84512f..af6005175d985 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java index cec56569d6114..01cd14dfd8aa2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfByteArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java index a59f524a6dce2..4140d3c5130e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfDoubleArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java index a237134ad6121..3ae2550c1bb4e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfFloatArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java index e687e56ff9520..e2ba7ee1f9024 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java index 1c518d59f0f48..c156b769e8e35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java index bda05818ea3f5..29adbedfa498d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfIntArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java index 96339f6028cc9..1d22b36ea5969 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SHIFT; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SHIFT; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; // Note: this code was forked from fastutil (http://fastutil.di.unimi.it/) // Copyright (C) 2010-2013 Sebastiano Vigna diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java index 7fd4c8ff425bf..885ef7fd627d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; // Note: this code was forked from fastutil (http://fastutil.di.unimi.it/) // Copyright (C) 2010-2013 Sebastiano Vigna diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java index a4ed5c7148a69..0ef948de81f19 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfLongArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java index 141920ef489eb..917b723b3b7e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.NoSuchElementException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java index c169d335b377c..fe7098d4b4c64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import org.apache.tsfile.utils.TsPrimitiveType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java index a005c5d487348..f6e36a89ec891 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; import java.util.function.Consumer; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfObjectArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java index 42e69a96c06d7..4a8f50b23f0d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; import com.google.common.primitives.Shorts; import java.util.Arrays; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfShortArray; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java similarity index 80% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java index d20e1ad4a5f6a..a08ba91fa41c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.ApproxMostFrequentBucketDeserializer; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.ApproxMostFrequentBucketSerializer; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingByteCalculator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.ApproxMostFrequentBucketDeserializer; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.ApproxMostFrequentBucketSerializer; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingByteCalculator; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java index 704b571fdad9e..262de0ac1807b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java index 644b62b22986d..5753c274e6f17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java index d3860b351e435..70d657f83b768 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.builder; +package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder; import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/relational/ColumnTransformerBuilder.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/relational/ColumnTransformerBuilder.java index 8977030309af1..b60ed2fe8a900 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/relational/ColumnTransformerBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.execution.relational; +package org.apache.iotdb.calc_commons.execution.relational; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.SemanticException; @@ -72,130 +72,130 @@ import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.plan.relational.metadata.ITypeMetadata; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.TableCaseWhenThenColumnTransformer; +import org.apache.iotdb.calc_commons.plan.relational.metadata.ITypeMetadata; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.TableCaseWhenThenColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticColumnTransformerApi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessThanColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.Like2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.NullColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.AbstractGreatestLeastColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.CoalesceColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.InBinaryMultiColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.InBooleanMultiColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.InDoubleMultiColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.InFloatMultiColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.InInt32MultiColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.InInt64MultiColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.InMultiColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.LogicalAndMultiColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.LogicalOrMultiColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.BetweenColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.Like3ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.LpadColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.RpadColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.udf.UserDefineScalarFunctionTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LikeColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.AbsColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.AcosColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.AsinColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.AtanColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitCount2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitCountColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseAnd2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseAndColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseLeftShift2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseLeftShiftColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseNotColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseOr2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseOrColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShift2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmetic2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmeticColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShiftColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseXor2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BitwiseXorColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BlobLengthColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CRC32Transformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CeilColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.Concat2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ConcatColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ConcatMultiColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CosColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CoshColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DegreesColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DiffColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.EndsWith2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.EndsWithColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ExpColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ExtractTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.FloorColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.FormatColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LTrim2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LTrimColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LengthColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LnColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.Log10ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LowerColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ObjectLengthColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RTrim2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RTrimColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RadiansColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RegexpLike2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RegexpLikeColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.Replace2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.Replace3ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RoundColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SignColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SinColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SinhColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SqrtColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.StartsWith2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.Strcmp2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.StrcmpColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.Strpos2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.StrposColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SubString2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SubString3ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SubStringColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.TanColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.TanhColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.Trim2ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.TryCastFunctionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.UpperColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareLessThanColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.Like2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.NullColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.AbstractGreatestLeastColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.CoalesceColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.InBinaryMultiColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.InBooleanMultiColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.InDoubleMultiColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.InFloatMultiColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.InInt32MultiColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.InInt64MultiColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.InMultiColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.LogicalAndMultiColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.LogicalOrMultiColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.BetweenColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.Like3ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.LpadColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.RpadColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.udf.UserDefineScalarFunctionTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LikeColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.AbsColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.AcosColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.AsinColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.AtanColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitCount2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitCountColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseAnd2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseAndColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseLeftShift2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseLeftShiftColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseNotColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseOr2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseOrColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShift2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmetic2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmeticColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShiftColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseXor2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseXorColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BlobLengthColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CRC32Transformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CeilColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.Concat2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ConcatColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ConcatMultiColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CosColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CoshColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DegreesColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DiffColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.EndsWith2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.EndsWithColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ExpColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ExtractTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.FloorColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.FormatColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LTrim2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LTrimColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LengthColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LnColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.Log10ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LowerColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ObjectLengthColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RTrim2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RTrimColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RadiansColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RegexpLike2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RegexpLikeColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.Replace2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.Replace3ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RoundColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SignColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SinColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SinhColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SqrtColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.StartsWith2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.Strcmp2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.StrcmpColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.Strpos2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.StrposColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SubString2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SubString3ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SubStringColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.TanColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.TanhColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.Trim2ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.TryCastFunctionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.UpperColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.ScalarFunction; @@ -229,15 +229,15 @@ import static com.google.common.base.Preconditions.checkArgument; import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.isStringLiteral; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy; +import static org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy; +import static org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; +import static org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; +import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; +import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.isStringLiteral; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/metric/QueryExecutionMetricSet.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/metric/QueryExecutionMetricSet.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/metric/QueryExecutionMetricSet.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/metric/QueryExecutionMetricSet.java index bfc93370ebe86..f46ee830a7e31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/metric/QueryExecutionMetricSet.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/metric/QueryExecutionMetricSet.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.metric; +package org.apache.iotdb.calc_commons.metric; import org.apache.iotdb.commons.service.metric.enums.Metric; import org.apache.iotdb.commons.service.metric.enums.Tag; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/CommonOperatorUtils.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/CommonOperatorUtils.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/CommonOperatorUtils.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/CommonOperatorUtils.java index 2ee3d2b520fa5..204dbbc9b9d5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/CommonOperatorUtils.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/CommonOperatorUtils.java @@ -12,17 +12,17 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.plan.planner; +package org.apache.iotdb.calc_commons.plan.planner; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFillFilter; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.FixedIntervalFillFilter; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalMSFillFilter; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalNSFillFilter; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalUSFillFilter; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity.IdentityFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFillFilter; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.FixedIntervalFillFilter; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.MonthIntervalMSFillFilter; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.MonthIntervalNSFillFilter; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.MonthIntervalUSFillFilter; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.identity.IdentityFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.DoubleLinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.IntLinearFill; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/ITableOperatorGeneratorContext.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/ITableOperatorGeneratorContext.java index 701562f081db0..8bd47ca1bc3c2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/ITableOperatorGeneratorContext.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/ITableOperatorGeneratorContext.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.planner; +package org.apache.iotdb.calc_commons.plan.planner; import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/TableOperatorGenerator.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/TableOperatorGenerator.java index 37e3a2dfbc7bb..e09a676bf7df6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/TableOperatorGenerator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.planner; +package org.apache.iotdb.calc_commons.plan.planner; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.common.SessionInfo; @@ -78,92 +78,92 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.AssignUniqueIdOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.CollectOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.EnforceSingleRowOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.MappingCollectOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.PatternRecognitionOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.PreviousFillWithGroupOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.TableFillOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.TableLinearFillOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.TableLinearFillWithGroupOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.TableMergeSortOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.TableSortOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.TableStreamSortOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.TableTopKOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ValuesOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.AssignUniqueIdOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.CollectOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.EnforceSingleRowOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.MappingCollectOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.PatternRecognitionOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.PreviousFillWithGroupOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.TableFillOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.TableLinearFillOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.TableLinearFillWithGroupOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.TableMergeSortOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.TableSortOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.TableStreamSortOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.TableTopKOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.ValuesOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BinaryConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BooleanConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.FloatConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.IntConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.LongConstantFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.TableFunctionLeafOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.TableFunctionOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWGroupWMoOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregationTracker; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalAggregationPointer; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValueAccessor; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.Computation; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.IrRowPatternToProgramRewriter; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Program; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.RowNumberOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.TableWindowOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.TopKRankingOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunctionFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate.WindowAggregator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.AsofMergeSortLeftJoinOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.MarkDistinctOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.MergeSortFullOuterJoinOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.MergeSortInnerJoinOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.MergeSortLeftJoinOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.MergeSortSemiJoinOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AggregationOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingAggregationOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; -import org.apache.iotdb.db.calc_commons.execution.relational.ColumnTransformerBuilder; -import org.apache.iotdb.db.calc_commons.plan.relational.metadata.ITypeMetadata; -import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToBlobLiteralVisitor; -import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToBooleanLiteralVisitor; -import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToDateLiteralVisitor; -import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToDoubleLiteralVisitor; -import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToFloatLiteralVisitor; -import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToInt32LiteralVisitor; -import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToInt64LiteralVisitor; -import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToStringLiteralVisitor; -import org.apache.iotdb.db.calc_commons.plan.relational.planner.CastToTimestampLiteralVisitor; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.process.function.TableFunctionLeafOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.function.TableFunctionOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWGroupWMoOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregationTracker; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalAggregationPointer; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValueAccessor; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.Computation; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.IrRowPatternToProgramRewriter; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Program; +import org.apache.iotdb.calc_commons.execution.operator.process.window.RowNumberOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.window.TableWindowOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.window.TopKRankingOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunctionFactory; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate.WindowAggregator; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.AsofMergeSortLeftJoinOperator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.MarkDistinctOperator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.MergeSortFullOuterJoinOperator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.MergeSortInnerJoinOperator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.MergeSortLeftJoinOperator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.MergeSortSemiJoinOperator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationOperator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingAggregationOperator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; +import org.apache.iotdb.calc_commons.execution.relational.ColumnTransformerBuilder; +import org.apache.iotdb.calc_commons.plan.relational.metadata.ITypeMetadata; +import org.apache.iotdb.calc_commons.plan.relational.planner.CastToBlobLiteralVisitor; +import org.apache.iotdb.calc_commons.plan.relational.planner.CastToBooleanLiteralVisitor; +import org.apache.iotdb.calc_commons.plan.relational.planner.CastToDateLiteralVisitor; +import org.apache.iotdb.calc_commons.plan.relational.planner.CastToDoubleLiteralVisitor; +import org.apache.iotdb.calc_commons.plan.relational.planner.CastToFloatLiteralVisitor; +import org.apache.iotdb.calc_commons.plan.relational.planner.CastToInt32LiteralVisitor; +import org.apache.iotdb.calc_commons.plan.relational.planner.CastToInt64LiteralVisitor; +import org.apache.iotdb.calc_commons.plan.relational.planner.CastToStringLiteralVisitor; +import org.apache.iotdb.calc_commons.plan.relational.planner.CastToTimestampLiteralVisitor; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; @@ -215,20 +215,20 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createAccumulator; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createBuiltinAccumulator; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.IDENTITY_FILL; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.UNKNOWN_DATATYPE; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.getLinearFill; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.getPreviousFill; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_AGGREGATION; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; +import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; +import static org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; +import static org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createAccumulator; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createBuiltinAccumulator; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.IDENTITY_FILL; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.UNKNOWN_DATATYPE; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.getLinearFill; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.getPreviousFill; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_AGGREGATION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; import static org.apache.tsfile.read.common.type.LongType.INT64; import static org.apache.tsfile.read.common.type.StringType.STRING; import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/memory/MemoryReservationManager.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/memory/MemoryReservationManager.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/memory/MemoryReservationManager.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/memory/MemoryReservationManager.java index f7e77df2a7ac5..3d0cbdf65fc30 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/planner/memory/MemoryReservationManager.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/memory/MemoryReservationManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.planner.memory; +package org.apache.iotdb.calc_commons.plan.planner.memory; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/CommonMetadataUtils.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/CommonMetadataUtils.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/CommonMetadataUtils.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/CommonMetadataUtils.java index 2f5cce7cf0228..468c518a28898 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/CommonMetadataUtils.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/CommonMetadataUtils.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.metadata; +package org.apache.iotdb.calc_commons.plan.relational.metadata; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/ITypeMetadata.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/ITypeMetadata.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/ITypeMetadata.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/ITypeMetadata.java index f3b0985a11c32..f1e4af6130fdc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/metadata/ITypeMetadata.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/ITypeMetadata.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.metadata; +package org.apache.iotdb.calc_commons.plan.relational.metadata; import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java index 534d33a405d88..61d3aa2f4f234 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc_commons.plan.relational.planner; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java index 20f143c4d9940..598f8a51a9fe6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc_commons.plan.relational.planner; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java index 8aa983cc9af5f..5f21d7385f05c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc_commons.plan.relational.planner; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java index ce4817abd633f..06b92fa47c518 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc_commons.plan.relational.planner; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java index 2659a35266f84..c7321740215e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc_commons.plan.relational.planner; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java index e3f3786596eb5..ee5ef73c403a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc_commons.plan.relational.planner; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java index 4e9b48ea4734c..23969df62c386 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc_commons.plan.relational.planner; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java index 04c5719fb2c2c..90f6669bda3e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc_commons.plan.relational.planner; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java index 02cc508240a39..ab80bdbca5ef2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc_commons.plan.relational.planner; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java index 56ac9e747a5fe..2a09f1a79821c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.planner.ir; +package org.apache.iotdb.calc_commons.plan.relational.planner.ir; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Capture.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Capture.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Capture.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Capture.java index f2e88446dfa12..bd0a5d32db031 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Capture.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Capture.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc_commons.plan.relational.utils.matching; import java.util.concurrent.atomic.AtomicInteger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Captures.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Captures.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Captures.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Captures.java index 9823e1255554f..b0816126ca378 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Captures.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Captures.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc_commons.plan.relational.utils.matching; import java.util.NoSuchElementException; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/DefaultPrinter.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/DefaultPrinter.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/DefaultPrinter.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/DefaultPrinter.java index 085ff48de50f0..92089a77a712e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/DefaultPrinter.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/DefaultPrinter.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc_commons.plan.relational.utils.matching; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.CapturePattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.EqualsPattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.WithPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.CapturePattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.EqualsPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.WithPattern; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Match.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Match.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Match.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Match.java index af62c05b0b7c1..28ab8c788d3b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Match.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Match.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc_commons.plan.relational.utils.matching; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Pattern.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Pattern.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Pattern.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Pattern.java index 69d7b8e1ceca7..758d1daf05f5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Pattern.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Pattern.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc_commons.plan.relational.utils.matching; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.CapturePattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.WithPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.CapturePattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.WithPattern; import com.google.common.collect.Iterables; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/PatternVisitor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PatternVisitor.java similarity index 70% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/PatternVisitor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PatternVisitor.java index 77091fd6c90d6..6698314f92171 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/PatternVisitor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PatternVisitor.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc_commons.plan.relational.utils.matching; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.CapturePattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.EqualsPattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.WithPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.CapturePattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.EqualsPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.WithPattern; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Property.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Property.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Property.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Property.java index 8daa276db4ad9..26f080ad0c5a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/Property.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Property.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc_commons.plan.relational.utils.matching; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.EqualsPattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.EqualsPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; import java.util.Optional; import java.util.function.BiFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/PropertyPattern.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PropertyPattern.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/PropertyPattern.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PropertyPattern.java index d6b451c9ae39d..1be7bf7c82c6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/PropertyPattern.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PropertyPattern.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc_commons.plan.relational.utils.matching; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java similarity index 75% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java index 4afb65620a571..a8ca4cb17dcd3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern; +package org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Match; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Match; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PatternVisitor; import java.util.stream.Stream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java similarity index 79% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java index 61bbf0d04937c..65d6cfb56d255 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern; +package org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Match; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Match; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PatternVisitor; import java.util.Optional; import java.util.stream.Stream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java similarity index 81% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java index 098e3e8dfb88f..4c90db256b84b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern; +package org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Match; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Match; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PatternVisitor; import java.util.Optional; import java.util.function.BiPredicate; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java similarity index 80% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java index 824be1e90a77a..5ff2343d27e65 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern; +package org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Match; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Match; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PatternVisitor; import java.util.Optional; import java.util.stream.Stream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java similarity index 78% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java index f847e3d212759..abbf7ebaa4ef4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern; +package org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Match; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PatternVisitor; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Property; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PropertyPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Match; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Property; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PropertyPattern; import java.util.Optional; import java.util.function.BiFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/service/AbstractTemporaryQueryDataFileService.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/service/AbstractTemporaryQueryDataFileService.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/service/AbstractTemporaryQueryDataFileService.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/service/AbstractTemporaryQueryDataFileService.java index 13a9acac1cf54..af6932184344c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/service/AbstractTemporaryQueryDataFileService.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/service/AbstractTemporaryQueryDataFileService.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.service; +package org.apache.iotdb.calc_commons.service; import org.apache.iotdb.commons.exception.StartupException; import org.apache.iotdb.commons.file.SystemFileFactory; import org.apache.iotdb.commons.service.IService; import org.apache.iotdb.commons.service.ServiceType; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList.SerializationRecorder; +import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList.SerializationRecorder; import org.apache.tsfile.external.commons.io.FileUtils; import org.slf4j.Logger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java index 858f3bd29470d..9be2fcf89d34a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.service; +package org.apache.iotdb.calc_commons.service; public interface ITemporaryQueryDataFileServiceProvider { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java index ca13b14bc43b5..2066e0b8fd8e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.adapter; +package org.apache.iotdb.calc_commons.transformation.dag.adapter; import org.apache.iotdb.commons.udf.utils.UDFBinaryTransformer; import org.apache.iotdb.udf.api.collector.PointCollector; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java index 42c0db3a2d67a..6c30e83953c5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column; +package org.apache.iotdb.calc_commons.transformation.dag.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ColumnCache.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnCache.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ColumnCache.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnCache.java index be0eaa390f3c7..57cefa893e346 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ColumnCache.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnCache.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column; +package org.apache.iotdb.calc_commons.transformation.dag.column; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnTransformer.java index 06b2fc0d09bae..bb1022516894e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnTransformer.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column; +package org.apache.iotdb.calc_commons.transformation.dag.column; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.NullColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.NullColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; public abstract class ColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java index 1cabc26309a22..d8c8ee55057cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column; +package org.apache.iotdb.calc_commons.transformation.dag.column; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java index 6b8500f14874e..cacb028130084 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column; +package org.apache.iotdb.calc_commons.transformation.dag.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java index ebe1084c5bfff..7ede250931101 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column; +package org.apache.iotdb.calc_commons.transformation.dag.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java index f0db702692696..65c0182c7c04d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java index da9f0d75a9e98..ab9b455ad8791 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java index c00c45bd03bc5..5f6e62273f03d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java index f425e137d695e..5b736fbe9f2f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java index f7449ea66a645..8a917a8411145 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java index 4dfbfef222538..06d57836a520c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java index a26b8564f22a6..c69497e4c89b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java index 054b3c68f01ee..5e0e3b592de47 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -28,9 +28,9 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBool; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBool; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; public abstract class CompareBinaryColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java index 37d8e9625aac2..2edf313cb1f72 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import java.util.Arrays; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; public class CompareEqualToColumnTransformer extends CompareBinaryColumnTransformer { public CompareEqualToColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java index 7c5ab298b9d8f..763d8f6cd6188 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java index e228ed7fdca46..ca4a67e8c9327 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java index 23d9e477640a8..1628413c674b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java index b5e72fe451562..a6d7f55d0e034 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java index 8f4d1052daece..188a750c71d78 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import java.util.Arrays; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; public class CompareNonEqualColumnTransformer extends CompareBinaryColumnTransformer { public CompareNonEqualColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java index 5b6ad581dc376..0f45a12097d7e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class HmacColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java index 24714e5350ff4..db1cc1bb38e3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -29,7 +29,7 @@ import java.util.Optional; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; public class Like2ColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java index 63e9966daeb2e..b5cf21eab84a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java index b7d01830b82d6..a32ea43ef1950 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java index bf739b16ac4e1..42595a45055fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java index 13f181f3baf35..b3928f9d714da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java index 3a2d2d469725e..e90322e9ec814 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies; @FunctionalInterface public interface HmacStrategy { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java index 28a5a3d1ada26..f9e9f733ea889 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf; +package org.apache.iotdb.calc_commons.transformation.dag.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java index 43fe7d94de431..4187597ccb586 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf; +package org.apache.iotdb.calc_commons.transformation.dag.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java index 07f0c6febd89d..77916511cdc30 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf; +package org.apache.iotdb.calc_commons.transformation.dag.column.leaf; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java index 44b14950c44fc..3719d7d93203c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf; +package org.apache.iotdb.calc_commons.transformation.dag.column.leaf; import org.apache.tsfile.read.common.block.column.NullColumn; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java index 1a9604a28f129..00ac77bc5def1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf; +package org.apache.iotdb.calc_commons.transformation.dag.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java index 8c4a3d532c9fc..05399cc0f8a84 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java index 135657223d5fe..194706f575790 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java index 9162046644668..7bb5d9634d4d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java index fce268a08d465..3086ff286f7ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java index 58d7efc40c2b4..822e826801fb7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java index 7980d20047f1d..a4c8e2788026d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java index b29c417f272b6..45dac152825b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java index e4aa504521e4c..277cc41733752 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java index 0500aa420f9e9..3f25cb22f9b9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java index 01911c9e35d73..73970cda2268e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java index 03c78f0f5b353..2ae76f9445ef7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java index 2b05bf81f253d..cfcbb82030152 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java index d81ee43ed2b54..a71153d9c9836 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java index b21ee2a30f862..554313c52d4b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java index d756ecf95eb51..72d2999db5f42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java index 2a00fa74cbcd4..7e112b1de622d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java index 1b2dd0e1c8805..575de0b9dc065 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java index 4a094aa568fa5..bf96672cd8116 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java index d6cb48ba9523d..41776d1dc6c91 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java index c89a3a38aa865..ddd8a085a4b7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java index 45e4a358f681c..6d8842102c206 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java index 44e4d99cc545a..d3c50860c3b44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java index 1ebe5f3485f26..8310312c7de18 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java index 75ec256edbc4f..f77665a9c62ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java index 4f4a4aa7df421..578711acad3db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java index 8f7ba7c1fdb2f..d6bcd488b88f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc_commons.transformation.dag.column.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java index fa6fb9f175c14..054c523b9cf2d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary; +package org.apache.iotdb.calc_commons.transformation.dag.column.ternary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBool; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBool; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; public class BetweenColumnTransformer extends CompareTernaryColumnTransformer { private final boolean isNotBetween; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java index c520ab1fd48c1..63df2b6c026e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary; +package org.apache.iotdb.calc_commons.transformation.dag.column.ternary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java index 1c2c4af184168..b34d0e9de838c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary; +package org.apache.iotdb.calc_commons.transformation.dag.column.ternary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -27,8 +27,8 @@ import org.apache.tsfile.common.regexp.LikePattern; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; public class Like3ColumnTransformer extends TernaryColumnTransformer { public Like3ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java index 65dc1979ac90f..b387ba3677391 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary; +package org.apache.iotdb.calc_commons.transformation.dag.column.ternary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.utils.BytePaddingUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.utils.BytePaddingUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java index dd730240c666f..db7aeb71d0d71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary; +package org.apache.iotdb.calc_commons.transformation.dag.column.ternary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.utils.BytePaddingUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.utils.BytePaddingUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java index 50e973df29902..d48c8bb277f19 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary; +package org.apache.iotdb.calc_commons.transformation.dag.column.ternary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java index 327e4d205a989..e6204991ce176 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.utils; +package org.apache.iotdb.calc_commons.transformation.dag.column.ternary.utils; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java index 48d37be899396..7e7aa95a59a29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.udf; +package org.apache.iotdb.calc_commons.transformation.dag.column.udf; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.RecordIterator; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.RecordIterator; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.iotdb.udf.api.relational.ScalarFunction; import org.apache.iotdb.udf.api.relational.access.Record; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java index 8f33f4d599164..d2c02e44af711 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/InColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/InColumnTransformer.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/InColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/InColumnTransformer.java index 6c7c9568b5a42..61486b38b3227 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/InColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/InColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java index 843997083f517..e0989a83b1707 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java index 6b244c82bb66b..3392e4c86abaf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -27,7 +27,7 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; public class LikeColumnTransformer extends UnaryColumnTransformer { private final LikePattern pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java index de4585e8d4f17..940efc3f043ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java index 86cfe7ee6862b..2a2b0651bfe4d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -28,7 +28,7 @@ import java.util.regex.Pattern; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; public class RegularColumnTransformer extends UnaryColumnTransformer { private final Pattern pattern; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java index 4bfb12dacdcd5..7b9d1a61f0403 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java index d4a30665fa937..b6feac0867225 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java index 7a5c55383adf8..b5b2d745fc48f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java index c8bdb95c9eed1..4174b98faca4e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java index 0948ece3871bf..c8ff0430a0bd7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.CastFunctionUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.CastFunctionUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -38,7 +38,7 @@ import java.time.ZoneId; import java.time.format.DateTimeParseException; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CastFunctionUtils.ERROR_MSG; +import static org.apache.iotdb.calc_commons.transformation.dag.util.CastFunctionUtils.ERROR_MSG; import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE; public abstract class AbstractCastFunctionColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java index 2a73aaf1061fe..0797824865ba4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java index e813525a74970..1062b015c7b69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java index aa97f3ed1414f..44b8ad3932451 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java index 251a07538590f..4ba3e507c2c42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java index df774bee52ab9..327282d67a856 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java index 1bd5abaf85567..ac5f92260122c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java index c0b806a490986..74b52bec177ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java index c7db0f0b6a15d..ac9641dc916af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java index a84be5643af2c..da9bab1338373 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java index d06272e867836..62ae3bad24728 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java index dfb1e4e8a4b7a..e744b275e9bdc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java index ce56a1f49ae23..04ee69478801f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java index 9008d5da18de2..013b201b73f8c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java index f24ea131c00c3..d27dc0390c596 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java index 796c9ebd50721..567668a08f3ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java index 5f9c7e240dd91..497e9951366df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java index a78b7d73aff9e..e4c95c929133a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java index a2872acf457d3..06d5b7ec28fe9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java index 8274633fcd16c..da0cf1754c2a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java index dde6d8676c952..70899effe7e65 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java index 23b22bdbc9da3..d574d1b3a265d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToDoubleColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java index c447c0034610c..848c43b8d177b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToFloatColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java index 49bf18f7ab830..d386f4ab05b15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToIntColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java index baf1e56ca19f5..977dba0bc7ce2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; /** A transformer that converts byte array representations to long values */ public class BytesToLongColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java index 9b264bd0e5420..b1016313ce2d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java index d0aef9220440a..1a0a20ac3a524 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java index d62ad279ea535..365094f2e9b79 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java index f8408d38cd7e4..551ff80d23d49 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ConcatColumnTransformer.concat; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ConcatColumnTransformer.concat; public class Concat2ColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java index 36c6e482f3976..5b4c3a671542d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java index 81f8a791e0d99..bd44cd410b0a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java index 6dec7b5ae41e8..70e2b2d900f6c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java index 25d4230a96125..a3e17a83b67d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java index be6b8f89732e5..49af96730ec8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java index 5e19e93c4b993..6e7d33fae6e64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java index 8eff8f2daa192..5c9ee9dea8b63 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java index c0db3b53b0e55..2afc41a58bd49 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java index a9e91bf523793..9e3e25655bf6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java index 00720ba4ebb20..a8e5c1252c532 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class EndsWith2ColumnTransformer extends BinaryColumnTransformer { public EndsWith2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java index 3394bac2b20d4..6e2fcab61f094 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class EndsWithColumnTransformer extends UnaryColumnTransformer { private final byte[] suffix; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java index f48653cac7052..76a097cb97220 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java index 87e768babc757..7a3b4c69d0866 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java index dd3118034b54d..ac75b4866838f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java index d2d4d043c3b8b..1299e949d9f11 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java index 1317f0faf3364..ccc1a5fc3df80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java index 48a3d76d342ce..0e2db7ea35e13 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.inteface.CodecStrategy; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.inteface.CodecStrategy; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; /** * A generic, reusable column converter for handling all codec-based encoding/decoding functions. It diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java index a62ae950b0f1b..4e96bafef6df7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java index d72dddb8176e3..42a0e063a0528 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java index 3a92ac4044c2d..34914b465c5e7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LTrimColumnTransformer.ltrim; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LTrimColumnTransformer.ltrim; public class LTrim2ColumnTransformer extends BinaryColumnTransformer { public LTrim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java index ba653ba5fb4c6..3d3908c5feecc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; public class LTrimColumnTransformer extends UnaryColumnTransformer { private final byte[] character; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java similarity index 88% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java index 46fa4a8f060d2..5cb1d2fc79ce1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java index 8fd17ecd4eda2..3e245c21f0174 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java index ecac92c65661a..2b88356501992 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java index 4f01fb256e318..ba17a78828963 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java index d9eed5e398391..dc59a7abf123f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java similarity index 84% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java index 387fa249ae670..0350bd7c1c8ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java index 2124828051972..1d372777af799 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RTrimColumnTransformer.rtrim; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RTrimColumnTransformer.rtrim; public class RTrim2ColumnTransformer extends BinaryColumnTransformer { public RTrim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java index 27dbbe9cddcc0..04454f1e84ff9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; public class RTrimColumnTransformer extends UnaryColumnTransformer { private final byte[] character; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java index 36f6f46659213..c52d4ea33db4a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java index df2574b198061..1c96abdd384b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java index 3a9cfc811cda9..17dba89751c9e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java index 1173b0974ac89..9bf0f555ec7d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java index a7cb23c779a81..9695bd56143a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java index 750e12339c8c1..acf7be08ffff8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java index 7ff7c00b8e8f8..1c04706c9e4cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java index 88e8f85088d67..9b5c86d477ea3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java index cec8dad1afb57..54f451f7d8f8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java index b12187e3c36ff..2db2a7e8749b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java index a5484df4807fb..5bfcff6ce596c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java index 847196f07a79e..8febb7e246f59 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java similarity index 85% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java index 2272c58b8d093..4ee39f549e2f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class StartsWith2ColumnTransformer extends BinaryColumnTransformer { public StartsWith2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java index 3f39a0aeb8985..a9e89ceedcc73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java index 382e1d772c0ac..d84991076ce1d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java index 222e8c75fbaae..4bea8a3eae09a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java index c933babd73aaf..9a8b4b45b5d51 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java index d864ad822736c..b4434888e9064 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java index 5d3a1c1c03128..19997b1b4c296 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java index 42c977656ab52..b1abf1c85b2ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -29,7 +29,7 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.BytesUtils; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; public class SubString3ColumnTransformer extends TernaryColumnTransformer { public SubString3ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java index e8c1fa6a63dff..3dda375ec08ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java index 9000cd9b31b6c..d84b1bd6aa710 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java similarity index 90% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java index 4db1709974b5d..e115392e65da9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java similarity index 86% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java index c2296c903e542..efc6ccad11f75 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer.trim; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer.trim; public class Trim2ColumnTransformer extends BinaryColumnTransformer { public Trim2ColumnTransformer( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java index 6efddf3f647f1..77726a15c0a10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java index bc6d22a889693..f0e53db85614b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java similarity index 89% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java index a803c03af91fb..5bad3b51e8560 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java index 50f5856d5b523..ed16258159429 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.inteface.CodecStrategy; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.HexUtils; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util.SpookyHashV2Utils; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.inteface.CodecStrategy; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.HexUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.SpookyHashV2Utils; import com.google.common.hash.Hashing; import com.google.common.io.BaseEncoding; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java index 9fc22062936c8..99a6b8335368e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java similarity index 91% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java index 7273a0d206fa1..a4eef93dc4fc0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.inteface; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.inteface; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java index c8350102a0ec1..2a6fd49b089dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java index 1313a38f4359a..34f96b004a983 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java similarity index 87% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java index 17037e6acf6b2..a4bf5c05bf501 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.util; +package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; /** * A utility class for generating user-friendly debug information during the execution of diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDFParametersFactory.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDFParametersFactory.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDFParametersFactory.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDFParametersFactory.java index 71bc769d7c38c..7d5ba8440de6e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDFParametersFactory.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDFParametersFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.udf; +package org.apache.iotdb.calc_commons.transformation.dag.udf; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDTFExecutor.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDTFExecutor.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDTFExecutor.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDTFExecutor.java index 2df50e2794bda..57feac18ac656 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/udf/UDTFExecutor.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDTFExecutor.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.udf; +package org.apache.iotdb.calc_commons.transformation.dag.udf; import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.adapter.PointCollectorAdaptor; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.InputRowUtils; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc_commons.transformation.dag.adapter.PointCollectorAdaptor; +import org.apache.iotdb.calc_commons.transformation.dag.util.InputRowUtils; +import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.udf.api.UDTF; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowWindow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/BitwiseUtils.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/BitwiseUtils.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/BitwiseUtils.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/BitwiseUtils.java index 18fd50af28c54..df1a1330f26c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/BitwiseUtils.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/BitwiseUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.util; +package org.apache.iotdb.calc_commons.transformation.dag.util; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CastFunctionUtils.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CastFunctionUtils.java index 9b1268184b9ea..91596abf4175a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CastFunctionUtils.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CastFunctionUtils.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.util; +package org.apache.iotdb.calc_commons.transformation.dag.util; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.common.SessionInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CommonTransformUtils.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CommonTransformUtils.java index c9b02f62e4cc0..a7ee0dbc4812b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/CommonTransformUtils.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CommonTransformUtils.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.util; +package org.apache.iotdb.calc_commons.transformation.dag.util; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/InputRowUtils.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/InputRowUtils.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/InputRowUtils.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/InputRowUtils.java index 8d2ffde821829..bec96c63e18e0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/dag/util/InputRowUtils.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/InputRowUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.dag.util; +package org.apache.iotdb.calc_commons.transformation.dag.util; public class InputRowUtils { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/Cache.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/Cache.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/Cache.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/Cache.java index 264208dc2a328..29f775b335beb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/Cache.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/Cache.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.datastructure; +package org.apache.iotdb.calc_commons.transformation.datastructure; import java.util.LinkedHashMap; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/SerializableList.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/SerializableList.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/SerializableList.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/SerializableList.java index 5cef9bce255ee..f445f2762a661 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/SerializableList.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/SerializableList.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.datastructure; +package org.apache.iotdb.calc_commons.transformation.datastructure; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.db.calc_commons.service.AbstractTemporaryQueryDataFileService; +import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.tsfile.utils.PublicBAOS; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java index d9fbf6551cb21..50c31a893d4a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator; +package org.apache.iotdb.calc_commons.transformation.datastructure.iterator; import java.io.IOException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java index 28a3421efd1a3..ba7e889f14441 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator; +package org.apache.iotdb.calc_commons.transformation.datastructure.iterator; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.SerializableRowList; +import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.calc_commons.transformation.datastructure.row.SerializableRowList; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java index d96262dd38ea9..1739cf484b846 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator; +package org.apache.iotdb.calc_commons.transformation.datastructure.iterator; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.SerializableTVList; +import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc_commons.transformation.datastructure.tv.SerializableTVList; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java index 34c5863cfe21f..0f5df3073b9c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.datastructure.row; +package org.apache.iotdb.calc_commons.transformation.datastructure.row; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.Cache; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; +import org.apache.iotdb.calc_commons.transformation.datastructure.Cache; +import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; +import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/row/SerializableRowList.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/SerializableRowList.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/row/SerializableRowList.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/SerializableRowList.java index b3f63ceb69bb0..1b70a6af37c2c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/row/SerializableRowList.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/SerializableRowList.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.datastructure.row; +package org.apache.iotdb.calc_commons.transformation.datastructure.row; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList; +import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.tsfile.block.column.Column; @@ -36,8 +36,8 @@ import java.util.List; import static org.apache.iotdb.commons.conf.IoTDBConstant.MB; -import static org.apache.iotdb.db.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_ARRAY_HEADER_SIZE; -import static org.apache.iotdb.db.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_OBJECT_HEADER_SIZE; +import static org.apache.iotdb.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_ARRAY_HEADER_SIZE; +import static org.apache.iotdb.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_OBJECT_HEADER_SIZE; public class SerializableRowList implements SerializableList { private final SerializationRecorder serializationRecorder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java index 43fc2b06dc5c8..7702120b42ccb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.datastructure.tv; +package org.apache.iotdb.calc_commons.transformation.datastructure.tv; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.util.BinaryUtils; +import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; +import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.calc_commons.transformation.datastructure.util.BinaryUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java index c79c2936e5f32..1af664ac0c1e5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.datastructure.tv; +package org.apache.iotdb.calc_commons.transformation.datastructure.tv; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.Cache; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.calc_commons.transformation.datastructure.Cache; +import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/SerializableTVList.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/SerializableTVList.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/SerializableTVList.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/SerializableTVList.java index 758bd48c339f6..1fb60a5a9c54b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/tv/SerializableTVList.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/SerializableTVList.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.datastructure.tv; +package org.apache.iotdb.calc_commons.transformation.datastructure.tv; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList; +import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; @@ -38,8 +38,8 @@ import static com.google.common.base.Preconditions.checkState; import static org.apache.iotdb.commons.conf.IoTDBConstant.MB; -import static org.apache.iotdb.db.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_ARRAY_HEADER_SIZE; -import static org.apache.iotdb.db.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_OBJECT_HEADER_SIZE; +import static org.apache.iotdb.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_ARRAY_HEADER_SIZE; +import static org.apache.iotdb.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_OBJECT_HEADER_SIZE; public class SerializableTVList implements SerializableList { protected final SerializationRecorder serializationRecorder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/util/BinaryUtils.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/util/BinaryUtils.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/util/BinaryUtils.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/util/BinaryUtils.java index f0263b20db544..74d915805bcfe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/transformation/datastructure/util/BinaryUtils.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/util/BinaryUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.transformation.datastructure.util; +package org.apache.iotdb.calc_commons.transformation.datastructure.util; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/HeapTraversal.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/HeapTraversal.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/HeapTraversal.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/HeapTraversal.java index b37e69079b038..c5da07587ad7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/HeapTraversal.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/HeapTraversal.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils; +package org.apache.iotdb.calc_commons.utils; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectFileService.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileService.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectFileService.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileService.java index 7aa1b0e1822aa..df32dfe20bd62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectFileService.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils; +package org.apache.iotdb.calc_commons.utils; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectFileServiceProvider.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileServiceProvider.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectFileServiceProvider.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileServiceProvider.java index bc7fbe702cb2d..8a310e38ce9a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectFileServiceProvider.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileServiceProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils; +package org.apache.iotdb.calc_commons.utils; public interface IObjectFileServiceProvider { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectPath.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectPath.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectPath.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectPath.java index aba3142b52c29..ffefc7aff4027 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/IObjectPath.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectPath.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils; +package org.apache.iotdb.calc_commons.utils; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/ObjectTypeUtils.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/ObjectTypeUtils.java similarity index 99% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/ObjectTypeUtils.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/ObjectTypeUtils.java index 75251408a4798..9b739dc40ec07 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/ObjectTypeUtils.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/ObjectTypeUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils; +package org.apache.iotdb.calc_commons.utils; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/constant/SqlConstant.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/constant/SqlConstant.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/constant/SqlConstant.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/constant/SqlConstant.java index 919a3ce08762b..f5fc601df1afd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/constant/SqlConstant.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/constant/SqlConstant.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils.constant; +package org.apache.iotdb.calc_commons.utils.constant; import org.apache.iotdb.commons.path.PartialPath; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/MergeSortHeap.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortHeap.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/MergeSortHeap.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortHeap.java index b5491333f0cbe..41308ab24b479 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/MergeSortHeap.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortHeap.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils.datastructure; +package org.apache.iotdb.calc_commons.utils.datastructure; import java.util.Arrays; import java.util.Comparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/MergeSortKey.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortKey.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/MergeSortKey.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortKey.java index 1ae5060ab1c6d..12a2f3bfe7f78 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/MergeSortKey.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortKey.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils.datastructure; +package org.apache.iotdb.calc_commons.utils.datastructure; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/SortKey.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/SortKey.java similarity index 94% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/SortKey.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/SortKey.java index 8db76b13c7d9b..d24863960a7b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/datastructure/SortKey.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/SortKey.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils.datastructure; +package org.apache.iotdb.calc_commons.utils.datastructure; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/DiskSpiller.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/DiskSpiller.java similarity index 98% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/DiskSpiller.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/DiskSpiller.java index 5d2b440be9f61..f2d7930d169b7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/DiskSpiller.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/DiskSpiller.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils.sort; +package org.apache.iotdb.calc_commons.utils.sort; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/FileSpillerReader.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/FileSpillerReader.java similarity index 97% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/FileSpillerReader.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/FileSpillerReader.java index bbc3cc1a43f39..0a126ba5f49ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/FileSpillerReader.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/FileSpillerReader.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils.sort; +package org.apache.iotdb.calc_commons.utils.sort; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/MemoryReader.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/MemoryReader.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/MemoryReader.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/MemoryReader.java index 35da47435640a..03d314e3ede91 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/MemoryReader.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/MemoryReader.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils.sort; +package org.apache.iotdb.calc_commons.utils.sort; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/SortBufferManager.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortBufferManager.java similarity index 95% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/SortBufferManager.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortBufferManager.java index 90a451c100b25..c43f75dea7064 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/SortBufferManager.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortBufferManager.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils.sort; +package org.apache.iotdb.calc_commons.utils.sort; -import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; public class SortBufferManager { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/SortReader.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortReader.java similarity index 92% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/SortReader.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortReader.java index a3c18344035d9..e4460bcf9accb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/SortReader.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortReader.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils.sort; +package org.apache.iotdb.calc_commons.utils.sort; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; public interface SortReader { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/TableDiskSpiller.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TableDiskSpiller.java similarity index 93% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/TableDiskSpiller.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TableDiskSpiller.java index 516306e339602..405b6a33b1485 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/TableDiskSpiller.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TableDiskSpiller.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils.sort; +package org.apache.iotdb.calc_commons.utils.sort; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/TreeDiskSpiller.java b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TreeDiskSpiller.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/TreeDiskSpiller.java rename to iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TreeDiskSpiller.java index 0c6d201facc8c..da41d1fefe8c9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/calc_commons/utils/sort/TreeDiskSpiller.java +++ b/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TreeDiskSpiller.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.calc_commons.utils.sort; +package org.apache.iotdb.calc_commons.utils.sort; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java index 884d557109fd3..5b1af4366269f 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java @@ -21,7 +21,7 @@ import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType; import org.apache.iotdb.confignode.consensus.request.read.ConfigPhysicalReadPlan; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; public class ShowTTLPlan extends ConfigPhysicalReadPlan { private final String[] pathPattern; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java index 57eb6327c1bff..533e20d0c7784 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java @@ -152,7 +152,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TSubscribeReq; import org.apache.iotdb.confignode.rpc.thrift.TUnsubscribeReq; import org.apache.iotdb.consensus.ConsensusFactory; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.BatchProcessException; import org.apache.iotdb.rpc.RpcUtils; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml index ffba7f4bb6479..6dd2d520026bf 100644 --- a/iotdb-core/datanode/pom.xml +++ b/iotdb-core/datanode/pom.xml @@ -69,6 +69,11 @@ node-commons 2.0.7-SNAPSHOT + + org.apache.iotdb + calc_commons + 2.0.7-SNAPSHOT + org.apache.iotdb isession diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java index 459dec3333191..b93b25033871b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java @@ -29,7 +29,7 @@ import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskProcessorRuntimeEnvironment; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.utils.PathUtils; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDFParametersFactory; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.agent.plugin.dataregion.PipeDataRegionPluginAgent; import org.apache.iotdb.db.pipe.event.common.row.PipeResetTabletRow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java index e298cd9c7d7d5..2867b49802d3c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java @@ -32,7 +32,7 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java index 875b3428f6bce..e132eab87971e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java @@ -21,14 +21,14 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.calc_commons.execution.aggregation.BinaryModeAccumulator; import org.apache.iotdb.db.calc_commons.execution.aggregation.BooleanModeAccumulator; import org.apache.iotdb.db.calc_commons.execution.aggregation.DoubleModeAccumulator; import org.apache.iotdb.db.calc_commons.execution.aggregation.FloatModeAccumulator; import org.apache.iotdb.db.calc_commons.execution.aggregation.IntModeAccumulator; import org.apache.iotdb.db.calc_commons.execution.aggregation.LongModeAccumulator; -import org.apache.iotdb.db.calc_commons.execution.aggregation.VarianceAccumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.VarianceAccumulator; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AvgAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AvgAccumulator.java index 62d18e42625b8..150214ed706d4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AvgAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AvgAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountAccumulator.java index bce369a83718f..81be0f8093f42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountIfAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountIfAccumulator.java index 34896d529118e..cb77adb5e8977 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountIfAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountIfAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountTimeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountTimeAccumulator.java index 0580250fef3b9..8500d569c6c27 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountTimeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountTimeAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/ExtremeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/ExtremeAccumulator.java index 07fcc81d99344..53b78623512b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/ExtremeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/ExtremeAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/FirstValueAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/FirstValueAccumulator.java index dcb9855656e52..f994b5cee88d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/FirstValueAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/FirstValueAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/LastValueAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/LastValueAccumulator.java index 5fa014b569992..922ee29790863 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/LastValueAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/LastValueAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxMinByBaseAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxMinByBaseAccumulator.java index aa53098f4a2e2..08ccde5e36159 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxMinByBaseAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxMinByBaseAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxTimeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxTimeAccumulator.java index 3d9881ba736dd..ea81997461539 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxTimeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxTimeAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxValueAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxValueAccumulator.java index 617136b6bf710..74e311c0aa08d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxValueAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxValueAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinTimeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinTimeAccumulator.java index 8d2159ac7c98e..e7e1d1bf8d8da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinTimeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinTimeAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinValueAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinValueAccumulator.java index 1c1ee17ff177e..1e54c42b89916 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinValueAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinValueAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/SumAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/SumAccumulator.java index 115c643597f44..3b396e1eb452a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/SumAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/SumAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TimeDurationAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TimeDurationAccumulator.java index 88a502a7faee4..4ffe03def5816 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TimeDurationAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TimeDurationAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java index 4eee8a0562fd7..104763eb5e2a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.tsfile.block.column.Column; @@ -35,8 +35,8 @@ import java.util.List; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.AGGREGATION_FROM_RAW_DATA; -import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.AGGREGATION_FROM_STATISTICS; +import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.AGGREGATION_FROM_RAW_DATA; +import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.AGGREGATION_FROM_STATISTICS; public class TreeAggregator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java index a5f915155eb0f..b3a7bb9fc6478 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDFParametersFactory; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.udf.api.State; import org.apache.iotdb.udf.api.UDAF; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java index a3c951b16a765..f090efaaee5ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java index 5eb38618154df..acb97baf4ca0d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java index a3df0481ed908..78de2dd068fb4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java index 73ebd4b9c5c61..c891463c77c22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java index 688459ac016db..d44cbc39f1d6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java @@ -22,7 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java index c651cecd08b81..b4d43b59d1a89 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java index bdfb4198cd5c5..b957ce900761f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.tsfile.read.common.TimeRange; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java index 221d7b2e26a03..289e9f6c8f816 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.driver; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.execution.operator.source.DataSourceOperator; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; @@ -31,7 +31,7 @@ import java.util.List; -import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.QUERY_RESOURCE_INIT; +import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.QUERY_RESOURCE_INIT; import static org.apache.iotdb.db.storageengine.dataregion.VirtualDataRegion.UNFINISHED_QUERY_DATA_SOURCE; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java index 305bd5c9033f8..e5307631ba348 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.utils.FileUtils; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; @@ -55,8 +55,8 @@ import static com.google.common.base.Verify.verify; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static java.lang.Boolean.TRUE; -import static org.apache.iotdb.db.calc_commons.execution.operator.Operator.NOT_BLOCKED; -import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.DRIVER_INTERNAL_PROCESS; +import static org.apache.iotdb.calc_commons.execution.operator.Operator.NOT_BLOCKED; +import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.DRIVER_INTERNAL_PROCESS; public abstract class Driver implements IDriver { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/SchemaDriver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/SchemaDriver.java index b86aeb13e6b4a..1a5578baa2e94 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/SchemaDriver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/SchemaDriver.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.driver; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import com.google.common.util.concurrent.SettableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java index 18d7eed3cb656..42aee021c3fe4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java @@ -31,7 +31,7 @@ import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.PatternTreeMap; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java index d1bde67f8fa9d..b8d27d9678d8e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.fragment; import org.apache.iotdb.commons.utils.FileUtils; -import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java index 4b7bc8e874cac..9576edfdca54c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.QueryTimeoutException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -64,7 +64,7 @@ import java.util.concurrent.atomic.AtomicLong; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.LOCAL_EXECUTION_PLANNER; +import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.LOCAL_EXECUTION_PLANNER; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceExecution.createFragmentInstanceExecution; import static org.apache.iotdb.db.queryengine.execution.schedule.queue.IndexedBlockingQueue.TOO_MANY_CONCURRENT_QUERIES_ERROR_MSG; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java index c8b5bbc49e543..a841345619594 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java index fbd847d09b08e..f5eba1f187f5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java @@ -27,8 +27,8 @@ import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java index 8eda8b882d658..7b2d85567b726 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java index 4df031d59a8e1..5aca8937b5644 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java @@ -21,8 +21,8 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.IntoProcessException; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java index d61db10f4ca97..bb091d8449386 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java index c7c8e7af016b3..ae64a6a4e603b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java index 929a31d614e41..bde199d6dd4a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/ColumnInjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java index 7df06698676d3..b445d172cd869 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.columngenerator.ColumnGenerator; 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 5107e953fc91a..9b67451be6a5f 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 @@ -24,7 +24,7 @@ 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.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.IntoProcessException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java index ed95cdc40f61b..a501d45e1c7fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java index 51ef377768f4d..998eae6f18069 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java index 98015095cc4a7..6a9f91103d808 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/SingleDeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java index d517602d404f2..f442d8d9db090 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java index da80d054d4484..e20509caf6860 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; 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/SlidingWindowAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java index 41935c17a4b63..3f03a9cd05091 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow.SlidingWindowAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java index de7041c487ebd..74eb0485addb9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java @@ -26,7 +26,7 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java index 687af382d0467..bb3ae6502c9e9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; 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/TransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java index d2180351c93e3..ba87453793e3c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java @@ -25,8 +25,8 @@ import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; 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/TreeFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java index 5d5590bc9fe31..4d7d4331e20aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractFillOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.AbstractFillOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java index 465582af3a31c..3bb7a4af3d555 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java @@ -24,7 +24,7 @@ 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.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java index 4ffa1d1cf3202..b493813a37bcc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractLinearFillOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.AbstractLinearFillOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java index a437efdb766d7..831adb4582803 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java index 117320c811802..fe77ad7b89bf3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.SortOperator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.calc_commons.utils.sort.TreeDiskSpiller; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.SortOperator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.utils.sort.TreeDiskSpiller; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java index e0b080a24c64a..30650313d2cb3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.TopKOperator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.TopKOperator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java index 43c33a94855fb..a7575c13a7d4d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; import org.apache.iotdb.db.exception.runtime.ModelInferenceProcessException; import org.apache.iotdb.db.protocol.client.an.AINodeClient; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java index 171795ab497b9..f2a28bf89a4b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.schema.column.ColumnHeader; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.CopyToTsFileOptions; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.TsFileFormatCopyToWriter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java index 3baf72b922957..0db76abdb8b4f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.planner.RelationPlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java index 65f4a7223d06d..731b0d127ed09 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.ColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java index 697cb70f3ad03..ec9dd6817fcc4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java index 26f9c17006408..99c4fd76511ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java index af95c9e78ea0b..623d03c0356bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java index e4a959fb9fa76..0e73e06f6e8e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java index 1aa4d4c011301..9c50f795b0aa3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java @@ -14,8 +14,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; -import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.plan.statement.component.NullOrdering; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java index 08d7e71cf9fa4..2fa977c2c8d68 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; 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/last/AlignedUpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java index 6b3cc5fc5b9ae..3deb1bc8ebbec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java @@ -23,7 +23,7 @@ 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.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java index 832300f4f5771..025893c35a851 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java index f88d731376601..8c5966bb456df 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java index deef564d179b3..7fd2f9dc3655a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java index e59c7c2adfac0..0bb7534fc7682 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java index 72c30c5a428fd..9470cdc4534d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java index aab7c4fc2e2ff..9278671ebc85b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java index 084dbd995f9e6..564000037f9ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java index 996508364fb9d..a84d496ca57af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java index 9eeeb45fcd263..75ae53ad05b21 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java index 93a0a4ed45787..fe00d15d7d7aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 d11d840f0db9a..5298abc18c27e 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 @@ -24,8 +24,8 @@ 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.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 70c4dc4fb62b6..2547dd0613704 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 @@ -24,8 +24,8 @@ 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.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 69038f85f8fe4..dc1f58288a56c 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 @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java index a0f3a6ea3c96a..8ad55123e8e9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java index b1fd6b2e6ea47..8edb75a088944 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 3f6148914a4f9..ef85e83da6cb5 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 @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 acc8de457ff5c..24fe2800119bb 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo; @@ -44,7 +44,7 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator.constructFilteredTsBlock; +import static org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator.constructFilteredTsBlock; public class DeviceAttributeUpdater extends DeviceUpdater { private final List commonTransformerList; 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 fa0a05c07bf6d..a29b1fc67ece4 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.rescon.MemSchemaRegionStatistics; 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/DevicePredicateFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateFilter.java index 017752874024c..ffb9f24306117 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 @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import java.util.Iterator; 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 bf36d17e83d51..806e681e17bc8 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.utils.PathUtils; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; @@ -39,7 +39,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator.satisfy; +import static org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator.satisfy; import static org.apache.iotdb.db.queryengine.execution.operator.schema.source.TableDeviceQuerySource.transformToTableDeviceTsBlockColumns; public abstract class DevicePredicateHandler implements AutoCloseable { 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 91d45f4742575..2dec8da4a6747 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 @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.impl.ShowDevicesResult; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java index 8435d2160b596..6563abb30af0e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; 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/sink/ShuffleHelperOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java index d33298cef0119..f8c93c8b140ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; 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/sink/SinkOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperator.java index 947cf7f12dce8..ac566b73011db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java index 317d27f2fd3df..cf38e6fccb87d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; public abstract class AbstractSourceOperator extends AbstractOperator implements SourceOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java index c286548f857ea..125fe0d4b21f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; public interface SourceOperator extends Operator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java index 60d307090d05b..32fdf835e8db1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java index fe6a236ec1ee6..6b7da20945cd4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java @@ -30,7 +30,7 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public abstract class AbstractDefaultAggTableScanOperator extends AbstractAggTableScanOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java index d55b47cb8203f..f2addf69f5e51 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.path.AlignedFullPath; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractSeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java index cb0f72849bd05..24cc7bca5b2f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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 index 5cdaee77bc97c..7621e94b18ca2 100644 --- 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 @@ -71,7 +71,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowTopicReq; import org.apache.iotdb.confignode.rpc.thrift.TTableInfo; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java index 46d122b307de5..2d732ee34aca7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; @@ -52,7 +52,7 @@ import static com.google.common.base.Preconditions.checkState; import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_PRIMITIVE_TYPE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_TIME_VALUE_PAIR; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java index 34a1907ac59f9..fd403e209d8db 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class MeasurementToTableViewAdaptorUtils { private MeasurementToTableViewAdaptorUtils() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java index fac0c175f1bf9..9f93b735f7b2b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; @@ -38,8 +38,8 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_DEVICE_INDEX_STRING; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_DEVICE_INDEX_STRING; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class TreeNonAlignedDeviceViewAggregationScanOperator extends AbstractDefaultAggTableScanOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java index cf0e33838601e..3995ffe719645 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java index 8fbeade8b86ed..7cc98be2193e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java @@ -26,7 +26,7 @@ import org.apache.iotdb.commons.service.IService; import org.apache.iotdb.commons.service.ServiceType; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java index 3452102b1f14e..8732878ed2f4d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.schedule; import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.exception.CpuNotEnoughException; 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 ec4b531808a6d..ba203ce1997e6 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 @@ -40,7 +40,7 @@ import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.utils.TimePartitionUtils; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.ainode.GetModelInfoException; @@ -180,8 +180,8 @@ import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_MATCH_PATTERN; 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.calc_commons.utils.constant.SqlConstant.COUNT_TIME_HEADER; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.TREE_MODEL_DATABASE_PREFIX; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME_HEADER; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.TREE_MODEL_DATABASE_PREFIX; 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.plan.analyze.AnalyzeUtils.removeLogicalView; 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 5f3d8c794f231..1ec48ce20e5ce 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 @@ -27,7 +27,7 @@ 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.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.expression.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java index ffbc614bb2c87..14e039ce90367 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.binary.ArithmeticBinaryExpression; 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 88426a8e21134..2ddc497767cbd 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 @@ -45,7 +45,7 @@ import java.util.Set; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.ENDTIME; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; 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/analyze/load/TreeSchemaAutoCreatorAndVerifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java index f2864cd588ec6..b2264df2cb48c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java @@ -33,7 +33,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TGetDatabaseReq; import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadAnalyzeException; import org.apache.iotdb.db.exception.load.LoadAnalyzeTypeMismatchException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java index 89456cfc949f6..0352f344cc6a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.template.Template; -import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.protocol.session.SessionManager; 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 9cedd1e4ef36a..ba898d868f285 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 @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; -import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.KilledByOthersException; @@ -73,7 +73,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Throwables.throwIfUnchecked; import static org.apache.iotdb.commons.utils.ErrorHandlingCommonUtils.getRootCause; -import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.WAIT_FOR_RESULT; +import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.WAIT_FOR_RESULT; import static org.apache.iotdb.db.queryengine.common.DataNodeEndPoints.isSameNode; import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java index 16c11cb1aaba0..c7f604c77f460 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java @@ -391,7 +391,7 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_MATCH_SCOPE; import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_RESULT_NODES; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.ROOT; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.ROOT; import static org.apache.iotdb.db.protocol.client.ConfigNodeClient.MSG_RECONNECTION_FAIL; import static org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory.getShowExternalServiceHeader; import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.externalservice.ShowExternalServiceTask.appendServiceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java index 6304f3448be10..87200f0c51df5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java index 61e3242e9d5ce..a696e5c2b1adf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java index 27b65cb9dfd1a..43f1bcbd10e93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.leaf; import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java index 4988c552ef91d..969cc29f4c2e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; 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/expression/multi/builtin/BuiltInScalarFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java index d7798661e5294..0322e2bb38b24 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java index d335091cc80cc..3dcd34aa631bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; @@ -34,7 +34,7 @@ import java.time.ZoneId; import java.util.Map; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.CAST_TYPE; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.CAST_TYPE; public class CastFunctionHelper implements BuiltInScalarFunctionHelper { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java index ee9c60f6c834c..037c9f900f60e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java index 1ddef210f9b7e..2623e3a355a91 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; @@ -33,8 +33,8 @@ import java.util.Map; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.REPLACE_FROM; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.REPLACE_TO; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.REPLACE_FROM; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.REPLACE_TO; public class ReplaceFunctionHelper implements BuiltInScalarFunctionHelper { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java index 805536a2ac18d..670ebc8e4a347 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; @@ -33,7 +33,7 @@ import java.util.Map; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.ROUND_PLACES; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.ROUND_PLACES; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.checkFunctionExpressionInputSize; public class RoundFunctionHelper implements BuiltInScalarFunctionHelper { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java index 15c184d0178b3..dc89a9be0818f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; @@ -34,11 +34,11 @@ import java.util.LinkedHashMap; import java.util.Map; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_FOR; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_FROM; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_IS_STANDARD; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_LENGTH; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_START; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_FOR; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_FROM; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_IS_STANDARD; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_LENGTH; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_START; public class SubStringFunctionHelper implements BuiltInScalarFunctionHelper { public static final String BLANK_STRING = " "; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java index f8390678b932f..8ccd54f5b8125 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java index e82387e629575..a4aced0bd1cf2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java index 4c78297fe2ef7..759195135ef17 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java index 3cb7fd5ac6330..e15d65eaa8887 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java index a1149e22dfc97..72b928bd628be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java @@ -21,37 +21,37 @@ import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.TreeCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticDivisionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticModuloColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessThanColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.LogicAndColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.LogicOrColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.TreeCaseWhenThenColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticDivisionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticModuloColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareLessThanColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.LogicAndColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.LogicOrColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.LongDivisionLongColumnTransformer; import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.LongModulusLongColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.NullColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.multi.MappableUDFColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.BetweenColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.ArithmeticNegationColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.InColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LikeColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.RegularColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.NullColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.multi.MappableUDFColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.BetweenColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.ArithmeticNegationColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.InColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LikeColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.RegularColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java index 405ec519f234c..0e1e087bac433 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java @@ -27,7 +27,7 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; public class CountTimeAggregationAmountVisitor extends CollectVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java index 9e5758d4bc0a1..9be42a2083850 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java index 1db12d8fffa85..3016e96813408 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java index 854310102323b..99efbe0df02f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; @@ -44,7 +44,7 @@ import java.util.List; import java.util.stream.Collectors; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; import static org.apache.iotdb.db.utils.TypeInferenceUtils.bindTypeForBuiltinAggregationNonSeriesInputExpressions; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java index e2251bff7b638..b8ae3338fb02b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.expression.Expression; @@ -41,7 +41,7 @@ import java.util.List; import java.util.stream.Collectors; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructBinaryExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java index 3b0f39a01fb13..8c2c9f71bd9d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; @@ -41,7 +41,7 @@ import java.util.List; import java.util.stream.Collectors; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java index d9fe4ab4b078b..ce99b0522246c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; 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 7db7d383f2472..072202412b743 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 @@ -74,7 +74,7 @@ import java.util.Set; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; public class AggregationPushDown implements PlanOptimizer { 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 5746ee12effdf..406893ddea6e5 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 @@ -51,7 +51,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.PathUtils; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; @@ -311,18 +311,18 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.CAST_FUNCTION; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.CAST_TYPE; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.REPLACE_FROM; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.REPLACE_FUNCTION; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.REPLACE_TO; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.ROUND_FUNCTION; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.ROUND_PLACES; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_FUNCTION; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_IS_STANDARD; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_LENGTH; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUBSTRING_START; +import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.CAST_FUNCTION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.CAST_TYPE; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.REPLACE_FROM; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.REPLACE_FUNCTION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.REPLACE_TO; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.ROUND_FUNCTION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.ROUND_PLACES; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_FUNCTION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_IS_STANDARD; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_LENGTH; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_START; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.canPushDownLimitOffsetToGroupByTime; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.pushDownLimitOffsetToTimeParameter; import static org.apache.iotdb.db.queryengine.plan.relational.sql.parser.AstBuilder.lowerIdentifier; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java index 63d932c017931..e36071d7e4c60 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.SqlLexer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 20a393cd30e72..764739d221a1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -36,17 +36,17 @@ 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.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.db.calc_commons.execution.relational.ColumnTransformerBuilder; -import org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.calc_commons.execution.relational.ColumnTransformerBuilder; +import org.apache.iotdb.calc_commons.plan.planner.TableOperatorGenerator; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; @@ -175,17 +175,17 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; -import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.AVG; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.EXTREME; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_AGGREGATION; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.MAX; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.MIN; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.SUM; +import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.AVG; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.EXTREME; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_AGGREGATION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.MAX; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.MIN; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUM; import static org.apache.iotdb.db.queryengine.common.DataNodeEndPoints.isSameNode; import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DELIMITER_BETWEEN_ID; import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DOWNSTREAM_PLAN_NODE_ID; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java index 133fe593fcda4..be4fcb46e1942 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.plan.planner.ITableOperatorGeneratorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.plan.planner.ITableOperatorGeneratorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java index f66e0db29eec6..680afc1c90dcf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java @@ -25,8 +25,8 @@ import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.IFullPath; -import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; 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 aa55a97181e27..e5c3f768dc536 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 @@ -129,8 +129,8 @@ import static org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy.LINEAR; 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.calc_commons.utils.constant.SqlConstant.LAST_VALUE; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.MAX_TIME; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_VALUE; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.MAX_TIME; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java index 2c70b2a47b6d0..9d3e65b771e35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.UNKNOWN_DATATYPE; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.UNKNOWN_DATATYPE; public class OperatorGeneratorUtil { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index 9a9c5d55fff7b..875beb396f098 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -35,24 +35,24 @@ 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.db.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.AggregationMergeSortOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.CollectOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.AggregationMergeSortOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.CollectOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BinaryConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BooleanConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.FloatConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.IntConstantFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.LongConstantFill; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.DeviceContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java index 3ef0946559ce6..0af02f8741325 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.driver.DataDriver; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; import org.apache.iotdb.db.queryengine.execution.driver.Driver; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java index cf92eb239be49..efa0539eeca55 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java @@ -36,7 +36,7 @@ import org.apache.iotdb.commons.schema.table.Audit; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; @@ -109,11 +109,11 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.LAST_VALUE; import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.AVG; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_IF; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.DIFF; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_VALUE; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.TIME_DURATION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.AVG; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_IF; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.DIFF; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_VALUE; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.TIME_DURATION; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionTypeAnalyzer.analyzeExpression; import static org.apache.iotdb.db.queryengine.plan.planner.LogicalPlanBuilder.updateTypeProviderByPartialAggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java index f3f1b21d20c62..4f2e497ae13b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; public class ConsumeAllChildrenPipelineMemoryEstimator extends PipelineMemoryEstimator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java index 1f6c463f1504b..b530b2b861092 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; public class ConsumeChildrenOneByOnePipelineMemoryEstimator extends PipelineMemoryEstimator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/FakedMemoryReservationManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/FakedMemoryReservationManager.java index 8248ba580ea0c..db845993226da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/FakedMemoryReservationManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/FakedMemoryReservationManager.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/NotThreadSafeMemoryReservationManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/NotThreadSafeMemoryReservationManager.java index dfee67c01bd6b..5da8297a9d244 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/NotThreadSafeMemoryReservationManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/NotThreadSafeMemoryReservationManager.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java index d19799642082b..ac875356ca8c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import java.util.LinkedList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java index 4be909d7a2d03..59e1f652a150d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; public class PipelineMemoryEstimatorFactory { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java index d4948863764f7..21592ec845402 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.db.calc_commons.utils.IObjectPath; +import org.apache.iotdb.calc_commons.utils.IObjectPath; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java index 745d72fec3fe7..4ca26b3d468f6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java @@ -21,7 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -37,8 +37,8 @@ import java.util.Objects; import java.util.stream.Collectors; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_VALUE; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.STDDEV; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_VALUE; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.STDDEV; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.addPartialSuffix; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.isBuiltinAggregationName; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java index 3501c546788f2..80da25ce5cc28 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 08e89175ea795..6a75d664f2042 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -85,7 +85,7 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; @@ -152,13 +152,13 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.ROWS; import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_AGGREGATION; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_AGGREGATION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.ExpressionTreeUtils.extractExpressions; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; import static org.apache.tsfile.read.common.type.BlobType.BLOB; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index ca4c46592f35a..bf87686da4586 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -118,7 +118,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; import org.apache.iotdb.db.queryengine.execution.warnings.IoTDBWarning; @@ -279,7 +279,7 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; import static org.apache.iotdb.commons.schema.table.TsTable.TABLE_ALLOWED_PROPERTIES; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTimestampType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTimestampType; import static org.apache.iotdb.db.queryengine.execution.warnings.StandardWarningCode.REDUNDANT_ORDER_BY; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AggregationAnalyzer.verifyOrderByAggregations; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AggregationAnalyzer.verifySourceAggregations; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java index 4e6d552d81ce7..49e96d9aee4a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java @@ -76,9 +76,9 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isExtractTimeColumn; -import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; +import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isExtractTimeColumn; +import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; +import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.ConvertPredicateToTimeFilterVisitor.getLongValue; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java index 1276456c02a53..2608152de645e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java @@ -62,7 +62,7 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; +import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java index 8506599720b99..56d37d9e2c5c2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java @@ -32,7 +32,7 @@ import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinWindowFunction; -import org.apache.iotdb.db.calc_commons.plan.relational.metadata.ITypeMetadata; +import org.apache.iotdb.calc_commons.plan.relational.metadata.ITypeMetadata; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; 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 de4f26a6a2e9a..d7dd71c8daddb 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 @@ -44,8 +44,8 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher; @@ -74,7 +74,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java index 713dc221941ee..84f3cf8cd0ec4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java @@ -36,7 +36,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.ColumnCreationFailException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java index 81bca262d18e7..87b02ae6731e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java @@ -48,7 +48,7 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.CastFunctionUtils; +import org.apache.iotdb.calc_commons.transformation.dag.util.CastFunctionUtils; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator; @@ -80,7 +80,7 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.MINUS; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.PLUS; import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java index 368529b651133..fdd95619dd4b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java @@ -45,9 +45,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBool; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBool; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; import static org.apache.tsfile.read.common.type.FloatType.FLOAT; import static org.apache.tsfile.read.common.type.IntType.INT32; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index e83a1c22683a8..92a5d060b2c09 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -111,7 +111,7 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.ROWS; import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingTranslator.sortItemToSortOrder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware.scopeAwareKey; 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 d4aaa32dd1583..527197bc8cace 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 @@ -42,7 +42,7 @@ import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; 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 c8e8d89b7632e..5196608f0cf36 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 @@ -148,7 +148,7 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PushPredicateIntoTableScan.containsDiffFunction; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.TransformSortToStreamSort.isOrderByAllIdsAndTime; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.split; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java index fe78de466f812..19cd7ae7bfcac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java @@ -40,7 +40,7 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; public class GapFillStartAndEndTimeExtractVisitor implements AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java index da99d20986baa..7036b351ed2ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Match; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Match; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.PlanOptimizersStatsCollector; @@ -56,7 +56,7 @@ import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static java.util.stream.Collectors.joining; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector; import static org.apache.iotdb.rpc.TSStatusCode.OPTIMIZER_TIMEOUT; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java index 72668ae3fed1a..d3d9e28fd555f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/RuleIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/RuleIndex.java index a8783d758d9a1..755666723d433 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/RuleIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/RuleIndex.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; 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 410cbf2beade3..251071e52f8d2 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 @@ -21,14 +21,14 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; 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.TableScanNode; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; 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 316f918f2cfff..f06d9b18f09d6 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 @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; 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.TableScanNode; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.tableScan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java index b8d684bf88159..2efb95f334786 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java index 3e8fc78d4c404..64f9f301c553e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java @@ -28,8 +28,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java index ee72af7077897..098e24cc05bcf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java @@ -26,10 +26,10 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.PropertyPattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PropertyPattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; @@ -49,7 +49,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableSet.toImmutableSet; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.transpose; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.groupNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java index c1a100abc2aa4..debd1d06bde0e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java @@ -30,8 +30,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java index cf77573d95fba..1c22cce0e5602 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java @@ -26,8 +26,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java index ad78f32785132..b15810f74ab3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java @@ -28,8 +28,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java index eb2152c086a34..60e42e45c207b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java @@ -26,8 +26,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java index f5fa28512ecc5..278a6788ed6c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java @@ -25,8 +25,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java index 92625e48adb96..1df179f970468 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java @@ -26,8 +26,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java index 772ee52f7a1c3..f190a1f49b57f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java @@ -26,9 +26,9 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; @@ -47,7 +47,7 @@ import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toSet; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java index 00d3813f6e11b..a459ff2f6a1e8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java index ceb4806ba76ae..f9eaf56a1cd8e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java index 891d067cbc60a..ef2de8d3c4d5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java index 661fe42a2b289..177f7920a0839 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java @@ -24,14 +24,14 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.MergeLimitWithMergeSort.transformByMergeSortNode; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.mergeSort; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java index df05e0ba13e09..2f98442a5f6eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java @@ -24,14 +24,14 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.sort; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java index 737d77b6a49d3..496990e9e2e54 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java @@ -23,14 +23,14 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.Optional; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.mergeSort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java index 73aae2493e699..99c77f7daaca9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java @@ -23,12 +23,12 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java index 490a9df668893..64f18d8c5dd77 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java index 4d135674a9d52..87b2b826219b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java index 59d705b40aa4c..c136ce2e230b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.base.Predicates; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java index 3517b6419e89f..24fa15cd4a4a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrPatternAlternationOptimizer; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPatternFlattener; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.patternRecognition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java index 20213b6bc8c53..f62eed4329d82 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; @@ -32,7 +32,7 @@ import java.util.Optional; import java.util.Set; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.pruneInputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java index 5617e958606b5..08a914d9ab349 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java index 82f0e494f9e84..ba9ed818a35a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java index 0f707c9757f60..8daddf52bfb4a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCopyToColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCopyToColumns.java index c5907a11412e7..ecabb85d09ae3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCopyToColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCopyToColumns.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java index 1ac5c7e314bb1..12a902b630bee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java index 9e7396d830a93..67bfc426f45c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java index 608caed0d0cea..0c03d2fd62871 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExplainAnalyzeColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExplainAnalyzeColumns.java index 0bf718b5b85eb..32f6a4db2436a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExplainAnalyzeColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExplainAnalyzeColumns.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java index ee9c4fdcffbbe..9e4b4b333b73f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java index 53974ebc5d799..bddb0fb11e8b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java @@ -20,8 +20,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java index c02a9d3d1e12c..e19834a405745 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java index 6a25c57cfbe46..40ba3f05b9d9d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java index fb0e7e40ee6aa..9e1cc27a0a7a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java index f8df1b7f2bed1..9c24544b5fe67 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java index 6875bb7a8d3fb..c0c0e427d9f6b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java @@ -28,9 +28,9 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; @@ -42,7 +42,7 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.lang.Math.toIntExact; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.toTopNRankingType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java index 591d4157a9900..de564ffb26131 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; @@ -35,7 +35,7 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.lang.Math.toIntExact; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.toTopNRankingType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.ChildReplacer.replaceChildren; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java index 72535ff2d76a2..c8df55a2cda16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java @@ -20,16 +20,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; 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 static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.offset; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.tableScan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java index 64001fd7b122f..9e85481c81dcb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java @@ -21,15 +21,15 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; import static java.lang.Math.addExact; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.offset; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java index 9895e9a67f942..105c9b1411d9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.transpose; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java index 5d5285d0c8164..bd0f3168946a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java @@ -22,16 +22,16 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; import java.util.Optional; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Limit.requiresPreSortedInputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java index 303f55584c8c0..508fa92093807 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java @@ -26,9 +26,9 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; @@ -39,7 +39,7 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java index 7c17b13951bc7..14983e0aa5a35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper; @@ -37,7 +37,7 @@ import static com.google.common.collect.Iterables.getLast; import static com.google.common.collect.Sets.intersection; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.topK; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.union; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java index 4e91507e22dc0..407c660ada034 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java index ead8d28acf490..b6dccfc0672fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java index 3bb39de767d04..087bba2e0d89b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.enforceSingleRow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java index a158592bb233e..8077abd8037b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java index 81c3c35539ea7..992c549f5575e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java index 3be8b417530df..d87691225acaa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java index b2666040584e3..ddd233bccbf2e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static com.google.common.base.Preconditions.checkArgument; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java index 623f3c148de9b..dec1d772b0897 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java index ee3d8b889778a..b445d2af8e56a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java index 0cf812c985965..22a396c05dcba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java index 11ace4bd4019d..92d0bc23c66e8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java @@ -41,7 +41,7 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; @@ -66,7 +66,7 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.LongType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java index 3d49d4f935ce0..a7d8f8aa36ac0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java @@ -28,9 +28,9 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; @@ -46,8 +46,8 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind.AGGREGATE; import static org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java index 0781e2c405fa9..515434b211b09 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java index 7237f71e9080f..1fbe1d6fa6c2b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java @@ -27,9 +27,9 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -48,8 +48,8 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java index aa4c115d9e66f..83169057f63ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java @@ -25,9 +25,9 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -43,8 +43,8 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java index 129b5e9d33949..0eaef8870a3fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java @@ -28,9 +28,9 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -54,9 +54,9 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.empty; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.empty; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java index 393abf6452555..1d1eddccec410 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java @@ -28,9 +28,9 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -51,9 +51,9 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.empty; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.empty; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java index ffdab1e737fdf..7d4678fbf1d46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java @@ -27,9 +27,9 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -48,8 +48,8 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Aggregation.groupingColumns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java index ed051144e7d7f..2c86b28cb84c5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java @@ -25,9 +25,9 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -43,8 +43,8 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java index e84fbdeca8255..1d0b51c454076 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; @@ -38,7 +38,7 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index 93d08fee03658..81a7e55a8e51a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -34,8 +34,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; @@ -50,8 +50,8 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanNodeSearcher.searchFrom; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java index c933f59bde2da..977de8a55408b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java @@ -33,8 +33,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java index 5fd973fcc6617..eb7398f5b819d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java @@ -27,9 +27,9 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; @@ -44,7 +44,7 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractConjuncts; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java index d8599832fb0e6..4c0506c9d17ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java @@ -22,12 +22,12 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static com.google.common.collect.Iterables.getOnlyElement; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.empty; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.empty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Apply.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java index 9528b59acbbc1..3a0cbc8b1614a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java @@ -28,8 +28,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; @@ -43,7 +43,7 @@ import static com.google.common.base.Preconditions.checkState; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.empty; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.empty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; 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 2cb654aa8e0e0..d742417b5fe53 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 @@ -60,8 +60,8 @@ import static java.util.Objects.requireNonNull; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST_BY; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.TABLE_TIME_COLUMN_NAME; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.TABLE_TIME_COLUMN_NAME; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator.DATE_BIN_PREFIX; public class AggregationTableScanNode extends DeviceTableScanNode { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java index 6c4c787216085..d4b40e06c8a3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java @@ -51,8 +51,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Property; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Property; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import java.util.List; @@ -60,9 +60,9 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Pattern.typeOf; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Property.optionalProperty; -import static org.apache.iotdb.db.calc_commons.plan.relational.utils.matching.Property.property; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.typeOf; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Property.optionalProperty; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Property.property; public final class Patterns { private Patterns() {} 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 1e2a4d9dc6855..217d2f3c126a5 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 @@ -117,7 +117,7 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ATTRIBUTE; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; -import static org.apache.iotdb.db.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.extractGlobalTimeFilter; +import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.extractGlobalTimeFilter; 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.plan.analyze.AnalyzeVisitor.getTimePartitionSlotList; 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 d243a2e1d3ba7..9a87cdbb7d747 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 @@ -31,9 +31,9 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.db.calc_commons.execution.relational.ColumnTransformerBuilder; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc_commons.execution.relational.ColumnTransformerBuilder; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceBlackListConstructor; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.TableDeviceQuerySource; 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 3cb9061e48279..75e168ca3bf04 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 @@ -332,9 +332,9 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.APPROX_COUNT_DISTINCT; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.APPROX_MOST_FREQUENT; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.APPROX_PERCENTILE; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.APPROX_COUNT_DISTINCT; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.APPROX_MOST_FREQUENT; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.APPROX_PERCENTILE; import static org.apache.iotdb.db.queryengine.plan.execution.config.TableConfigTaskVisitor.DATABASE_NOT_SPECIFIED; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.SERVICE_MANAGEMENT_NOT_SUPPORTED; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.parseDateTimeFormat; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java index e1c6a2a227a80..bd8317ca814b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.client.IClientManager; import org.apache.iotdb.commons.client.async.AsyncDataNodeInternalServiceClient; import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; -import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.QueryStateMachine; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInfo; @@ -42,7 +42,7 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; -import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.WAIT_FOR_DISPATCH; +import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.WAIT_FOR_DISPATCH; /** * QueryScheduler is used to dispatch the fragment instances of a query to target nodes. And it will diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java index 318937737ceb8..aa8461ddd0c58 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java @@ -34,7 +34,7 @@ import org.apache.iotdb.commons.utils.RetryUtils; import org.apache.iotdb.consensus.exception.ConsensusGroupNotExistException; import org.apache.iotdb.consensus.exception.RatisReadUnavailableException; -import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.mpp.FragmentInstanceDispatchException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -77,7 +77,7 @@ import java.util.stream.Collectors; import static com.google.common.util.concurrent.Futures.immediateFuture; -import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.DISPATCH_READ; +import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.DISPATCH_READ; public class FragmentInstanceDispatcherImpl implements IFragInstanceDispatcher { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java index 31ddf1c6c6de4..15652f027696b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java @@ -55,7 +55,7 @@ import java.util.Map; import java.util.Set; -import static org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; /** * Base class of SELECT statement. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java index b5da95c395059..2ec2dea260b68 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowIterator; import org.apache.iotdb.udf.api.access.RowWindow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindowIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindowIterator.java index cd73bd63b6fb1..76652e8a4d8d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindowIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindowIterator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java index bc90f1fe91a0f..fd1fb1db8bcdf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.udf.utils.UDFBinaryTransformer; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.type.Binary; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java index bcb504eb1564e..45a70972bfe83 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowIterator; import org.apache.iotdb.udf.api.access.RowWindow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindowIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindowIterator.java index dc463600dd3a4..08d5e3884dc67 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindowIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindowIterator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java index 635515f620f30..a288c40213f61 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.input; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; +import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/TsBlockInputDataSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/TsBlockInputDataSet.java index 469b7ee4b6d11..ae474ee5aaae9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/TsBlockInputDataSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/TsBlockInputDataSet.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.input; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java index 107b4bb200563..f15fb07155309 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; +import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java index 8ee52ab1b6915..36a2e00770a44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java index 5100a6de259cc..a3af49e83331e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/SafetyLine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/SafetyLine.java index 5cca5d18bfddc..2136e53ddc9b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/SafetyLine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/SafetyLine.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.memory; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; /** Tells the {@link ElasticSerializableTVList} if it is safe to remove a cache block. */ public class SafetyLine { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareEqualToTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareEqualToTransformer.java index 373633018da9c..328944baa0f15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareEqualToTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareEqualToTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterEqualTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterEqualTransformer.java index bf94ee265d0dc..aec22c21a2d95 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterEqualTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterEqualTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterThanTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterThanTransformer.java index 5954ca2604d1b..95864a119235b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterThanTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterThanTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessEqualTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessEqualTransformer.java index af7b185e73822..d8bb7bc5ccf7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessEqualTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessEqualTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessThanTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessThanTransformer.java index 9f31319c42cd2..01dfddce38d79 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessThanTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessThanTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareNonEqualTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareNonEqualTransformer.java index a04e2c9557ff1..5021cc49b4839 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareNonEqualTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareNonEqualTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java index af87afb441226..3234f7729eef4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.util.TypeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowTransformer.java index a7c25fcf57502..1fda4ec853def 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.util.TypeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java index 117bf88654642..e900281f81369 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.util.TypeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java index 1cb8a4d498555..cf3f677a40f64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.TypeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java index b600df63a6b4a..ab806a62c2f08 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/BetweenTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/BetweenTransformer.java index 1d9d790a5d0fc..1a44ce9500e82 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/BetweenTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/BetweenTransformer.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.ternary; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java index afb3490200770..2c3063da85190 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.CastFunctionUtils; +import org.apache.iotdb.calc_commons.transformation.dag.util.CastFunctionUtils; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.UnaryTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java index 238e8b79b096a..b3abb314cacbd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java index 08b9af8a987eb..ae37aba9f3746 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java @@ -30,7 +30,7 @@ import org.apache.tsfile.utils.BytesUtils; import org.apache.tsfile.write.UnSupportedDataTypeException; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; public class SubStringFunctionTransformer extends UnaryTransformer { private int beginPosition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java index 4c33a534b1e67..a2c4060814cca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDFParametersFactory; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.udf.api.UDAF; import org.apache.iotdb.udf.api.customizer.config.UDAFConfigurations; import org.apache.iotdb.udf.api.customizer.parameter.UDFParameterValidator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java index 0d39d10b19452..540dfa630e743 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; -import org.apache.iotdb.db.calc_commons.service.AbstractTemporaryQueryDataFileService; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java index 6e2d125210e74..bd242f7a83aa8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.udf.UDFParametersFactory; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.udf.api.UDTF; import org.apache.iotdb.udf.api.customizer.config.UDTFConfigurations; import org.apache.iotdb.udf.api.customizer.parameter.UDFParameterValidator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java index 6eec37adc3777..b918c384d320c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.input.IUDFInputDataSet; 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 82d7fc7341dab..127c0b01c71b6 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 @@ -42,9 +42,9 @@ import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.consensus.ConsensusFactory; -import org.apache.iotdb.db.calc_commons.execution.relational.ColumnTransformerBuilder; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc_commons.execution.relational.ColumnTransformerBuilder; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.metadata.PathNotExistException; @@ -156,7 +156,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import static org.apache.iotdb.db.calc_commons.plan.planner.TableOperatorGenerator.makeLayout; +import static org.apache.iotdb.calc_commons.plan.planner.TableOperatorGenerator.makeLayout; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher.convertTagValuesToDeviceID; import static org.apache.tsfile.common.constant.TsFileConstant.PATH_SEPARATOR; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java index 2ed23c4aa4bba..6d0c9091a281a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java index 5f58024ea1f30..074a8fdd47c00 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.confignode.rpc.thrift.TFetchTableResp; -import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.plan.execution.config.executor.ClusterConfigTaskExecutor; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java index 30b8ecfaa2770..35443a3cd96ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java @@ -71,7 +71,7 @@ import org.apache.iotdb.consensus.common.Peer; import org.apache.iotdb.db.audit.DNAuditLogger; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.db.calc_commons.service.AbstractTemporaryQueryDataFileService; +import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.db.conf.DataNodeStartupCheck; import org.apache.iotdb.db.conf.DataNodeSystemPropertiesHandler; import org.apache.iotdb.db.conf.IoTDBConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java index 241b95885084d..36987a31b5320 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.service; -import org.apache.iotdb.db.calc_commons.service.AbstractTemporaryQueryDataFileService; -import org.apache.iotdb.db.calc_commons.service.ITemporaryQueryDataFileServiceProvider; +import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; +import org.apache.iotdb.calc_commons.service.ITemporaryQueryDataFileServiceProvider; public class DataNodeTemporaryQueryDataFileServiceProvider implements ITemporaryQueryDataFileServiceProvider { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java index 886cf830531a8..3cfde4985071e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.service; -import org.apache.iotdb.db.calc_commons.service.AbstractTemporaryQueryDataFileService; +import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.db.conf.IoTDBDescriptor; import java.io.File; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java index fd3d2dbcab49a..cf53ed9e92ca2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java @@ -29,7 +29,7 @@ import org.apache.iotdb.commons.service.metric.MetricService; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.commons.service.metric.cpu.CpuUsageMetrics; -import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.pipe.metric.PipeDataNodeMetrics; import org.apache.iotdb.db.protocol.thrift.handler.RPCServiceThriftHandlerMetrics; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java index cd2a82da2927e..e4857537dc189 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java @@ -51,8 +51,8 @@ import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.consensus.iot.IoTConsensus; import org.apache.iotdb.consensus.iot.IoTConsensusServerImpl; -import org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils; -import org.apache.iotdb.db.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.DataRegionConsensusImpl; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java index adbbea0a043f0..aaf74af2bcd31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.IWALByteBufferView; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java index ff3be331de1e3..2a5bd76dc10c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java @@ -29,7 +29,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.TsFileProcessorException; @@ -117,7 +117,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Function; -import static org.apache.iotdb.db.calc_commons.metric.QueryExecutionMetricSet.GET_QUERY_RESOURCE_FROM_MEM; +import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.GET_QUERY_RESOURCE_FROM_MEM; import static org.apache.iotdb.db.queryengine.metric.QueryResourceMetricSet.FLUSHING_MEMTABLE; import static org.apache.iotdb.db.queryengine.metric.QueryResourceMetricSet.WORKING_MEMTABLE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java index 522a5598eb52b..dc2fc4450a6cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.read.reader.chunk; -import org.apache.iotdb.db.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.metric.SeriesScanCostMetricSet; import org.apache.iotdb.db.storageengine.buffer.ChunkCache; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java index 4db540cf85072..e0dbce340663a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.read.reader.chunk; -import org.apache.iotdb.db.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; import org.apache.iotdb.db.exception.ChunkTypeInconsistentException; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.metric.SeriesScanCostMetricSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReader.java index 740f423b7ff3b..360d94099657d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReader.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.read.reader.common; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.tsfile.read.TimeValuePair; import org.apache.tsfile.read.reader.IPointReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/tableDiskUsageIndex/DataRegionTableSizeQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/tableDiskUsageIndex/DataRegionTableSizeQueryContext.java index f07841588846c..cb3f1b7bf8a1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/tableDiskUsageIndex/DataRegionTableSizeQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/tableDiskUsageIndex/DataRegionTableSizeQueryContext.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.utils.tableDiskUsageIndex; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileID; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java index 4dc4977f8ee29..28b1b2441ca79 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java @@ -26,7 +26,7 @@ import org.apache.iotdb.commons.service.metric.enums.Metric; import org.apache.iotdb.commons.service.metric.enums.Tag; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.protocol.thrift.OperationType; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java index 1332aa4c03bc4..7cda7051eb504 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.ObjectFileNotExist; -import org.apache.iotdb.db.calc_commons.utils.IObjectFileService; -import org.apache.iotdb.db.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.calc_commons.utils.IObjectFileService; +import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; import org.apache.iotdb.db.service.metrics.FileMetrics; import org.apache.iotdb.db.storageengine.rescon.disk.TierManager; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java index d81f8a727a4a7..ae544151c0974 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.utils; -import org.apache.iotdb.db.calc_commons.utils.IObjectFileService; -import org.apache.iotdb.db.calc_commons.utils.IObjectFileServiceProvider; +import org.apache.iotdb.calc_commons.utils.IObjectFileService; +import org.apache.iotdb.calc_commons.utils.IObjectFileServiceProvider; public class DataNodeObjectFileServiceProvider implements IObjectFileServiceProvider { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java index e938cdcc96e53..840b8aca2504e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java @@ -21,7 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java index 2d56bf88a3d12..47f7bea35f4f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.utils; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.calc_commons.service.ITemporaryQueryDataFileServiceProvider b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.calc_commons.service.ITemporaryQueryDataFileServiceProvider similarity index 100% rename from iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.calc_commons.service.ITemporaryQueryDataFileServiceProvider rename to iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.calc_commons.service.ITemporaryQueryDataFileServiceProvider diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.calc_commons.utils.IObjectFileServiceProvider b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.calc_commons.utils.IObjectFileServiceProvider similarity index 100% rename from iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.db.calc_commons.utils.IObjectFileServiceProvider rename to iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.calc_commons.utils.IObjectFileServiceProvider diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java index 274e46b891a91..ee63cad028417 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor; import org.junit.After; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java index 893e556a2774b..5f10a3ec15362 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java index d44966ca015cf..a66ce478f0047 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java index c609ccff948ce..053f74fd20436 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java index 2ba14645f1564..4956d131e9f11 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.calc_commons.execution.operator.process.AggregationMergeSortOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.process.AggregationMergeSortOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.execution.aggregation.CountAccumulator; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java index b84c4cd1e0651..6de0271395f1e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java @@ -26,8 +26,8 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java index 3cb17752bc238..962d9e914a962 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java index f6ea789450df1..ca25d60f898c1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java index 0a9eff81214ae..05e1d5692e961 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java index 0d4fa40fe962e..ff86cb0e85dbf 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java @@ -20,10 +20,10 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.FixedIntervalFillFilter; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.FixedIntervalFillFilter; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.IntPreviousFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java index 6daab5e148e86..2db7d947472bd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java index c32ca0c61fdc2..31a692f5c6971 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; 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 8289148ae17fd..7d7d7d3093096 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 @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java index 177864b99ff1e..10800e987657d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java @@ -34,9 +34,9 @@ import org.apache.iotdb.commons.schema.table.column.TagColumnSchema; import org.apache.iotdb.commons.schema.table.column.TimeColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -86,7 +86,7 @@ import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; -import static org.apache.iotdb.db.calc_commons.execution.operator.Operator.NOT_BLOCKED; +import static org.apache.iotdb.calc_commons.execution.operator.Operator.NOT_BLOCKED; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java index 3443ecd0b448b..8b50461ae65e0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java @@ -25,8 +25,8 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index dc72a0af97086..da902fd9c5617 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -27,17 +27,17 @@ 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.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.FilterAndProjectOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.OffsetOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.LinearFill; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.LinearFill; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java index b4a0062cbe8cb..c8667f88b2ba7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java index 65f1f8801eb8f..6c39034d556ab 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.SortOperator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.SortOperator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java index e39d8ce52f25f..0eb122aa6409e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java index 170cfa3a1a441..9b44ba5a879d3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java @@ -26,7 +26,7 @@ import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java index 3e133aedbac44..6416bdce2686e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java @@ -20,11 +20,11 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.LinearFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.LinearFill; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java index 01d3eea66ed46..4fceb968c135b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java @@ -25,8 +25,8 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java index 378cf55a1e6fe..612468d39e744 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java index 348c9d4b385d8..a9283e31accb1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java @@ -25,7 +25,7 @@ import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java index d313f53f0d32d..920c56844cbca 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.TableStreamSortOperator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.TableStreamSortOperator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -55,7 +55,7 @@ import java.util.List; import java.util.concurrent.ExecutorService; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; +import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.utils.EnvironmentUtils.cleanDir; import static org.junit.Assert.assertEquals; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java index 721f4d6b56a7c..f901ea2dad1dc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.calc_commons.execution.operator.process.ValuesOperator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.process.ValuesOperator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalFillFilterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalFillFilterTest.java index 2cc5e6bb1722e..922066ef14d7e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalFillFilterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalFillFilterTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.fill.filter; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalMSFillFilter; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalNSFillFilter; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.filter.MonthIntervalUSFillFilter; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.MonthIntervalMSFillFilter; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.MonthIntervalNSFillFilter; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.MonthIntervalUSFillFilter; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java index 26b1f64ab56f6..7228db726f8f2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java @@ -22,12 +22,12 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWGroupWMoOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWGroupWMoOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -54,7 +54,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; +import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java index a0cf92fc7930f..d0c5a962d1bed 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java @@ -22,12 +22,12 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -53,7 +53,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; +import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java index b1095a60598ed..8f8e9d4310a08 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java index c62cc701b2421..d3cb233c1510b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java index 672e9c56cc30f..a6108518eb08f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java index b3a7dd0678309..a0a79fb3b7076 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java index 973185c7447cd..fadf2b0cbb3a6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java @@ -21,14 +21,14 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternAggregator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.IrRowPatternToProgramRewriter; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.MatchResult; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.matcher.Program; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.IrRowPatternToProgramRewriter; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.MatchResult; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Program; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternExpressionTest.java index 89be7476e8eb3..c618082e97db3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternExpressionTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.ArithmeticOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.BinaryComputation; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.ComparisonOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.Computation; -import org.apache.iotdb.db.calc_commons.execution.operator.process.rowpattern.expression.ReferenceComputation; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.ArithmeticOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.BinaryComputation; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.ComparisonOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.Computation; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.ReferenceComputation; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java index 77a84ae14210e..eaa077fa79e33 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.tvf; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.PartitionRecognizer; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.PartitionState; -import org.apache.iotdb.db.calc_commons.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.function.PartitionRecognizer; +import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionState; +import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.Slice; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -49,7 +49,7 @@ import java.util.List; import java.util.concurrent.ExecutorService; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java index 747c92bc881a6..9da9fffcbcc3d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.RowNumberOperator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.window.RowNumberOperator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java index c9d5e2d926f83..2ef3ff55a15a9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.TableWindowOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RankFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.window.TableWindowOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.RankFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java index 81545bbad237b..40614fc36cb7b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java index 39f74101cddd1..38493a4aa218f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.TopKRankingOperator; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.window.TopKRankingOperator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java index 48f63c953ef2d..00fc29ef737c5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function; import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate.WindowAggregator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate.WindowAggregator; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java index b49e1dad56fd6..2f416ae7c677c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java index f998eec5a52ed..3c1fd6e8bcd99 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.CumeDistFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.CumeDistFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java index 2224f6d10aed9..d66c532921fd3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.DenseRankFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.DenseRankFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java index a34aca134c5d8..70a732ac545d1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.NTileFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.NTileFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java index f20d529a8e52e..bc14f89cb34fa 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.PercentRankFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.PercentRankFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java index 542a1458def28..7d8d49f8b0a2e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RankFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.RankFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java index 577fe8f223799..6d854031833b1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.rank.RowNumberFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.RowNumberFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java index 8ae2616191320..de22779fe7e33 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.FirstValueFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.FirstValueFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java index f30f36d8bfa50..113f4f951bea1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LagFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.LagFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java index cb74fc28dcd1f..25f8ce88171a0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LastValueFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.LastValueFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java index 467a6177b50de..ff601dd05aac3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.LeadFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.LeadFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java index 8e27eba09067f..d42b371892da5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.function.value.NthValueFunction; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.NthValueFunction; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameTestUtils.java index 0f5b910620c90..d1c7f05b7191e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameTestUtils.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.Frame; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.GroupsFrame; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.RangeFrame; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.RowsFrame; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.Range; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.utils.RowComparator; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.Frame; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.GroupsFrame; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.RangeFrame; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.RowsFrame; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; +import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrameTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrameTest.java index 632c570ebd4c4..930c4b3138b9f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrameTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrameTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java index 2a0509657f006..5c8f89e03489b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrameTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrameTest.java index 9887686854df8..2726350fd42ad 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrameTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrameTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; -import org.apache.iotdb.db.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java index 9c869f543ff31..c67f403c779ed 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverSchedulerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverSchedulerTest.java index 167103f75948d..ee062eec9097e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverSchedulerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverSchedulerTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.execution.schedule; -import org.apache.iotdb.db.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java index 96a8c60b50816..7360bfa414343 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java @@ -28,7 +28,7 @@ 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.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java index d47fc598dcc50..07b4e5e7b8b43 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java @@ -22,16 +22,16 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.FirstAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.FirstByAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.FirstByDescAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.FirstDescAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastByAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.FirstAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.FirstByAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.FirstByDescAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.FirstDescAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastByAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; import org.apache.tsfile.enums.TSDataType; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java index 8200c9bb1cb56..216f620777e55 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -58,9 +58,9 @@ import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.SUM; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; -import static org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; -import static org.apache.iotdb.db.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java index 2d3dbfe4c1c7a..b9cbfd7e2c72f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; -import org.apache.iotdb.db.calc_commons.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; @@ -43,7 +43,7 @@ import java.util.Collections; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; 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 332406985a236..b9754d1a569c0 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 @@ -34,8 +34,8 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.calc_commons.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -77,7 +77,7 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.db.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AnalyzerTest.analyzeSQL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.ALL_DEVICE_ENTRIES; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java index a2a7745d485ca..8f32e92f6b659 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java @@ -66,9 +66,9 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isOneNumericType; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoNumericType; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isOneNumericType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoNumericType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTSBSDataPartition.T1_DEVICE_1; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTSBSDataPartition.T1_DEVICE_2; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTSBSDataPartition.T1_DEVICE_3; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index 6346d31617902..88189890cdeb8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -84,9 +84,9 @@ import java.util.stream.Collectors; import static org.apache.iotdb.commons.schema.table.InformationSchema.INFORMATION_DATABASE; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isOneNumericType; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoNumericType; -import static org.apache.iotdb.db.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isOneNumericType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoNumericType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; 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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java index 25f51c333bd6d..fab86989c0a26 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java @@ -24,7 +24,7 @@ import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; -import org.apache.iotdb.db.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java index d1f7eff55fbd6..4ca9161b71f5f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticDivisionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticModuloColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticDivisionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticModuloColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java index 9c98aa7e84af9..24d7432ae5f51 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.LogicAndColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.LogicOrColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.LogicAndColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.LogicOrColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java index c5a481f65e787..1efe4a039263a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java index 2e01d0698b0d4..2f46ee418f1fb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java index 18319c705f3f7..5d4084638acc0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java index 43f3a19337827..9f73e40c2800f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java index 6e084bdecd083..bef232c3b1eff 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.LpadColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.LpadColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java index 66595bb03480f..238041872696d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ternary.RpadColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.RpadColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java index 19f730a2308b1..6c11d4df406fa 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.ArithmeticNegationColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.InColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LikeColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.RegularColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.ArithmeticNegationColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.InColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LikeColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.RegularColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java index e15369f69c24f..0ea91219b39d7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BlobLengthColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BlobLengthColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java index 28bab41ff3aae..f242d205e5c26 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java @@ -27,7 +27,7 @@ import java.time.ZoneId; import java.util.TimeZone; -import static org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; import static org.junit.Assert.assertEquals; public class DateBinFunctionTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java index 8a78f435b0824..cd128dfbb8e49 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java index 74a656740ede8..e08894742527f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java index 2eda860b269c3..fd306b3e386e5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java index 20c59f3a7d896..a9c2f5ec5e328 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java index b2a744a88f637..d0b450edafbd2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java index 281ce06dc3fe1..1a287ef338d21 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java index b5bd899959b54..2fbbf0d3c6a9b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java index 2b45838b668e7..87a5860b21a1a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.LongColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java index f63511da804ec..3de9b521b8e5e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.FloatColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java index 2b1a7cecfb301..f3146d14ed92e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.DoubleColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java index b5fff8ac9faca..721bf4ba27447 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java index d2c62f13f2026..58daa05364d26 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.LongColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java index e6d487dffda57..99ec2cd13c3e8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java index 17de5ce9b97fc..c56d5c86265bf 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java @@ -22,9 +22,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java index 672f10daf6822..3c0ea0d435f41 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java index 3ed983b5824eb..9f4d495a5df57 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java index cccfea51c241a..ad8bf795d376a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base32Encoding; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java index c1079d82fe035..2b324e815d8aa 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java index bb7b4c2cde1cd..6ec798f1c5ef5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java index e4779542bee8d..d27d5bfb3585a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java @@ -21,8 +21,8 @@ // Note: The actual package may vary, adjust if CRC32Transformer is in a different location. package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.CRC32Transformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CRC32Transformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java index 133277a3e6309..a680fe29ed601 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java index 9e5d0affbd96c..dcd86562c13cc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java index 2656de1d2c6a0..babf71a4c4b44 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java index 3140c2c59b5a2..2e8ddab05869a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java index 8102d3f9e1694..da16401d3649e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java index 7e4f4d2255203..1cc6906cbac97 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java @@ -19,9 +19,9 @@ * under the License. */ -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java index eaf470e8d63ba..b49733dac43ec 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java @@ -19,9 +19,9 @@ * under the License. */ -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java index f20bdee876527..4e95f9699ca13 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import net.jpountz.xxhash.XXHash64; import net.jpountz.xxhash.XXHashFactory; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java index 1b2745ab53bfe..9f5a8ecebc1fa 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.string; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hexEncoding; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java index 9ea7a4432bfa0..ae38b8d5e4d00 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hexEncoding; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java index 7ed1562c1164b..ce4ea1bd74f55 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java @@ -20,19 +20,19 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; import org.junit.Assert; import org.junit.Test; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitCountCheck; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseAndTransform; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseLeftShiftTransform; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseNotTransform; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseOrTransform; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseRightShiftArithmeticTransform; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseRightShiftTransform; -import static org.apache.iotdb.db.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseXorTransform; +import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitCountCheck; +import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseAndTransform; +import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseLeftShiftTransform; +import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseNotTransform; +import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseOrTransform; +import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseRightShiftArithmeticTransform; +import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseRightShiftTransform; +import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseXorTransform; public class BitwiseUtilsTest { @Test diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java index 8d3f6a10fc800..7bd333884d0d5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; +import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; +import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableTVListTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableTVListTest.java index c09b656a7895a..0c2e2226d3c58 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableTVListTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableTVListTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.SerializableList; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; +import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/LRUCache.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/LRUCache.java index 6d20e2c6ba8ec..ea872f5d82a6c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/LRUCache.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/LRUCache.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.Cache; +import org.apache.iotdb.calc_commons.transformation.datastructure.Cache; import java.util.Arrays; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableRowListTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableRowListTest.java index 7a453b1f67f6d..9b088fb8303f3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableRowListTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableRowListTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.row.SerializableRowList; +import org.apache.iotdb.calc_commons.transformation.datastructure.row.SerializableRowList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableTVListTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableTVListTest.java index 5b354833d0bf3..3e46ba350425f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableTVListTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableTVListTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; -import org.apache.iotdb.db.calc_commons.transformation.datastructure.tv.SerializableTVList; +import org.apache.iotdb.calc_commons.transformation.datastructure.tv.SerializableTVList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java index 3e979c02334d6..bcd76e85cb9a9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java @@ -26,8 +26,8 @@ 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.db.calc_commons.exception.MemoryNotEnoughException; -import org.apache.iotdb.db.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.WriteProcessException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java index c3d32627d4696..d804ef682624a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.utils; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.db.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.AbstractAlignedChunkMetadata; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java index e055d3c2e25fa..12929ed5e608f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.utils.datastructure; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortHeap; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparatorUtils; import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java index ee32efb7f502c..5b4f4d4f626e8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java @@ -22,13 +22,13 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.utils.FileUtils; -import org.apache.iotdb.db.calc_commons.utils.datastructure.MergeSortKey; -import org.apache.iotdb.db.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.db.calc_commons.utils.sort.FileSpillerReader; -import org.apache.iotdb.db.calc_commons.utils.sort.MemoryReader; -import org.apache.iotdb.db.calc_commons.utils.sort.SortBufferManager; -import org.apache.iotdb.db.calc_commons.utils.sort.SortReader; -import org.apache.iotdb.db.calc_commons.utils.sort.TreeDiskSpiller; +import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc_commons.utils.sort.FileSpillerReader; +import org.apache.iotdb.calc_commons.utils.sort.MemoryReader; +import org.apache.iotdb.calc_commons.utils.sort.SortBufferManager; +import org.apache.iotdb.calc_commons.utils.sort.SortReader; +import org.apache.iotdb.calc_commons.utils.sort.TreeDiskSpiller; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/pom.xml b/iotdb-core/pom.xml index afa8ba25d26b5..0a41cb71c657d 100644 --- a/iotdb-core/pom.xml +++ b/iotdb-core/pom.xml @@ -37,6 +37,7 @@ metrics node-commons relational-grammar + calc_commons From 11fd61541dc408bbfddb4a1bd5365d2e37c1872d Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Tue, 21 Apr 2026 11:05:35 +0800 Subject: [PATCH 43/45] move templates --- .../table/v1/handler/ExceptionHandler.java | 2 +- .../protocol/v1/handler/ExceptionHandler.java | 2 +- .../protocol/v2/handler/ExceptionHandler.java | 2 +- .../iotdb/tool/data/AbstractDataTool.java | 2 +- .../{calc_commons => calc-commons}/pom.xml | 30 +- .../src/main/codegen/config.fmpp | 0 .../main/codegen/dataModel/AllDataType.tdd | 0 .../main/codegen/dataModel/CompareType.tdd | 0 .../codegen/dataModel/DecimalDataType.tdd | 0 .../dataModel/MathematicalDataType.tdd | 0 .../dataModel/MathematicalOperator.tdd | 0 .../ArithmeticBinaryColumnTransformer.ftl | 18 +- .../ArithmeticColumnTransformerApi.ftl | 16 +- .../ArithmeticUnaryColumnTransformer.ftl | 6 +- .../codegen/templates/ModeAccumulator.ftl | 4 +- .../main/codegen/templates/constantFill.ftl | 6 +- .../src/main/codegen/templates/linearFill.ftl | 4 +- .../main/codegen/templates/previousFill.ftl | 6 +- .../previousFillWithTimeDuration.ftl | 8 +- .../exception/MemoryNotEnoughException.java | 0 .../exception}/QueryProcessException.java | 2 +- .../execution/aggregation/Accumulator.java | 0 .../aggregation/VarianceAccumulator.java | 0 .../execution/operator/AbstractOperator.java | 0 .../operator/CommonOperatorContext.java | 2 +- .../operator/GroupedTopNBuilder.java | 0 .../GroupedTopNRowNumberAccumulator.java | 0 .../operator/GroupedTopNRowNumberBuilder.java | 2 +- .../execution/operator/IdRegistry.java | 0 .../execution/operator/Operator.java | 0 .../operator/RowIdComparisonStrategy.java | 0 .../execution/operator/RowIdHashStrategy.java | 0 .../execution/operator/RowReference.java | 0 .../operator/RowReferenceTsBlockManager.java | 0 .../SimpleTsBlockWithPositionComparator.java | 2 +- .../TsBlockWithPositionComparator.java | 0 .../process/AbstractConsumeAllOperator.java | 0 .../process/AbstractFillOperator.java | 2 +- .../process/AbstractLinearFillOperator.java | 2 +- .../process/AbstractSortOperator.java | 4 +- .../process/AggregationMergeSortOperator.java | 2 +- .../process/AssignUniqueIdOperator.java | 2 +- .../operator/process/CollectOperator.java | 4 +- .../process/EnforceSingleRowOperator.java | 4 +- .../process/FilterAndProjectOperator.java | 2 +- .../operator/process/LimitOperator.java | 2 +- .../process/MappingCollectOperator.java | 0 .../operator/process/MergeSortOperator.java | 2 +- .../operator/process/OffsetOperator.java | 2 +- .../process/PatternRecognitionOperator.java | 6 +- .../PreviousFillWithGroupOperator.java | 2 +- .../operator/process/ProcessOperator.java | 0 .../operator/process/SortOperator.java | 4 +- .../operator/process/TableFillOperator.java | 0 .../process/TableLinearFillOperator.java | 0 .../TableLinearFillWithGroupOperator.java | 0 .../process/TableMergeSortOperator.java | 0 .../operator/process/TableSortOperator.java | 0 .../process/TableStreamSortOperator.java | 4 +- .../operator/process/TableTopKOperator.java | 0 .../operator/process/TopKOperator.java | 2 +- .../operator/process/ValuesOperator.java | 2 +- .../operator/process/fill/IFill.java | 0 .../operator/process/fill/IFillFilter.java | 0 .../operator/process/fill/ILinearFill.java | 0 .../AbstractMonthIntervalFillFilter.java | 0 .../fill/filter/FixedIntervalFillFilter.java | 0 .../filter/MonthIntervalMSFillFilter.java | 0 .../filter/MonthIntervalNSFillFilter.java | 0 .../filter/MonthIntervalUSFillFilter.java | 0 .../process/fill/identity/IdentityFill.java | 0 .../fill/identity/IdentityLinearFill.java | 0 .../process/fill/linear/LinearFill.java | 0 .../process/function/PartitionRecognizer.java | 4 +- .../function/TableFunctionLeafOperator.java | 2 +- .../function/TableFunctionOperator.java | 2 +- .../function/partition/PartitionCache.java | 0 .../function/partition/PartitionState.java | 0 .../process/function/partition/Slice.java | 0 .../gapfill/AbstractGapFillOperator.java | 2 +- .../AbstractGapFillWGroupOperator.java | 0 .../AbstractGapFillWoGroupOperator.java | 0 .../gapfill/GapFillWGroupWMoOperator.java | 0 .../gapfill/GapFillWGroupWoMoOperator.java | 0 .../gapfill/GapFillWoGroupWMoOperator.java | 0 .../gapfill/GapFillWoGroupWoMoOperator.java | 0 .../SimpleNestedLoopCrossJoinOperator.java | 2 +- .../join/merge/MergeSortComparator.java | 2 +- .../process/join/merge/SortKeyComparator.java | 0 .../AscBinaryTypeJoinKeyComparator.java | 0 .../AscBooleanTypeJoinKeyComparator.java | 0 .../AscDoubleTypeJoinKeyComparator.java | 0 .../AscFloatTypeJoinKeyComparator.java | 0 .../AscIntTypeJoinKeyComparator.java | 0 ...cLongTypeIgnoreEqualJoinKeyComparator.java | 0 .../AscLongTypeJoinKeyComparator.java | 0 .../DescBinaryTypeJoinKeyComparator.java | 0 .../DescBooleanTypeJoinKeyComparator.java | 0 .../DescDoubleTypeJoinKeyComparator.java | 0 .../DescFloatTypeJoinKeyComparator.java | 0 .../DescIntTypeJoinKeyComparator.java | 0 ...cLongTypeIgnoreEqualJoinKeyComparator.java | 0 .../DescLongTypeJoinKeyComparator.java | 0 .../merge/comparator/JoinKeyComparator.java | 0 .../comparator/JoinKeyComparatorFactory.java | 0 .../rowpattern/LogicalIndexNavigation.java | 2 +- .../rowpattern/PatternAggregationTracker.java | 0 .../process/rowpattern/PatternAggregator.java | 4 +- .../rowpattern/PatternAggregators.java | 0 .../rowpattern/PatternPartitionExecutor.java | 6 +- .../rowpattern/PatternVariableRecognizer.java | 0 .../PhysicalAggregationPointer.java | 0 .../rowpattern/PhysicalValueAccessor.java | 0 .../rowpattern/PhysicalValuePointer.java | 0 .../expression/ArithmeticOperator.java | 0 .../expression/BinaryComputation.java | 0 .../rowpattern/expression/BinaryOperator.java | 0 .../expression/CastComputation.java | 0 .../expression/ComparisonOperator.java | 0 .../rowpattern/expression/Computation.java | 0 .../expression/ConstantComputation.java | 0 .../expression/LogicalOperator.java | 0 .../expression/NaryComputation.java | 0 .../rowpattern/expression/NaryOperator.java | 0 .../PatternExpressionComputation.java | 2 +- .../expression/ReferenceComputation.java | 0 .../process/rowpattern/matcher/ArrayView.java | 0 .../process/rowpattern/matcher/Done.java | 0 .../rowpattern/matcher/Instruction.java | 0 .../process/rowpattern/matcher/IntList.java | 0 .../rowpattern/matcher/IntMultimap.java | 0 .../process/rowpattern/matcher/IntStack.java | 0 .../IrRowPatternToProgramRewriter.java | 0 .../process/rowpattern/matcher/Jump.java | 0 .../process/rowpattern/matcher/MatchEnd.java | 0 .../rowpattern/matcher/MatchLabel.java | 0 .../rowpattern/matcher/MatchResult.java | 0 .../rowpattern/matcher/MatchStart.java | 0 .../process/rowpattern/matcher/Matcher.java | 0 .../rowpattern/matcher/PatternCaptures.java | 0 .../process/rowpattern/matcher/Program.java | 0 .../process/rowpattern/matcher/Save.java | 0 .../process/rowpattern/matcher/Split.java | 0 .../process/window/RowNumberOperator.java | 8 +- .../process/window/TableWindowOperator.java | 2 +- .../process/window/TopKRankingOperator.java | 14 +- .../window/function/WindowFunction.java | 0 .../function/WindowFunctionFactory.java | 0 .../aggregate/AggregationWindowFunction.java | 0 .../function/aggregate/WindowAggregator.java | 0 .../function/rank/CumeDistFunction.java | 0 .../function/rank/DenseRankFunction.java | 0 .../window/function/rank/NTileFunction.java | 0 .../function/rank/PercentRankFunction.java | 0 .../window/function/rank/RankFunction.java | 0 .../function/rank/RankWindowFunction.java | 0 .../function/rank/RowNumberFunction.java | 0 .../function/value/FirstValueFunction.java | 0 .../window/function/value/LagFunction.java | 0 .../function/value/LastValueFunction.java | 0 .../window/function/value/LeadFunction.java | 0 .../function/value/NthValueFunction.java | 0 .../function/value/ValueWindowFunction.java | 0 .../process/window/partition/Partition.java | 0 .../window/partition/PartitionExecutor.java | 0 .../process/window/partition/frame/Frame.java | 0 .../window/partition/frame/FrameInfo.java | 0 .../window/partition/frame/GroupsFrame.java | 2 +- .../window/partition/frame/RangeFrame.java | 2 +- .../window/partition/frame/RowsFrame.java | 2 +- .../process/window/utils/ColumnList.java | 0 .../operator/process/window/utils/Range.java | 0 .../process/window/utils/RowComparator.java | 0 .../AbstractAsofMergeSortJoinOperator.java | 0 .../AbstractMergeSortJoinOperator.java | 0 .../AsofMergeSortInnerJoinOperator.java | 2 +- .../AsofMergeSortLeftJoinOperator.java | 2 +- .../relational/MarkDistinctOperator.java | 6 +- .../MergeSortFullOuterJoinOperator.java | 2 +- .../MergeSortInnerJoinOperator.java | 2 +- .../relational/MergeSortLeftJoinOperator.java | 2 +- .../relational/MergeSortSemiJoinOperator.java | 2 +- ...AbstractApproxMostFrequentAccumulator.java | 0 .../AbstractApproxPercentileAccumulator.java | 2 +- .../aggregation/AccumulatorFactory.java | 18 +- .../aggregation/AggregationMask.java | 0 .../aggregation/AggregationOperator.java | 2 +- .../ApproxCountDistinctAccumulator.java | 0 .../ApproxPercentileAccumulator.java | 0 ...ApproxPercentileWithWeightAccumulator.java | 0 .../aggregation/AvgAccumulator.java | 0 .../BinaryApproxMostFrequentAccumulator.java | 2 +- .../BlobApproxMostFrequentAccumulator.java | 0 .../BooleanApproxMostFrequentAccumulator.java | 2 +- .../aggregation/CountAccumulator.java | 0 .../aggregation/CountAllAccumulator.java | 0 .../aggregation/CountIfAccumulator.java | 0 .../DoubleApproxMostFrequentAccumulator.java | 2 +- .../aggregation/ExtremeAccumulator.java | 0 .../aggregation/FirstAccumulator.java | 0 .../aggregation/FirstByAccumulator.java | 0 .../aggregation/FirstByDescAccumulator.java | 0 .../aggregation/FirstDescAccumulator.java | 0 .../FloatApproxMostFrequentAccumulator.java | 2 +- .../IntApproxMostFrequentAccumulator.java | 2 +- .../aggregation/LastAccumulator.java | 0 .../aggregation/LastByAccumulator.java | 0 .../aggregation/LastByDescAccumulator.java | 0 .../aggregation/LastDescAccumulator.java | 0 .../LongApproxMostFrequentAccumulator.java | 2 +- .../aggregation/MaskedRecordIterator.java | 0 .../aggregation/MaxAccumulator.java | 0 .../aggregation/MinAccumulator.java | 0 .../aggregation/RecordIterator.java | 2 +- .../aggregation/SumAccumulator.java | 0 .../aggregation/TableAccumulator.java | 0 .../aggregation/TableAggregator.java | 2 +- .../aggregation/TableMaxByAccumulator.java | 0 .../TableMaxMinByBaseAccumulator.java | 0 .../aggregation/TableMinByAccumulator.java | 0 .../aggregation/TableModeAccumulator.java | 0 .../aggregation/TableVarianceAccumulator.java | 0 ...erDefinedAggregateFunctionAccumulator.java | 0 .../source/relational/aggregation/Utils.java | 0 .../ApproxMostFrequentBucketDeserializer.java | 0 .../ApproxMostFrequentBucketSerializer.java | 0 .../aggregation/approximate/Counter.java | 0 .../approximate/DoublyLinkedList.java | 0 .../approximate/ExternalizableUtil.java | 0 .../aggregation/approximate/HyperLogLog.java | 0 .../approximate/HyperLogLogStateFactory.java | 0 .../aggregation/approximate/ITopK.java | 0 .../aggregation/approximate/ListNode2.java | 0 .../aggregation/approximate/Pair.java | 0 .../aggregation/approximate/SpaceSaving.java | 0 .../SpaceSavingByteCalculator.java | 0 .../approximate/SpaceSavingStateFactory.java | 0 .../approximate/StreamSummary.java | 0 .../aggregation/approximate/TDigest.java | 0 ...tGroupedApproxMostFrequentAccumulator.java | 0 ...actGroupedApproxPercentileAccumulator.java | 0 ...yGroupedApproxMostFrequentAccumulator.java | 2 +- ...bGroupedApproxMostFrequentAccumulator.java | 0 ...nGroupedApproxMostFrequentAccumulator.java | 2 +- ...eGroupedApproxMostFrequentAccumulator.java | 2 +- ...tGroupedApproxMostFrequentAccumulator.java | 2 +- .../grouped/GroupedAccumulator.java | 0 .../grouped/GroupedAggregator.java | 2 +- ...GroupedApproxCountDistinctAccumulator.java | 0 .../GroupedApproxPercentileAccumulator.java | 0 ...ApproxPercentileWithWeightAccumulator.java | 2 +- .../grouped/GroupedAvgAccumulator.java | 0 .../grouped/GroupedCountAccumulator.java | 0 .../grouped/GroupedCountAllAccumulator.java | 0 .../grouped/GroupedCountIfAccumulator.java | 0 .../grouped/GroupedExtremeAccumulator.java | 0 .../grouped/GroupedFirstAccumulator.java | 0 .../grouped/GroupedFirstByAccumulator.java | 0 .../grouped/GroupedLastAccumulator.java | 0 .../grouped/GroupedLastByAccumulator.java | 0 .../grouped/GroupedMaxAccumulator.java | 0 .../grouped/GroupedMaxByAccumulator.java | 0 .../GroupedMaxMinByBaseAccumulator.java | 0 .../grouped/GroupedMinAccumulator.java | 0 .../grouped/GroupedMinByAccumulator.java | 0 .../grouped/GroupedModeAccumulator.java | 2 +- .../grouped/GroupedSumAccumulator.java | 0 ...roupedUserDefinedAggregateAccumulator.java | 0 .../grouped/GroupedVarianceAccumulator.java | 0 .../grouped/HashAggregationOperator.java | 6 +- ...tGroupedApproxMostFrequentAccumulator.java | 2 +- ...gGroupedApproxMostFrequentAccumulator.java | 2 +- .../grouped/StreamingAggregationOperator.java | 4 +- .../StreamingHashAggregationOperator.java | 6 +- .../aggregation/grouped/array/BigArrays.java | 0 .../grouped/array/BinaryBigArray.java | 0 .../grouped/array/BooleanBigArray.java | 0 .../grouped/array/ByteBigArray.java | 0 .../grouped/array/DoubleBigArray.java | 0 .../grouped/array/FloatBigArray.java | 0 .../grouped/array/HyperLogLogBigArray.java | 0 .../grouped/array/IntArrayFIFOQueue.java | 0 .../grouped/array/IntBigArray.java | 0 .../grouped/array/IntBigArrays.java | 0 .../grouped/array/IntComparator.java | 0 .../grouped/array/LongBigArray.java | 0 .../grouped/array/LongBigArrayFIFOQueue.java | 0 .../grouped/array/MapBigArray.java | 0 .../grouped/array/ObjectBigArray.java | 0 .../grouped/array/ShortBigArray.java | 0 .../grouped/array/SpaceSavingBigArray.java | 0 .../grouped/array/TDigestBigArray.java | 0 .../builder/HashAggregationBuilder.java | 0 .../InMemoryHashAggregationBuilder.java | 6 +- .../relational/ColumnTransformerBuilder.java | 112 ++--- .../metric/QueryExecutionMetricSet.java | 0 .../plan/planner/CommonOperatorUtils.java | 32 +- .../ITableOperatorGeneratorContext.java | 0 .../plan/planner/TableOperatorGenerator.java | 150 +++---- .../memory/MemoryReservationManager.java | 0 .../metadata/CommonMetadataUtils.java | 0 .../relational/metadata/ITypeMetadata.java | 0 .../planner/CastToBlobLiteralVisitor.java | 0 .../planner/CastToBooleanLiteralVisitor.java | 0 .../planner/CastToDateLiteralVisitor.java | 0 .../planner/CastToDoubleLiteralVisitor.java | 0 .../planner/CastToFloatLiteralVisitor.java | 0 .../planner/CastToInt32LiteralVisitor.java | 0 .../planner/CastToInt64LiteralVisitor.java | 0 .../planner/CastToStringLiteralVisitor.java | 0 .../CastToTimestampLiteralVisitor.java | 0 .../ir/GlobalTimePredicateExtractVisitor.java | 0 .../relational/utils/matching/Capture.java | 0 .../relational/utils/matching/Captures.java | 0 .../utils/matching/DefaultPrinter.java | 0 .../plan/relational/utils/matching/Match.java | 0 .../relational/utils/matching/Pattern.java | 0 .../utils/matching/PatternVisitor.java | 0 .../relational/utils/matching/Property.java | 0 .../utils/matching/PropertyPattern.java | 0 .../matching/pattern/CapturePattern.java | 0 .../utils/matching/pattern/EqualsPattern.java | 0 .../utils/matching/pattern/FilterPattern.java | 0 .../utils/matching/pattern/TypeOfPattern.java | 0 .../utils/matching/pattern/WithPattern.java | 0 ...AbstractTemporaryQueryDataFileService.java | 2 +- ...TemporaryQueryDataFileServiceProvider.java | 0 .../dag/adapter/PointCollectorAdaptor.java | 0 ...AbstractCaseWhenThenColumnTransformer.java | 0 .../dag/column/ColumnCache.java | 0 .../dag/column/ColumnTransformer.java | 0 .../column/FailFunctionColumnTransformer.java | 0 .../TableCaseWhenThenColumnTransformer.java | 0 .../TreeCaseWhenThenColumnTransformer.java | 0 .../ArithmeticAdditionColumnTransformer.java | 0 .../ArithmeticBinaryColumnTransformer.java | 0 .../ArithmeticDivisionColumnTransformer.java | 0 .../ArithmeticModuloColumnTransformer.java | 0 ...hmeticMultiplicationColumnTransformer.java | 0 ...rithmeticSubtractionColumnTransformer.java | 0 .../binary/BinaryColumnTransformer.java | 0 .../CompareBinaryColumnTransformer.java | 0 .../CompareEqualToColumnTransformer.java | 0 .../CompareGreaterEqualColumnTransformer.java | 0 .../CompareGreaterThanColumnTransformer.java | 0 .../CompareLessEqualColumnTransformer.java | 0 .../CompareLessThanColumnTransformer.java | 0 .../CompareNonEqualColumnTransformer.java | 0 .../column/binary/HmacColumnTransformer.java | 2 +- .../column/binary/Like2ColumnTransformer.java | 0 .../binary/LogicAndColumnTransformer.java | 0 .../binary/LogicBinaryColumnTransformer.java | 0 .../binary/LogicOrColumnTransformer.java | 0 .../binary/factory/HmacStrategiesFactory.java | 2 +- .../binary/strategies/HmacStrategy.java | 0 .../leaf/ConstantColumnTransformer.java | 0 .../leaf/IdentityColumnTransformer.java | 0 .../column/leaf/LeafColumnTransformer.java | 0 .../column/leaf/NullColumnTransformer.java | 0 .../column/leaf/TimeColumnTransformer.java | 0 ...bstractGreatestLeastColumnTransformer.java | 0 .../BinaryGreatestColumnTransformer.java | 0 .../multi/BinaryLeastColumnTransformer.java | 0 .../BooleanGreatestColumnTransformer.java | 0 .../multi/BooleanLeastColumnTransformer.java | 0 .../multi/CoalesceColumnTransformer.java | 0 .../DoubleGreatestColumnTransformer.java | 0 .../multi/DoubleLeastColumnTransformer.java | 0 .../multi/FloatGreatestColumnTransformer.java | 0 .../multi/FloatLeastColumnTransformer.java | 0 .../multi/InBinaryMultiColumnTransformer.java | 0 .../InBooleanMultiColumnTransformer.java | 0 .../multi/InDoubleMultiColumnTransformer.java | 0 .../multi/InFloatMultiColumnTransformer.java | 0 .../multi/InInt32MultiColumnTransformer.java | 0 .../multi/InInt64MultiColumnTransformer.java | 0 .../multi/InMultiColumnTransformer.java | 0 .../multi/Int32GreatestColumnTransformer.java | 0 .../multi/Int32LeastColumnTransformer.java | 0 .../multi/Int64GreatestColumnTransformer.java | 0 .../multi/Int64LeastColumnTransformer.java | 0 .../LogicalAndMultiColumnTransformer.java | 0 .../multi/LogicalMultiColumnTransformer.java | 0 .../LogicalOrMultiColumnTransformer.java | 0 .../multi/MappableUDFColumnTransformer.java | 0 .../column/multi/MultiColumnTransformer.java | 0 .../ternary/BetweenColumnTransformer.java | 0 .../CompareTernaryColumnTransformer.java | 0 .../ternary/Like3ColumnTransformer.java | 0 .../column/ternary/LpadColumnTransformer.java | 0 .../column/ternary/RpadColumnTransformer.java | 0 .../ternary/TernaryColumnTransformer.java | 0 .../ternary/utils/BytePaddingUtils.java | 0 .../UserDefineScalarFunctionTransformer.java | 0 .../ArithmeticNegationColumnTransformer.java | 0 .../dag/column/unary/InColumnTransformer.java | 2 +- .../column/unary/IsNullColumnTransformer.java | 0 .../column/unary/LikeColumnTransformer.java | 0 .../unary/LogicNotColumnTransformer.java | 0 .../unary/RegularColumnTransformer.java | 0 .../column/unary/UnaryColumnTransformer.java | 0 .../unary/scalar/AbsColumnTransformer.java | 0 .../AbstractBitwise2ColumnTransformer.java | 0 .../AbstractBitwiseColumnTransformer.java | 0 ...AbstractCastFunctionColumnTransformer.java | 6 +- .../AbstractLengthColumnTransformer.java | 0 .../unary/scalar/AcosColumnTransformer.java | 0 .../unary/scalar/AsinColumnTransformer.java | 0 .../unary/scalar/AtanColumnTransformer.java | 0 .../scalar/BitCount2ColumnTransformer.java | 0 .../scalar/BitCountColumnTransformer.java | 0 .../scalar/BitwiseAnd2ColumnTransformer.java | 0 .../scalar/BitwiseAndColumnTransformer.java | 0 .../BitwiseLeftShift2ColumnTransformer.java | 0 .../BitwiseLeftShiftColumnTransformer.java | 0 .../scalar/BitwiseNotColumnTransformer.java | 0 .../scalar/BitwiseOr2ColumnTransformer.java | 0 .../scalar/BitwiseOrColumnTransformer.java | 0 .../BitwiseRightShift2ColumnTransformer.java | 0 ...ightShiftArithmetic2ColumnTransformer.java | 0 ...RightShiftArithmeticColumnTransformer.java | 0 .../BitwiseRightShiftColumnTransformer.java | 0 .../scalar/BitwiseXor2ColumnTransformer.java | 0 .../scalar/BitwiseXorColumnTransformer.java | 0 .../scalar/BlobLengthColumnTransformer.java | 0 .../BytesToDoubleColumnTransformer.java | 2 +- .../scalar/BytesToFloatColumnTransformer.java | 2 +- .../scalar/BytesToIntColumnTransformer.java | 2 +- .../scalar/BytesToLongColumnTransformer.java | 2 +- .../column/unary/scalar/CRC32Transformer.java | 0 .../scalar/CastFunctionColumnTransformer.java | 0 .../unary/scalar/CeilColumnTransformer.java | 0 .../scalar/Concat2ColumnTransformer.java | 0 .../unary/scalar/ConcatColumnTransformer.java | 0 .../scalar/ConcatMultiColumnTransformer.java | 0 .../unary/scalar/CosColumnTransformer.java | 0 .../unary/scalar/CoshColumnTransformer.java | 0 .../DateBinFunctionColumnTransformer.java | 2 +- .../scalar/DegreesColumnTransformer.java | 0 .../unary/scalar/DiffColumnTransformer.java | 0 .../scalar/DiffFunctionColumnTransformer.java | 0 .../DoubleToBytesColumnTransformer.java | 0 .../scalar/EndsWith2ColumnTransformer.java | 0 .../scalar/EndsWithColumnTransformer.java | 0 .../unary/scalar/ExpColumnTransformer.java | 0 .../unary/scalar/ExtractTransformer.java | 2 +- .../scalar/FloatToBytesColumnTransformer.java | 0 .../unary/scalar/FloorColumnTransformer.java | 0 .../unary/scalar/FormatColumnTransformer.java | 4 +- .../scalar/GenericCodecColumnTransformer.java | 2 +- .../HmacConstantKeyColumnTransformer.java | 0 .../scalar/IntToBytesColumnTransformer.java | 0 .../unary/scalar/LTrim2ColumnTransformer.java | 0 .../unary/scalar/LTrimColumnTransformer.java | 0 .../unary/scalar/LengthColumnTransformer.java | 0 .../unary/scalar/LnColumnTransformer.java | 0 .../unary/scalar/Log10ColumnTransformer.java | 0 .../scalar/LongToBytesColumnTransformer.java | 0 .../unary/scalar/LowerColumnTransformer.java | 0 .../scalar/ObjectLengthColumnTransformer.java | 0 .../unary/scalar/RTrim2ColumnTransformer.java | 0 .../unary/scalar/RTrimColumnTransformer.java | 0 .../scalar/RadiansColumnTransformer.java | 0 .../scalar/RegexpLike2ColumnTransformer.java | 0 .../scalar/RegexpLikeColumnTransformer.java | 0 .../scalar/Replace2ColumnTransformer.java | 0 .../scalar/Replace3ColumnTransformer.java | 0 .../ReplaceFunctionColumnTransformer.java | 0 .../unary/scalar/RoundColumnTransformer.java | 0 .../RoundFunctionColumnTransformer.java | 0 .../unary/scalar/SignColumnTransformer.java | 0 .../unary/scalar/SinColumnTransformer.java | 0 .../unary/scalar/SinhColumnTransformer.java | 0 .../unary/scalar/SqrtColumnTransformer.java | 0 .../scalar/StartsWith2ColumnTransformer.java | 0 .../scalar/StartsWithColumnTransformer.java | 0 .../scalar/Strcmp2ColumnTransformer.java | 0 .../unary/scalar/StrcmpColumnTransformer.java | 0 .../scalar/Strpos2ColumnTransformer.java | 0 .../unary/scalar/StrposColumnTransformer.java | 0 .../scalar/SubString2ColumnTransformer.java | 2 +- .../scalar/SubString3ColumnTransformer.java | 2 +- .../scalar/SubStringColumnTransformer.java | 2 +- .../unary/scalar/TanColumnTransformer.java | 0 .../unary/scalar/TanhColumnTransformer.java | 0 .../unary/scalar/Trim2ColumnTransformer.java | 0 .../unary/scalar/TrimColumnTransformer.java | 0 .../TryCastFunctionColumnTransformer.java | 2 +- .../unary/scalar/UpperColumnTransformer.java | 0 .../factory/CodecStrategiesFactory.java | 2 +- .../NumericCodecStrategiesFactory.java | 0 .../unary/scalar/inteface/CodecStrategy.java | 0 .../column/unary/scalar/util/HexUtils.java | 0 .../unary/scalar/util/SpookyHashV2Utils.java | 0 .../scalar/util/TransformerDebugUtils.java | 0 .../dag/udf/UDFParametersFactory.java | 0 .../transformation/dag/udf/UDTFExecutor.java | 4 +- .../transformation/dag/util/BitwiseUtils.java | 0 .../dag/util/CastFunctionUtils.java | 0 .../dag/util/CommonTransformUtils.java | 0 .../dag/util/InputRowUtils.java | 0 .../transformation/datastructure/Cache.java | 0 .../datastructure/SerializableList.java | 2 +- .../iterator/ListForwardIterator.java | 0 .../iterator/RowListForwardIterator.java | 0 .../iterator/TVListForwardIterator.java | 0 .../row/ElasticSerializableRowList.java | 4 +- .../row/SerializableRowList.java | 4 +- .../tv/ElasticSerializableBinaryTVList.java | 0 .../tv/ElasticSerializableTVList.java | 0 .../datastructure/tv/SerializableTVList.java | 4 +- .../datastructure/util/BinaryUtils.java | 0 .../calc_commons/utils/HeapTraversal.java | 0 .../utils/IObjectFileService.java | 0 .../utils/IObjectFileServiceProvider.java | 0 .../iotdb/calc_commons/utils/IObjectPath.java | 0 .../calc_commons/utils/ObjectTypeUtils.java | 0 .../utils/constant/SqlConstant.java | 0 .../utils/datastructure/MergeSortHeap.java | 0 .../utils/datastructure/MergeSortKey.java | 0 .../utils/datastructure/SortKey.java | 0 .../calc_commons/utils/sort/DiskSpiller.java | 2 +- .../utils/sort/FileSpillerReader.java | 2 +- .../calc_commons/utils/sort/MemoryReader.java | 2 +- .../utils/sort/SortBufferManager.java | 0 .../calc_commons/utils/sort/SortReader.java | 2 +- .../utils/sort/TableDiskSpiller.java | 0 .../utils/sort/TreeDiskSpiller.java | 0 .../ArithmeticColumnTransformerApi.ftl | 230 ---------- .../ArithmeticUnaryColumnTransformer.ftl | 85 ---- .../codegen/templates/ModeAccumulator.ftl | 203 --------- .../src/main/codegen/templates/linearFill.ftl | 122 ----- .../main/codegen/templates/previousFill.ftl | 109 ----- .../previousFillWithTimeDuration.ftl | 130 ------ .../request/read/ttl/ShowTTLPlan.java | 2 +- .../confignode/manager/ProcedureManager.java | 2 +- iotdb-core/datanode/pom.xml | 6 +- .../datanode/src/main/codegen/config.fmpp | 28 -- .../main/codegen/dataModel/AllDataType.tdd | 58 --- .../main/codegen/dataModel/CompareType.tdd | 28 -- .../codegen/dataModel/DecimalDataType.tdd | 38 -- .../dataModel/MathematicalDataType.tdd | 52 --- .../dataModel/MathematicalOperator.tdd | 52 --- .../ArithmeticBinaryColumnTransformer.ftl | 419 ------------------ .../main/codegen/templates/constantFill.ftl | 81 ---- .../apache/iotdb/db/conf/IoTDBDescriptor.java | 2 +- .../db/exception/BatchProcessException.java | 2 +- .../aggregate/AggregateProcessor.java | 2 +- .../PipeConvertedInsertRowStatement.java | 2 +- .../impl/DataNodeInternalRPCServiceImpl.java | 2 +- .../queryengine/common/MPPQueryContext.java | 2 +- .../aggregation/AccumulatorFactory.java | 16 +- .../execution/aggregation/TreeAggregator.java | 2 +- .../aggregation/UDAFAccumulator.java | 4 +- .../EmptyQueueSlidingWindowAggregator.java | 2 +- ...MonotonicQueueSlidingWindowAggregator.java | 2 +- .../NormalQueueSlidingWindowAggregator.java | 2 +- .../SlidingWindowAggregator.java | 2 +- .../SlidingWindowAggregatorFactory.java | 2 +- .../SmoothQueueSlidingWindowAggregator.java | 2 +- .../execution/driver/DataDriver.java | 2 +- .../execution/driver/DataDriverContext.java | 2 +- .../queryengine/execution/driver/Driver.java | 4 +- .../FakedFragmentInstanceContext.java | 2 +- .../fragment/FragmentInstanceContext.java | 4 +- .../fragment/FragmentInstanceExecution.java | 2 +- .../fragment/FragmentInstanceManager.java | 2 +- .../execution/operator/EmptyDataOperator.java | 2 +- .../operator/ExplainAnalyzeOperator.java | 4 +- .../execution/operator/OperatorContext.java | 4 +- .../process/AbstractIntoOperator.java | 4 +- .../process/AbstractTreeIntoOperator.java | 2 +- .../ActiveRegionScanMergeOperator.java | 2 +- .../operator/process/AggregationOperator.java | 2 +- .../process/ColumnInjectOperator.java | 2 +- .../process/DeviceViewIntoOperator.java | 2 +- .../operator/process/DeviceViewOperator.java | 2 +- .../operator/process/ProjectOperator.java | 2 +- .../process/RawDataAggregationOperator.java | 2 +- .../process/SingleDeviceViewOperator.java | 2 +- .../SlidingWindowAggregationOperator.java | 2 +- .../operator/process/TableIntoOperator.java | 2 +- .../process/TagAggregationOperator.java | 2 +- .../operator/process/TransformOperator.java | 6 +- .../operator/process/TreeIntoOperator.java | 2 +- .../process/ai/InferenceOperator.java | 4 +- .../process/copyto/TableCopyToOperator.java | 4 +- .../copyto/tsfile/CopyToTsFileOptions.java | 2 +- .../join/FullOuterTimeJoinOperator.java | 4 +- .../join/HorizontallyConcatOperator.java | 2 +- .../process/join/InnerTimeJoinOperator.java | 4 +- .../join/LeftOuterTimeJoinOperator.java | 2 +- .../join/TableLeftOuterTimeJoinOperator.java | 2 +- .../last/AbstractUpdateLastCacheOperator.java | 2 +- .../last/AlignedUpdateLastCacheOperator.java | 2 +- ...lignedUpdateViewPathLastCacheOperator.java | 2 +- .../last/LastQueryCollectOperator.java | 2 +- .../process/last/LastQueryMergeOperator.java | 2 +- .../process/last/LastQueryOperator.java | 2 +- .../process/last/LastQuerySortOperator.java | 2 +- .../last/LastQueryTransformOperator.java | 2 +- .../process/last/UpdateLastCacheOperator.java | 2 +- .../last/UpdateViewPathLastCacheOperator.java | 2 +- .../CountGroupByLevelMergeOperator.java | 2 +- .../operator/schema/CountMergeOperator.java | 2 +- .../schema/NodeManageMemoryMergeOperator.java | 4 +- .../schema/NodePathsConvertOperator.java | 4 +- .../schema/NodePathsCountOperator.java | 4 +- .../schema/SchemaFetchMergeOperator.java | 2 +- .../schema/SchemaQueryMergeOperator.java | 2 +- .../SchemaQueryOrderByHeatOperator.java | 4 +- .../schema/source/DeviceAttributeUpdater.java | 4 +- .../source/DeviceBlackListConstructor.java | 4 +- .../schema/source/DevicePredicateFilter.java | 4 +- .../schema/source/DevicePredicateHandler.java | 4 +- .../operator/schema/source/DeviceUpdater.java | 4 +- .../operator/sink/IdentitySinkOperator.java | 2 +- .../operator/sink/ShuffleHelperOperator.java | 2 +- .../source/AbstractSourceOperator.java | 2 +- .../operator/source/SourceOperator.java | 2 +- .../AbstractAggTableScanOperator.java | 4 +- .../relational/AbstractTableScanOperator.java | 2 +- .../DeviceIteratorScanOperator.java | 2 +- ...formationSchemaContentSupplierFactory.java | 2 +- .../LastQueryAggTableScanOperator.java | 8 +- ...gnedDeviceViewAggregationScanOperator.java | 2 +- .../TreeToTableViewAdaptorOperator.java | 4 +- .../execution/schedule/DriverScheduler.java | 2 +- .../execution/schedule/IDriverScheduler.java | 2 +- .../plan/analyze/AnalyzeVisitor.java | 6 +- .../plan/analyze/ExpressionAnalyzer.java | 2 +- .../plan/analyze/ExpressionTypeAnalyzer.java | 2 +- .../analyze/TemplatedAggregationAnalyze.java | 2 +- .../TreeSchemaAutoCreatorAndVerifier.java | 2 +- .../schema/ClusterSchemaFetchExecutor.java | 2 +- .../plan/analyze/schema/SchemaValidator.java | 2 +- .../plan/execution/QueryExecution.java | 4 +- .../executor/ClusterConfigTaskExecutor.java | 2 +- .../plan/expression/Expression.java | 2 +- .../expression/binary/BinaryExpression.java | 2 +- .../plan/expression/leaf/LeafOperand.java | 2 +- .../expression/multi/FunctionExpression.java | 2 +- .../builtin/BuiltInScalarFunctionHelper.java | 2 +- .../builtin/helper/CastFunctionHelper.java | 2 +- .../builtin/helper/DiffFunctionHelper.java | 2 +- .../builtin/helper/ReplaceFunctionHelper.java | 2 +- .../builtin/helper/RoundFunctionHelper.java | 2 +- .../helper/SubStringFunctionHelper.java | 2 +- .../other/CaseWhenThenExpression.java | 2 +- .../other/GroupByTimeExpression.java | 2 +- .../expression/ternary/TernaryExpression.java | 2 +- .../expression/unary/UnaryExpression.java | 2 +- .../visitor/ColumnTransformerVisitor.java | 8 +- .../visitor/IntermediateLayerVisitor.java | 4 +- .../BindSchemaForExpressionVisitor.java | 2 +- .../BindSchemaForPredicateVisitor.java | 2 +- ...viceAndBindSchemaForExpressionVisitor.java | 2 +- ...oncatExpressionWithSuffixPathsVisitor.java | 2 +- .../queryengine/plan/parser/ASTVisitor.java | 20 +- .../plan/parser/StatementGenerator.java | 4 +- .../DataNodeTableOperatorGenerator.java | 28 +- .../planner/LocalExecutionPlanContext.java | 4 +- .../plan/planner/LocalExecutionPlanner.java | 4 +- .../plan/planner/LogicalPlanBuilder.java | 4 +- .../plan/planner/OperatorTreeGenerator.java | 38 +- .../plan/planner/PipelineDriverFactory.java | 2 +- .../planner/distribution/SourceRewriter.java | 8 +- ...ildrenOneByOnePipelineMemoryEstimator.java | 2 +- .../memory/PipelineMemoryEstimator.java | 2 +- .../PipelineMemoryEstimatorFactory.java | 2 +- .../planner/plan/node/write/ObjectNode.java | 2 +- .../plan/parameter/AggregationDescriptor.java | 2 +- .../CrossSeriesAggregationDescriptor.java | 2 +- .../analyzer/ExpressionAnalyzer.java | 16 +- .../analyzer/StatementAnalyzer.java | 4 +- .../plan/relational/metadata/Metadata.java | 2 +- .../metadata/TableMetadataImpl.java | 4 +- .../fetcher/TableHeaderSchemaValidator.java | 2 +- .../planner/IrExpressionInterpreter.java | 4 +- .../relational/planner/LiteralEncoder.java | 2 +- .../plan/relational/planner/QueryPlanner.java | 2 +- .../planner/TableLogicalPlanner.java | 2 +- .../TableDistributedPlanGenerator.java | 2 +- .../GapFillStartAndEndTimeExtractVisitor.java | 2 +- .../planner/iterative/IterativeOptimizer.java | 6 +- .../relational/planner/iterative/Rule.java | 4 +- .../EliminateLimitProjectWithTableScan.java | 4 +- .../rule/EliminateLimitWithTableScan.java | 2 +- .../rule/EvaluateEmptyIntersect.java | 4 +- .../rule/ExpressionRewriteRuleSet.java | 4 +- .../iterative/rule/GatherAndMergeWindows.java | 8 +- .../iterative/rule/ImplementExceptAll.java | 4 +- .../rule/ImplementExceptDistinctAsUnion.java | 4 +- .../iterative/rule/ImplementIntersectAll.java | 4 +- .../ImplementIntersectDistinctAsUnion.java | 4 +- .../rule/ImplementPatternRecognition.java | 4 +- .../rule/ImplementTableFunctionSource.java | 4 +- .../iterative/rule/InlineProjections.java | 6 +- .../planner/iterative/rule/MergeExcept.java | 4 +- .../planner/iterative/rule/MergeFilters.java | 2 +- .../iterative/rule/MergeIntersect.java | 4 +- .../MergeLimitOverProjectWithMergeSort.java | 6 +- .../rule/MergeLimitOverProjectWithSort.java | 6 +- .../rule/MergeLimitWithMergeSort.java | 6 +- .../iterative/rule/MergeLimitWithSort.java | 6 +- .../planner/iterative/rule/MergeLimits.java | 2 +- .../planner/iterative/rule/MergeUnion.java | 4 +- ...ipleDistinctAggregationToMarkDistinct.java | 4 +- .../iterative/rule/OptimizeRowPattern.java | 4 +- .../rule/ProjectOffPushDownRule.java | 6 +- .../rule/PruneAggregationSourceColumns.java | 4 +- .../iterative/rule/PruneApplyCorrelation.java | 4 +- .../rule/PruneApplySourceColumns.java | 4 +- .../rule/PruneCorrelatedJoinCorrelation.java | 4 +- .../rule/PruneDistinctAggregation.java | 4 +- .../rule/PruneExceptSourceColumns.java | 4 +- .../rule/PruneIntersectSourceColumns.java | 4 +- .../rule/PruneJoinChildrenColumns.java | 4 +- .../rule/PruneOutputSourceColumns.java | 2 +- .../PrunePatternRecognitionSourceColumns.java | 4 +- ...neTableFunctionProcessorSourceColumns.java | 4 +- .../rule/PruneUnionSourceColumns.java | 4 +- .../rule/PushDownFilterIntoWindow.java | 6 +- .../rule/PushDownLimitIntoWindow.java | 8 +- .../rule/PushDownOffsetIntoTableScan.java | 2 +- .../rule/PushLimitThroughOffset.java | 4 +- .../rule/PushLimitThroughProject.java | 6 +- .../iterative/rule/PushLimitThroughUnion.java | 6 +- .../rule/PushProjectionThroughUnion.java | 6 +- .../iterative/rule/PushTopKThroughUnion.java | 6 +- .../rule/RemoveEmptyExceptBranches.java | 4 +- .../rule/RemoveEmptyUnionBranches.java | 4 +- .../RemoveRedundantEnforceSingleRowNode.java | 2 +- .../iterative/rule/RemoveRedundantExists.java | 4 +- .../RemoveRedundantIdentityProjections.java | 2 +- .../iterative/rule/RemoveRedundantWindow.java | 4 +- .../iterative/rule/RemoveTrivialFilters.java | 4 +- .../RemoveUnreferencedScalarApplyNodes.java | 2 +- .../RemoveUnreferencedScalarSubqueries.java | 4 +- .../rule/ReplaceWindowWithRowNumber.java | 4 +- .../rule/SetOperationNodeTranslator.java | 4 +- .../rule/SimplifyCountOverConstant.java | 10 +- .../SingleDistinctAggregationToGroupBy.java | 4 +- ...atedDistinctAggregationWithProjection.java | 10 +- ...dDistinctAggregationWithoutProjection.java | 10 +- ...elatedGlobalAggregationWithProjection.java | 12 +- ...tedGlobalAggregationWithoutProjection.java | 12 +- ...latedGroupedAggregationWithProjection.java | 10 +- ...edGroupedAggregationWithoutProjection.java | 10 +- .../rule/TransformCorrelatedJoinToJoin.java | 6 +- .../TransformCorrelatedScalarSubquery.java | 8 +- .../TransformExistsApplyToCorrelatedJoin.java | 4 +- ...TransformFilteringSemiJoinToInnerJoin.java | 8 +- ...rrelatedInPredicateSubqueryToSemiJoin.java | 4 +- .../TransformUncorrelatedSubqueryToJoin.java | 6 +- .../node/AggregationTableScanNode.java | 4 +- .../relational/planner/node/Patterns.java | 4 +- .../PushPredicateIntoTableScan.java | 2 +- .../plan/relational/sql/ast/DeleteDevice.java | 6 +- .../plan/relational/sql/ast/InsertRow.java | 2 +- .../plan/relational/sql/ast/InsertRows.java | 2 +- .../plan/relational/sql/ast/InsertTablet.java | 2 +- .../sql/ast/WrappedInsertStatement.java | 2 +- .../relational/sql/parser/AstBuilder.java | 8 +- .../plan/scheduler/ClusterScheduler.java | 2 +- .../FragmentInstanceDispatcherImpl.java | 2 +- .../statement/crud/InsertBaseStatement.java | 2 +- .../statement/crud/InsertRowStatement.java | 2 +- .../crud/InsertRowsOfOneDeviceStatement.java | 2 +- .../statement/crud/InsertRowsStatement.java | 2 +- .../api/LayerRowWindowReader.java | 2 +- ...eRowRecordListBackedMultiColumnWindow.java | 2 +- ...rializableTVListBackedSingleColumnRow.java | 2 +- ...lizableTVListBackedSingleColumnWindow.java | 2 +- .../dag/input/ConstantInputReader.java | 2 +- .../dag/input/QueryDataSetInputLayer.java | 2 +- .../ConstantIntermediateLayer.java | 2 +- .../dag/intermediate/IntermediateLayer.java | 2 +- .../dag/intermediate/MultiInputLayer.java | 2 +- .../binary/ArithmeticBinaryTransformer.java | 2 +- .../transformer/binary/BinaryTransformer.java | 2 +- .../binary/CompareBinaryTransformer.java | 2 +- .../multi/UDFQueryTransformer.java | 2 +- .../ternary/CompareTernaryTransformer.java | 2 +- .../ternary/TernaryTransformer.java | 2 +- .../unary/ArithmeticNegationTransformer.java | 2 +- .../dag/transformer/unary/InTransformer.java | 2 +- .../transformer/unary/IsNullTransformer.java | 2 +- .../transformer/unary/LikeTransformer.java | 2 +- .../unary/LogicNotTransformer.java | 2 +- .../transformer/unary/RegularTransformer.java | 2 +- .../unary/TransparentTransformer.java | 2 +- .../transformer/unary/UnaryTransformer.java | 2 +- .../unary/scalar/CastFunctionTransformer.java | 2 +- .../unary/scalar/DiffFunctionTransformer.java | 2 +- .../scalar/RoundFunctionTransformer.java | 2 +- .../dag/udf/UDAFInformationInferrer.java | 2 +- .../transformation/dag/udf/UDTFContext.java | 2 +- .../dag/udf/UDTFInformationInferrer.java | 2 +- .../dag/util/TransformUtils.java | 2 +- .../transformation/dag/util/TypeUtils.java | 2 +- .../impl/SchemaRegionMemoryImpl.java | 6 +- .../utils/ResourceByPathUtils.java | 4 +- .../table/DataNodeTableCache.java | 2 +- .../org/apache/iotdb/db/service/DataNode.java | 2 +- .../metrics/DataNodeMetricsHelper.java | 2 +- .../metrics/IoTDBInternalLocalReporter.java | 2 +- .../storageengine/dataregion/DataRegion.java | 6 +- .../dataregion/IDataRegionForQuery.java | 2 +- .../dataregion/VirtualDataRegion.java | 2 +- .../dataregion/memtable/AbstractMemTable.java | 2 +- .../memtable/AbstractWritableMemChunk.java | 2 +- .../dataregion/memtable/IMemTable.java | 2 +- .../dataregion/memtable/ReadOnlyMemChunk.java | 2 +- .../dataregion/memtable/TsFileProcessor.java | 4 +- .../apache/iotdb/db/utils/CommonUtils.java | 4 +- .../db/utils/DataNodeObjectFileService.java | 4 +- .../iotdb/db/utils/ErrorHandlingUtils.java | 2 +- .../apache/iotdb/db/utils/SchemaUtils.java | 2 +- .../iotdb/db/utils/TypeInferenceUtils.java | 2 +- .../iotdb/db/qp/sql/ASTVisitorTest.java | 2 +- .../queryengine/execution/DataDriverTest.java | 4 +- .../aggregation/AccumulatorTest.java | 2 +- .../FragmentInstanceExecutionTest.java | 4 +- .../AggregationMergeSortOperatorTest.java | 2 +- .../operator/AggregationOperatorTest.java | 4 +- .../DeviceIteratorScanOperatorTest.java | 2 +- .../operator/DeviceViewIntoOperatorTest.java | 2 +- .../operator/DeviceViewOperatorTest.java | 2 +- .../execution/operator/FillOperatorTest.java | 10 +- .../operator/LastQueryMergeOperatorTest.java | 2 +- .../execution/operator/LimitOperatorTest.java | 2 +- .../operator/MergeTreeSortOperatorTest.java | 4 +- ...nedTreeDeviceViewScanOperatorTreeTest.java | 6 +- .../operator/OffsetOperatorTest.java | 4 +- .../operator/OperatorMemoryTest.java | 18 +- .../RawDataAggregationOperatorTest.java | 2 +- .../operator/SortOperatorSortBranchTest.java | 6 +- .../operator/TransformOperatorTest.java | 2 +- .../operator/TreeIntoOperatorTest.java | 2 +- .../operator/TreeLinearFillOperatorTest.java | 6 +- .../operator/TreeSortOperatorTest.java | 4 +- .../operator/TreeTopKOperatorTest.java | 2 +- .../ViewFromTreeAdaptorOperatorTest.java | 2 +- .../process/TableStreamSortOperatorTest.java | 8 +- .../operator/process/ValuesOperatorTest.java | 4 +- .../gapfill/GapFillWGroupWMoOperatorTest.java | 6 +- .../GapFillWGroupWoMoOperatorTest.java | 6 +- .../GapFillWoGroupWMoOperatorTest.java | 4 +- .../GapFillWoGroupWoMoOperatorTest.java | 4 +- .../join/InnerTimeJoinOperatorTest.java | 2 +- .../process/rowpattern/MatcherTest.java | 4 +- .../tvf/TableFunctionOperatorTest.java | 2 +- .../process/window/RowNumberOperatorTest.java | 4 +- .../window/TableWindowOperatorTest.java | 4 +- .../window/TopKRankingOperatorTest.java | 6 +- .../window/function/FunctionTestUtils.java | 2 +- .../AggregationWindowFunctionTest.java | 4 +- .../partition/frame/RangeFrameTest.java | 2 +- .../SinkOperatorDownStreamNodeIdTest.java | 2 +- .../plan/parser/StatementGeneratorTest.java | 2 +- .../plan/planner/PipelineBuilderTest.java | 2 +- .../AggregationTableScanTest.java | 6 +- .../SeriesAggregationScanNodeSerdeTest.java | 2 +- .../node/source/SeriesScanNodeSerdeTest.java | 2 +- .../analyzer/AggregationCornerCaseTest.java | 14 +- .../plan/relational/analyzer/JoinTest.java | 6 +- .../relational/analyzer/TestMetadata.java | 2 +- .../builder/EvaluationDAGBuilderTest.java | 2 +- .../hmac/HmacMd5ColumnTransformerTest.java | 2 +- .../hmac/HmacSha1ColumnTransformerTest.java | 2 +- .../hmac/HmacSha256ColumnTransformerTest.java | 2 +- .../hmac/HmacSha512ColumnTransformerTest.java | 2 +- .../ternary/LpadColumnTransformerTest.java | 2 +- .../ternary/RpadColumnTransformerTest.java | 2 +- .../FromBigEndian32ColumnTransformerTest.java | 2 +- .../FromBigEndian64ColumnTransformerTest.java | 2 +- ...E754_32BigEndianColumnTransformerTest.java | 2 +- ...E754_64BigEndianColumnTransformerTest.java | 2 +- ...omLittleEndian32ColumnTransformerTest.java | 2 +- ...omLittleEndian64ColumnTransformerTest.java | 2 +- .../FromBase32ColumnTransformerTest.java | 2 +- .../FromBase64ColumnTransformerTest.java | 2 +- .../FromBase64UrlColumnTransformerTest.java | 2 +- .../dag/util/BitwiseUtilsTest.java | 2 +- .../ElasticSerializableRowListTest.java | 2 +- .../dataregion/DataRegionTest.java | 2 +- .../dataregion/TTLQueryTest.java | 2 +- .../db/storageengine/dataregion/TTLTest.java | 2 +- .../memtable/AlignedTVListIteratorTest.java | 2 +- .../memtable/MemChunkDeserializeTest.java | 2 +- .../NonAlignedTVListIteratorTest.java | 2 +- .../memtable/PrimitiveMemTableTest.java | 6 +- .../dataregion/wal/WALTestUtils.java | 2 +- .../wal/buffer/WALBufferCommonTest.java | 2 +- .../wal/compression/WALCompressionTest.java | 2 +- .../wal/recover/WALRecoverManagerTest.java | 2 +- .../memory/TimePartitionManagerTest.java | 2 +- .../db/utils/ErrorHandlingUtilsTest.java | 2 +- .../iotdb/db/utils/SchemaUtilsTest.java | 2 +- .../db/utils/TypeInferenceUtilsTest.java | 2 +- .../iotdb/db/utils/sort/SortUtilTest.java | 6 +- iotdb-core/pom.xml | 2 +- 903 files changed, 985 insertions(+), 2602 deletions(-) rename iotdb-core/{calc_commons => calc-commons}/pom.xml (93%) rename iotdb-core/{calc_commons => calc-commons}/src/main/codegen/config.fmpp (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/codegen/dataModel/AllDataType.tdd (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/codegen/dataModel/CompareType.tdd (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/codegen/dataModel/DecimalDataType.tdd (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/codegen/dataModel/MathematicalDataType.tdd (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/codegen/dataModel/MathematicalOperator.tdd (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl (94%) rename iotdb-core/{datanode => calc-commons}/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl (91%) rename iotdb-core/{datanode => calc-commons}/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl (91%) rename iotdb-core/{datanode => calc-commons}/src/main/codegen/templates/ModeAccumulator.ftl (97%) rename iotdb-core/{calc_commons => calc-commons}/src/main/codegen/templates/constantFill.ftl (89%) rename iotdb-core/{datanode => calc-commons}/src/main/codegen/templates/linearFill.ftl (94%) rename iotdb-core/{datanode => calc-commons}/src/main/codegen/templates/previousFill.ftl (92%) rename iotdb-core/{datanode => calc-commons}/src/main/codegen/templates/previousFillWithTimeDuration.ftl (92%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/exception/MemoryNotEnoughException.java (100%) rename iotdb-core/{datanode/src/main/java/org/apache/iotdb/db/exception/query => calc-commons/src/main/java/org/apache/iotdb/calc_commons/exception}/QueryProcessException.java (96%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/Accumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/VarianceAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/AbstractOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/CommonOperatorContext.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNBuilder.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/IdRegistry.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/Operator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdComparisonStrategy.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdHashStrategy.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReference.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReferenceTsBlockManager.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/TsBlockWithPositionComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractFillOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractLinearFillOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractSortOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AggregationMergeSortOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AssignUniqueIdOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/CollectOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/EnforceSingleRowOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/FilterAndProjectOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/LimitOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MappingCollectOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MergeSortOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/OffsetOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PatternRecognitionOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ProcessOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/SortOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableFillOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableMergeSortOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableSortOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableStreamSortOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableTopKOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TopKOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ValuesOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFill.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFillFilter.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/ILinearFill.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityFill.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/linear/LinearFill.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/PartitionRecognizer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionCache.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionState.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/Slice.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/Computation.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Done.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Program.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Save.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Split.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/RowNumberOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TableWindowOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TopKRankingOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LagFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LeadFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/Partition.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/Frame.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/ColumnList.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/Range.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/RowComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/Utils.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/execution/relational/ColumnTransformerBuilder.java (99%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/metric/QueryExecutionMetricSet.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/planner/CommonOperatorUtils.java (79%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/planner/ITableOperatorGeneratorContext.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/planner/TableOperatorGenerator.java (99%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/planner/memory/MemoryReservationManager.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/CommonMetadataUtils.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/ITypeMetadata.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Capture.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Captures.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/DefaultPrinter.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Match.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Pattern.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PatternVisitor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Property.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PropertyPattern.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/service/AbstractTemporaryQueryDataFileService.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnCache.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/InColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDFParametersFactory.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDTFExecutor.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/BitwiseUtils.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CastFunctionUtils.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CommonTransformUtils.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/InputRowUtils.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/Cache.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/SerializableList.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java (99%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/SerializableRowList.java (99%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/SerializableTVList.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/util/BinaryUtils.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/HeapTraversal.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileService.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileServiceProvider.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectPath.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/ObjectTypeUtils.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/constant/SqlConstant.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortHeap.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortKey.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/SortKey.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/sort/DiskSpiller.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/sort/FileSpillerReader.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/sort/MemoryReader.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortBufferManager.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortReader.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TableDiskSpiller.java (100%) rename iotdb-core/{calc_commons => calc-commons}/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TreeDiskSpiller.java (100%) delete mode 100644 iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl delete mode 100644 iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl delete mode 100644 iotdb-core/calc_commons/src/main/codegen/templates/ModeAccumulator.ftl delete mode 100644 iotdb-core/calc_commons/src/main/codegen/templates/linearFill.ftl delete mode 100644 iotdb-core/calc_commons/src/main/codegen/templates/previousFill.ftl delete mode 100644 iotdb-core/calc_commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl delete mode 100644 iotdb-core/datanode/src/main/codegen/config.fmpp delete mode 100644 iotdb-core/datanode/src/main/codegen/dataModel/AllDataType.tdd delete mode 100644 iotdb-core/datanode/src/main/codegen/dataModel/CompareType.tdd delete mode 100644 iotdb-core/datanode/src/main/codegen/dataModel/DecimalDataType.tdd delete mode 100644 iotdb-core/datanode/src/main/codegen/dataModel/MathematicalDataType.tdd delete mode 100644 iotdb-core/datanode/src/main/codegen/dataModel/MathematicalOperator.tdd delete mode 100644 iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl delete mode 100644 iotdb-core/datanode/src/main/codegen/templates/constantFill.ftl diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java index 505ebb5fff08a..055882e60b87b 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java @@ -17,6 +17,7 @@ package org.apache.iotdb.rest.protocol.table.v1.handler; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.auth.AuthException; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; @@ -26,7 +27,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.DatabaseNotSetException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; import org.apache.iotdb.rest.protocol.model.ExecutionStatus; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/ExceptionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/ExceptionHandler.java index 525cf8a5e440e..551fbf8cd9955 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/ExceptionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/ExceptionHandler.java @@ -17,6 +17,7 @@ package org.apache.iotdb.rest.protocol.v1.handler; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.auth.AuthException; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; @@ -25,7 +26,6 @@ import org.apache.iotdb.commons.exception.auth.AccessDeniedException; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.DatabaseNotSetException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; import org.apache.iotdb.rest.protocol.v1.model.ExecutionStatus; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/ExceptionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/ExceptionHandler.java index c0c04088d3867..6dc1bbe3cbabf 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/ExceptionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/ExceptionHandler.java @@ -17,6 +17,7 @@ package org.apache.iotdb.rest.protocol.v2.handler; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.auth.AuthException; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; @@ -25,7 +26,6 @@ import org.apache.iotdb.commons.exception.auth.AccessDeniedException; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.DatabaseNotSetException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; import org.apache.iotdb.rest.protocol.model.ExecutionStatus; import org.apache.iotdb.rpc.TSStatusCode; 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 0cc52f86fd817..e5e2301d64065 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.tool.data; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.cli.type.ExitType; import org.apache.iotdb.cli.utils.CliContext; import org.apache.iotdb.cli.utils.IoTPrinter; @@ -27,7 +28,6 @@ import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.utils.PathUtils; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.exception.ArgsErrorException; import org.apache.iotdb.isession.SessionDataSet; import org.apache.iotdb.rpc.IoTDBConnectionException; diff --git a/iotdb-core/calc_commons/pom.xml b/iotdb-core/calc-commons/pom.xml similarity index 93% rename from iotdb-core/calc_commons/pom.xml rename to iotdb-core/calc-commons/pom.xml index fe2a0acabd84d..f4a6662608861 100644 --- a/iotdb-core/calc_commons/pom.xml +++ b/iotdb-core/calc-commons/pom.xml @@ -1,15 +1,12 @@ - + 4.0.0 org.apache.iotdb iotdb-core 2.0.7-SNAPSHOT - - calc_commons + calc-commons IoTDB: Core: Calc Commons Common modules of the server and stream node @@ -17,7 +14,6 @@ false ${calc.test.skip} - org.apache.iotdb @@ -299,7 +295,6 @@ test - + org.apache.drill.tools + drill-fmpp-maven-plugin + + + generate-fmpp + + generate + + generate-sources + + ${project.build.directory}/codegen/config.fmpp + ${project.build.directory}/generated-sources/freemarker + ${project.build.directory}/codegen/templates + + + + org.apache.maven.plugins maven-failsafe-plugin @@ -453,4 +467,4 @@ - \ No newline at end of file + diff --git a/iotdb-core/calc_commons/src/main/codegen/config.fmpp b/iotdb-core/calc-commons/src/main/codegen/config.fmpp similarity index 100% rename from iotdb-core/calc_commons/src/main/codegen/config.fmpp rename to iotdb-core/calc-commons/src/main/codegen/config.fmpp diff --git a/iotdb-core/calc_commons/src/main/codegen/dataModel/AllDataType.tdd b/iotdb-core/calc-commons/src/main/codegen/dataModel/AllDataType.tdd similarity index 100% rename from iotdb-core/calc_commons/src/main/codegen/dataModel/AllDataType.tdd rename to iotdb-core/calc-commons/src/main/codegen/dataModel/AllDataType.tdd diff --git a/iotdb-core/calc_commons/src/main/codegen/dataModel/CompareType.tdd b/iotdb-core/calc-commons/src/main/codegen/dataModel/CompareType.tdd similarity index 100% rename from iotdb-core/calc_commons/src/main/codegen/dataModel/CompareType.tdd rename to iotdb-core/calc-commons/src/main/codegen/dataModel/CompareType.tdd diff --git a/iotdb-core/calc_commons/src/main/codegen/dataModel/DecimalDataType.tdd b/iotdb-core/calc-commons/src/main/codegen/dataModel/DecimalDataType.tdd similarity index 100% rename from iotdb-core/calc_commons/src/main/codegen/dataModel/DecimalDataType.tdd rename to iotdb-core/calc-commons/src/main/codegen/dataModel/DecimalDataType.tdd diff --git a/iotdb-core/calc_commons/src/main/codegen/dataModel/MathematicalDataType.tdd b/iotdb-core/calc-commons/src/main/codegen/dataModel/MathematicalDataType.tdd similarity index 100% rename from iotdb-core/calc_commons/src/main/codegen/dataModel/MathematicalDataType.tdd rename to iotdb-core/calc-commons/src/main/codegen/dataModel/MathematicalDataType.tdd diff --git a/iotdb-core/calc_commons/src/main/codegen/dataModel/MathematicalOperator.tdd b/iotdb-core/calc-commons/src/main/codegen/dataModel/MathematicalOperator.tdd similarity index 100% rename from iotdb-core/calc_commons/src/main/codegen/dataModel/MathematicalOperator.tdd rename to iotdb-core/calc-commons/src/main/codegen/dataModel/MathematicalOperator.tdd diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl similarity index 94% rename from iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl rename to iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl index 2b8f23b9d4723..a6c20aa6b9351 100644 --- a/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl @@ -25,13 +25,13 @@ <#--Main Part--> <#if (first.instance == "DATE" || first.instance == "TIMESTAMP") && (second.instance == "INT" || second.instance == "LONG")><#if operator.name == "Addition" || operator.name == "Subtraction"> -<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/${className}.java" /> +<@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/transformation/dag/column/binary/${className}.java" /> <#--Date + int || Date + long || Timestamp + int || Timestamp + long--> <#--Date - int || Date - long || Timestamp - int || Timestamp - long--> -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; @@ -171,11 +171,11 @@ public class ${className} extends BinaryColumnTransformer { <#elseif (second.instance == "DATE" || second.instance =="TIMESTAMP") && (first.instance == "INT" || first.instance == "LONG")> <#if operator.name == "Addition"> <#--int + Date || long + Date || int + Timestamp || long + Timestamp--> -<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/${className}.java" /> -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +<@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/transformation/dag/column/binary/${className}.java" /> +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; @@ -276,7 +276,7 @@ public class ${className} extends BinaryColumnTransformer { } <#elseif first.instance != "DATE" && first.instance != "TIMESTAMP" && second.instance != "DATE" && second.instance != "TIMESTAMP"> -<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/${className}.java" /> +<@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/transformation/dag/column/binary/${className}.java" /> <#--int、long、float、double with + - * / %--> <#--assign resultType--> <#if first.dataType == "double" || second.dataType == "double"> @@ -289,11 +289,11 @@ public class ${className} extends BinaryColumnTransformer { <#assign resultType = "int" /> <#--Parting line--> -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl similarity index 91% rename from iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl rename to iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl index d6ff9c9fdbdf2..8bd04ede4d02b 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl @@ -18,8 +18,8 @@ */ <@pp.dropOutputFile /> -<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticColumnTransformerApi.java" /> -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; +<@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticColumnTransformerApi.java" /> +package org.apache.iotdb.calc_commons.transformation.dag.column.binary; import org.apache.tsfile.read.common.type.Type; @@ -28,12 +28,12 @@ import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.ModulusResolver; import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.SubtractionResolver; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.DoubleNegationColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.FloatNegationColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.IntNegationColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LongNegationColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.TimestampNegationColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.DoubleNegationColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.FloatNegationColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.IntNegationColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LongNegationColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.TimestampNegationColumnTransformer; import java.time.ZoneId; import java.util.Arrays; diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl similarity index 91% rename from iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl rename to iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl index 3080829c754a2..2254378026727 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl @@ -22,11 +22,11 @@ <#assign newType = type.type?replace("Type","")> <#assign className = "${newType}NegationColumnTransformer"> <#if newType != "Date"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/${className}.java" /> -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; + <@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/transformation/dag/column/unary/${className}.java" /> +package org.apache.iotdb.calc_commons.transformation.dag.column.unary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/ModeAccumulator.ftl similarity index 97% rename from iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl rename to iotdb-core/calc-commons/src/main/codegen/templates/ModeAccumulator.ftl index 7a3f154f002fb..cdd2381331db3 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/ModeAccumulator.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/ModeAccumulator.ftl @@ -21,9 +21,9 @@ <#list allDataTypes.types as type> <#assign className = "${type.dataType?cap_first}ModeAccumulator"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/aggregation/${className}.java" /> + <@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/execution/aggregation/${className}.java" /> -package org.apache.iotdb.db.calc_commons.execution.aggregation; +package org.apache.iotdb.calc_commons.execution.aggregation; import com.google.common.collect.ImmutableList; import org.apache.iotdb.commons.conf.CommonDescriptor; diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/constantFill.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/constantFill.ftl similarity index 89% rename from iotdb-core/calc_commons/src/main/codegen/templates/constantFill.ftl rename to iotdb-core/calc-commons/src/main/codegen/templates/constantFill.ftl index d4cb860c34115..67083df12742d 100644 --- a/iotdb-core/calc_commons/src/main/codegen/templates/constantFill.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/constantFill.ftl @@ -20,10 +20,10 @@ <#list allDataTypes.types as type> <#assign className = "${type.dataType?cap_first}ConstantFill"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/constant/${className}.java" /> -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant; + <@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/execution/operator/process/fill/constant/${className}.java" /> +package org.apache.iotdb.calc_commons.execution.operator.process.fill.constant; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; import org.apache.tsfile.read.common.block.column.${type.column}; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; diff --git a/iotdb-core/datanode/src/main/codegen/templates/linearFill.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/linearFill.ftl similarity index 94% rename from iotdb-core/datanode/src/main/codegen/templates/linearFill.ftl rename to iotdb-core/calc-commons/src/main/codegen/templates/linearFill.ftl index acc3d72f270f0..9d2bad3412db9 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/linearFill.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/linearFill.ftl @@ -21,8 +21,8 @@ <#list decimalDataTypes.types as type> <#assign className = "${type.dataType?cap_first}LinearFill"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/linear/${className}.java" /> -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear; + <@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/execution/operator/process/fill/linear/${className}.java" /> +package org.apache.iotdb.calc_commons.execution.operator.process.fill.linear; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.${type.column}; diff --git a/iotdb-core/datanode/src/main/codegen/templates/previousFill.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/previousFill.ftl similarity index 92% rename from iotdb-core/datanode/src/main/codegen/templates/previousFill.ftl rename to iotdb-core/calc-commons/src/main/codegen/templates/previousFill.ftl index 41c5227447a0d..93a2c2cf9602b 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/previousFill.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/previousFill.ftl @@ -21,10 +21,10 @@ <#list allDataTypes.types as type> <#assign className = "${type.dataType?cap_first}PreviousFill"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/previous/${className}.java" /> -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous; + <@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/execution/operator/process/fill/previous/${className}.java" /> +package org.apache.iotdb.calc_commons.execution.operator.process.fill.previous; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.${type.column}; import org.apache.tsfile.read.common.block.column.${type.column}Builder; diff --git a/iotdb-core/datanode/src/main/codegen/templates/previousFillWithTimeDuration.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl similarity index 92% rename from iotdb-core/datanode/src/main/codegen/templates/previousFillWithTimeDuration.ftl rename to iotdb-core/calc-commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl index 4a740be669ac4..149443bba02fe 100644 --- a/iotdb-core/datanode/src/main/codegen/templates/previousFillWithTimeDuration.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl @@ -21,11 +21,11 @@ <#list allDataTypes.types as type> <#assign className = "${type.dataType?cap_first}PreviousFillWithTimeDuration"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/previous/${className}.java" /> -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous; + <@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/execution/operator/process/fill/previous/${className}.java" /> +package org.apache.iotdb.calc_commons.execution.operator.process.fill.previous; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFillFilter; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFillFilter; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.${type.column}; import org.apache.tsfile.read.common.block.column.${type.column}Builder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/exception/MemoryNotEnoughException.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/exception/MemoryNotEnoughException.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/exception/MemoryNotEnoughException.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/exception/MemoryNotEnoughException.java diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/QueryProcessException.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/exception/QueryProcessException.java similarity index 96% rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/QueryProcessException.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/exception/QueryProcessException.java index 08b6a61d06a53..ee6964ca1c39b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/QueryProcessException.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/exception/QueryProcessException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.exception.query; +package org.apache.iotdb.calc_commons.exception; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/Accumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/Accumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/Accumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/Accumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/VarianceAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/VarianceAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/VarianceAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/VarianceAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/AbstractOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/AbstractOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/AbstractOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/AbstractOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/CommonOperatorContext.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/CommonOperatorContext.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/CommonOperatorContext.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/CommonOperatorContext.java index d2c01e3833d85..dfa9d87a0763b 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/CommonOperatorContext.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/CommonOperatorContext.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.execution.operator; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import io.airlift.units.Duration; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNBuilder.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNBuilder.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNBuilder.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNBuilder.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java index 24f294439e5de..2ba5ee749a864 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java @@ -19,8 +19,8 @@ package org.apache.iotdb.calc_commons.execution.operator; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/IdRegistry.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/IdRegistry.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/IdRegistry.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/IdRegistry.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/Operator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/Operator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/Operator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/Operator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdComparisonStrategy.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdComparisonStrategy.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdComparisonStrategy.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdComparisonStrategy.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdHashStrategy.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdHashStrategy.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdHashStrategy.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdHashStrategy.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReference.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReference.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReference.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReference.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReferenceTsBlockManager.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReferenceTsBlockManager.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReferenceTsBlockManager.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReferenceTsBlockManager.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java index e65f632163bae..4189768e7c06e 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.execution.operator; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator; import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/TsBlockWithPositionComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/TsBlockWithPositionComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/TsBlockWithPositionComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/TsBlockWithPositionComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractFillOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractFillOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractFillOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractFillOperator.java index 61e40e35834c3..66ebf7113c88c 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractFillOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractFillOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractLinearFillOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractLinearFillOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractLinearFillOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractLinearFillOperator.java index a3cbd5e7c6041..ae5e3069ff326 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractLinearFillOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractLinearFillOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractSortOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractSortOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractSortOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractSortOperator.java index 381f72c8f5e46..3f76f55f3c0a1 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractSortOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractSortOperator.java @@ -19,8 +19,6 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortHeap; @@ -30,6 +28,8 @@ import org.apache.iotdb.calc_commons.utils.sort.MemoryReader; import org.apache.iotdb.calc_commons.utils.sort.SortBufferManager; import org.apache.iotdb.calc_commons.utils.sort.SortReader; +import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.exception.IoTDBException; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AggregationMergeSortOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AggregationMergeSortOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AggregationMergeSortOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AggregationMergeSortOperator.java index a26623782fcfe..e78facd55d29b 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AggregationMergeSortOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AggregationMergeSortOperator.java @@ -19,13 +19,13 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortHeap; import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AssignUniqueIdOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AssignUniqueIdOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AssignUniqueIdOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AssignUniqueIdOperator.java index 0e7b4c87a3ff1..11ad55dd82f7e 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AssignUniqueIdOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AssignUniqueIdOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/CollectOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/CollectOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/CollectOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/CollectOperator.java index 6676c82be9f1b..4dcbe97a1c3a9 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/CollectOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/CollectOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.utils.TestOnly; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/EnforceSingleRowOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/EnforceSingleRowOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/EnforceSingleRowOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/EnforceSingleRowOperator.java index d87b41acd5474..87feea1e18555 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/EnforceSingleRowOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/EnforceSingleRowOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/FilterAndProjectOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/FilterAndProjectOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/FilterAndProjectOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/FilterAndProjectOperator.java index 4fb249913e2d7..1e26c4858d4ef 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/FilterAndProjectOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/FilterAndProjectOperator.java @@ -19,7 +19,6 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.transformation.dag.column.AbstractCaseWhenThenColumnTransformer; @@ -32,6 +31,7 @@ import org.apache.iotdb.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/LimitOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/LimitOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/LimitOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/LimitOperator.java index 476a9f13d41c3..c3622fac859c2 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/LimitOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/LimitOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MappingCollectOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MappingCollectOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MappingCollectOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MappingCollectOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MergeSortOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MergeSortOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MergeSortOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MergeSortOperator.java index 1307fdcbe8b8e..9f11194da8c61 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MergeSortOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MergeSortOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortHeap; import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/OffsetOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/OffsetOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/OffsetOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/OffsetOperator.java index e515cc6d67127..377a71a448152 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/OffsetOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/OffsetOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PatternRecognitionOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PatternRecognitionOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PatternRecognitionOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PatternRecognitionOperator.java index 577508bf738ea..8ab540850d24b 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PatternRecognitionOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PatternRecognitionOperator.java @@ -19,9 +19,6 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; @@ -32,6 +29,9 @@ import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java index 0723ca09f7351..9ab1ff1a03e61 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ProcessOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ProcessOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ProcessOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ProcessOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/SortOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/SortOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/SortOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/SortOperator.java index fa1df3ce73d52..fae2c5eebf5d7 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/SortOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/SortOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.calc_commons.utils.sort.DiskSpiller; +import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableFillOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableFillOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableFillOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableFillOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableMergeSortOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableMergeSortOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableMergeSortOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableMergeSortOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableSortOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableSortOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableSortOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableSortOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableStreamSortOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableStreamSortOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableStreamSortOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableStreamSortOperator.java index 4b6e9e4647164..2e7f6a30bd6fa 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableStreamSortOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableStreamSortOperator.java @@ -19,13 +19,13 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.calc_commons.utils.sort.TableDiskSpiller; +import org.apache.iotdb.commons.exception.IoTDBException; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableTopKOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableTopKOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableTopKOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableTopKOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TopKOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TopKOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TopKOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TopKOperator.java index 20d19904f86b0..29a01beb36ecf 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TopKOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TopKOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortHeap; import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ValuesOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ValuesOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ValuesOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ValuesOperator.java index 4a9cff82c3d3e..bb4a21bf7dffe 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ValuesOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ValuesOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFill.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFill.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFill.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFill.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFillFilter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFillFilter.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFillFilter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFillFilter.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/ILinearFill.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/ILinearFill.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/ILinearFill.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/ILinearFill.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityFill.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityFill.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityFill.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityFill.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/linear/LinearFill.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/linear/LinearFill.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/linear/LinearFill.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/linear/LinearFill.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/PartitionRecognizer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/PartitionRecognizer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/PartitionRecognizer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/PartitionRecognizer.java index fb1e47d886ed0..68e201cd1173c 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/PartitionRecognizer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/PartitionRecognizer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.execution.operator.process.function; -import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionState; import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.Slice; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.type.Type; import org.apache.tsfile.enums.TSDataType; @@ -32,8 +32,8 @@ import java.util.List; import java.util.stream.Collectors; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; public class PartitionRecognizer { diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java index 7a36146fc12d0..13deffd8b5ab7 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.execution.operator.process.function; -import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; import org.apache.iotdb.udf.api.relational.table.processor.TableFunctionLeafProcessor; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionOperator.java index 112bd2b23db7a..0e27651bf357a 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionOperator.java @@ -19,7 +19,6 @@ package org.apache.iotdb.calc_commons.execution.operator.process.function; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.AggregationMergeSortOperator; @@ -28,6 +27,7 @@ import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionState; import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.Slice; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; import org.apache.iotdb.udf.api.relational.table.processor.TableFunctionDataProcessor; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionCache.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionCache.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionCache.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionCache.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionState.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionState.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionState.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionState.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/Slice.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/Slice.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/Slice.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/Slice.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java index 9a11fdc8819ff..d1d268232fdcf 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java index 98c7d5d5bfd14..56b79d668c4c3 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.calc_commons.execution.operator.process.join; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java index efebb4e50a5d9..b8ca267ec729a 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.calc_commons.execution.operator.process.join.merge; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.external.commons.collections4.comparators.ComparatorChain; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java index 66d93a25e975f..c425cb40893c0 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; +import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; import java.util.Collections; import java.util.Map; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java index 31a9e5b5a26cb..8b06eacd7a49a 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; -import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java index 2258eb8638aec..c585b4883e5b1 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java @@ -19,9 +19,6 @@ package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; -import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition; import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer.PatternVariableComputation; import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; @@ -30,6 +27,9 @@ import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/Computation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/Computation.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/Computation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/Computation.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java index 5de7728268143..69e76be366c43 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java @@ -19,13 +19,13 @@ package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregator; import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalAggregationPointer; import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValueAccessor; import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer; import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.type.AbstractIntType; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Done.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Done.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Done.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Done.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Program.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Program.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Program.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Program.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Save.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Save.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Save.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Save.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Split.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Split.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Split.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Split.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/RowNumberOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/RowNumberOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/RowNumberOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/RowNumberOperator.java index 5041682290801..c05fc0481b0ac 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/RowNumberOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/RowNumberOperator.java @@ -18,13 +18,13 @@ */ package org.apache.iotdb.calc_commons.execution.operator.process.window; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -44,8 +44,8 @@ import java.util.Map; import java.util.Optional; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; public class RowNumberOperator implements ProcessOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TableWindowOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TableWindowOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TableWindowOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TableWindowOperator.java index c22e1842bd4a4..451e012dca072 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TableWindowOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TableWindowOperator.java @@ -19,7 +19,6 @@ package org.apache.iotdb.calc_commons.execution.operator.process.window; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; @@ -33,6 +32,7 @@ import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TopKRankingOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TopKRankingOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TopKRankingOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TopKRankingOperator.java index 18a8c97039d83..33da80a749187 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TopKRankingOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TopKRankingOperator.java @@ -19,13 +19,6 @@ package org.apache.iotdb.calc_commons.execution.operator.process.window; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.NoChannelGroupByHash; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.GroupedTopNBuilder; import org.apache.iotdb.calc_commons.execution.operator.GroupedTopNRowNumberBuilder; @@ -33,6 +26,13 @@ import org.apache.iotdb.calc_commons.execution.operator.SimpleTsBlockWithPositionComparator; import org.apache.iotdb.calc_commons.execution.operator.TsBlockWithPositionComparator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.NoChannelGroupByHash; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LagFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LagFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LagFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LagFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LeadFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LeadFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LeadFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LeadFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/Partition.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/Partition.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/Partition.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/Partition.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/Frame.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/Frame.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/Frame.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/Frame.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java index 35d0f4b00156a..cc29160da1fcf 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java @@ -19,11 +19,11 @@ package org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; +import org.apache.iotdb.commons.exception.SemanticException; import java.util.List; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java index 864f9f12d9a36..3d72128f8fb5f 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java @@ -19,11 +19,11 @@ package org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.write.UnSupportedDataTypeException; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java index 5d0cc3191fc71..c565895695232 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; +import org.apache.iotdb.commons.exception.SemanticException; import static com.google.common.base.Preconditions.checkArgument; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/ColumnList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/ColumnList.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/ColumnList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/ColumnList.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/Range.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/Range.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/Range.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/Range.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/RowComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/RowComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/RowComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/RowComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java index 93813f9e195f9..50f0d2f082d5e 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java index 77d6262658e44..1f62ef69b775a 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java index 9728ddf0fdd27..df4f5021ff0b5 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java @@ -19,13 +19,13 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java index e1eff8cf136b1..e6329d0e74d67 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java index 85fa5e78ce227..b833de1d1ede0 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java index 6183b14d4752b..63bb9c48bf7c7 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java index a5db4ecf66fa3..027796720af6a 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java index f65d89171b38d..11d6b6b22d2d0 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java @@ -14,8 +14,8 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java index 3a0ae43b7fd47..b5768a412de42 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java @@ -19,13 +19,6 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; -import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.calc_commons.execution.aggregation.VarianceAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.BinaryGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.BlobGroupedApproxMostFrequentAccumulator; @@ -55,6 +48,13 @@ import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedVarianceAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.IntGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; +import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.AggregateFunction; @@ -78,12 +78,12 @@ import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isMeasurementColumn; +import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.FIRST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.FIRST_BY; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST_BY; -import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isMeasurementColumn; -import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; import static org.apache.tsfile.read.common.type.IntType.INT32; public class AccumulatorFactory { diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java index ff7c0d60c448e..602c5dbf6c299 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java index 28376b4ef5c31..4552eae81fde1 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java @@ -14,10 +14,10 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java index 75e8a91396e0c..55bd57fb02174 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java @@ -14,10 +14,10 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java index 84dc6dd7c683e..e5e77fac2a113 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java @@ -14,10 +14,10 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java index 096d7da883645..2cd8eebc5b536 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java @@ -14,10 +14,10 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java index b744db7f19146..0654a81a20d03 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java @@ -14,10 +14,10 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java index 170854833018c..57ea7f9c8e3b5 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java @@ -14,10 +14,10 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java index d727133f4eef9..a2a3ca4d5ebc1 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java index ffc60d5822fc5..556410c1f7047 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/Utils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/Utils.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/Utils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/Utils.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java index 680269fe3ec42..f128143cde71f 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java @@ -14,11 +14,11 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.BinaryApproxMostFrequentAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java index 0d20896142321..c1ad26d8bb47f 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java @@ -14,11 +14,11 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.BooleanApproxMostFrequentAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java index 8cb50733c4371..6ea41d822b9c0 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java @@ -14,11 +14,11 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.DoubleApproxMostFrequentAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java index c2c087687f274..c7255a56805a0 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java @@ -14,11 +14,11 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.FloatApproxMostFrequentAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java index 0df41609bb5c0..7200e87d59b2e 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java index ccbcf17e7619c..eafa91dbe72c2 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java @@ -14,9 +14,9 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java index 7a942a2b43cef..92039624271fe 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.MapBigArray; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java index 7edf988b19052..3e02a72ce7833 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java @@ -19,14 +19,14 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -38,8 +38,8 @@ import java.util.Optional; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; public class HashAggregationOperator extends AbstractOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java index e4023bc5381c8..af002a335b20d 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java @@ -14,11 +14,11 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.IntApproxMostFrequentAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java index cafcdfbf28af5..2291dbd859d8c 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java @@ -14,11 +14,11 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LongApproxMostFrequentAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java index d8ca305900038..3e3c9b00c42e8 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java @@ -19,14 +19,14 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java index 93806ea370f8e..bd6c98688fbbc 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java @@ -19,8 +19,6 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; @@ -28,6 +26,8 @@ import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; @@ -45,9 +45,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.MAX_USED_MEMORY; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; public class StreamingHashAggregationOperator extends AbstractOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java index 70d657f83b768..a92bd556ea768 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java @@ -19,13 +19,13 @@ package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/relational/ColumnTransformerBuilder.java similarity index 99% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/relational/ColumnTransformerBuilder.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/relational/ColumnTransformerBuilder.java index b60ed2fe8a900..d1b3328c97495 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/relational/ColumnTransformerBuilder.java @@ -19,64 +19,11 @@ package org.apache.iotdb.calc_commons.execution.relational; -import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.AdditionResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.DivisionResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.ModulusResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.SubtractionResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DecimalLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; -import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; -import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.calc_commons.plan.relational.metadata.ITypeMetadata; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.TableCaseWhenThenColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.ArithmeticColumnTransformerApi; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticColumnTransformerApi; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareEqualToColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; @@ -196,6 +143,59 @@ import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.UpperColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.AdditionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.DivisionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.ModulusResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; +import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; +import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.ScalarFunction; @@ -227,8 +227,6 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; import static org.apache.iotdb.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; @@ -238,6 +236,8 @@ import static org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.isStringLiteral; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/metric/QueryExecutionMetricSet.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/metric/QueryExecutionMetricSet.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/metric/QueryExecutionMetricSet.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/metric/QueryExecutionMetricSet.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/CommonOperatorUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/CommonOperatorUtils.java similarity index 79% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/CommonOperatorUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/CommonOperatorUtils.java index 204dbbc9b9d5b..a921a0ccf2965 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/CommonOperatorUtils.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/CommonOperatorUtils.java @@ -23,22 +23,22 @@ import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.MonthIntervalUSFillFilter; import org.apache.iotdb.calc_commons.execution.operator.process.fill.identity.IdentityFill; import org.apache.iotdb.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.DoubleLinearFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.IntLinearFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.LongLinearFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.BinaryPreviousFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.BinaryPreviousFillWithTimeDuration; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.BooleanPreviousFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.BooleanPreviousFillWithTimeDuration; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.DoublePreviousFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.DoublePreviousFillWithTimeDuration; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.FloatPreviousFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.FloatPreviousFillWithTimeDuration; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.IntPreviousFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.LongPreviousFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.LongPreviousFillWithTimeDuration; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.DoubleLinearFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.IntLinearFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.LongLinearFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.BinaryPreviousFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.BinaryPreviousFillWithTimeDuration; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.BooleanPreviousFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.BooleanPreviousFillWithTimeDuration; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.DoublePreviousFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.DoublePreviousFillWithTimeDuration; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.FloatPreviousFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.FloatPreviousFillWithTimeDuration; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.IntPreviousFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.LongPreviousFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.LongPreviousFillWithTimeDuration; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.column.LongColumn; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/ITableOperatorGeneratorContext.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/ITableOperatorGeneratorContext.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/ITableOperatorGeneratorContext.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/ITableOperatorGeneratorContext.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/TableOperatorGenerator.java similarity index 99% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/TableOperatorGenerator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/TableOperatorGenerator.java index e09a676bf7df6..5a812273a2c9c 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/TableOperatorGenerator.java @@ -19,65 +19,6 @@ package org.apache.iotdb.calc_commons.plan.planner; -import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind; -import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionFactory; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.AggregationLabelSet; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.AggregationValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ClassifierValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.MatchNumberValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.AssignUniqueIdOperator; @@ -99,12 +40,12 @@ import org.apache.iotdb.calc_commons.execution.operator.process.ValuesOperator; import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BinaryConstantFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BooleanConstantFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.FloatConstantFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.IntConstantFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.LongConstantFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.BinaryConstantFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.BooleanConstantFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.FloatConstantFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.IntConstantFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.LongConstantFill; import org.apache.iotdb.calc_commons.execution.operator.process.function.TableFunctionLeafOperator; import org.apache.iotdb.calc_commons.execution.operator.process.function.TableFunctionOperator; import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWGroupWMoOperator; @@ -164,6 +105,65 @@ import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind; +import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionFactory; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.AggregationLabelSet; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.AggregationValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ClassifierValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.MatchNumberValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ValuePointer; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; @@ -205,16 +205,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch.ONE; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition.LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; -import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; import static org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; @@ -229,6 +219,16 @@ import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; +import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch.ONE; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition.LAST; +import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; import static org.apache.tsfile.read.common.type.LongType.INT64; import static org.apache.tsfile.read.common.type.StringType.STRING; import static org.apache.tsfile.read.common.type.TimestampType.TIMESTAMP; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/memory/MemoryReservationManager.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/memory/MemoryReservationManager.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/memory/MemoryReservationManager.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/memory/MemoryReservationManager.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/CommonMetadataUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/CommonMetadataUtils.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/CommonMetadataUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/CommonMetadataUtils.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/ITypeMetadata.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/ITypeMetadata.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/ITypeMetadata.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/ITypeMetadata.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Capture.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Capture.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Capture.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Capture.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Captures.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Captures.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Captures.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Captures.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/DefaultPrinter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/DefaultPrinter.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/DefaultPrinter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/DefaultPrinter.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Match.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Match.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Match.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Match.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Pattern.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Pattern.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Pattern.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Pattern.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PatternVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PatternVisitor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PatternVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PatternVisitor.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Property.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Property.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Property.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Property.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PropertyPattern.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PropertyPattern.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PropertyPattern.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PropertyPattern.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/service/AbstractTemporaryQueryDataFileService.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/service/AbstractTemporaryQueryDataFileService.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/service/AbstractTemporaryQueryDataFileService.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/service/AbstractTemporaryQueryDataFileService.java index af6932184344c..71dc3cdb9ee72 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/service/AbstractTemporaryQueryDataFileService.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/service/AbstractTemporaryQueryDataFileService.java @@ -19,11 +19,11 @@ package org.apache.iotdb.calc_commons.service; +import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList.SerializationRecorder; import org.apache.iotdb.commons.exception.StartupException; import org.apache.iotdb.commons.file.SystemFileFactory; import org.apache.iotdb.commons.service.IService; import org.apache.iotdb.commons.service.ServiceType; -import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList.SerializationRecorder; import org.apache.tsfile.external.commons.io.FileUtils; import org.slf4j.Logger; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnCache.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnCache.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnCache.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnCache.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java index 0f45a12097d7e..bbdcdb110bc2c 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.binary; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java index b3928f9d714da..4e907a0beac5d 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java @@ -19,8 +19,8 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.commons.exception.SemanticException; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/InColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/InColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/InColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/InColumnTransformer.java index 61486b38b3227..2de258997151f 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/InColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/InColumnTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java index c8ff0430a0bd7..9f9c104729ca6 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java @@ -19,12 +19,12 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.util.CastFunctionUtils; +import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java index d574d1b3a265d..da16af6018efd 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java index 848c43b8d177b..a3af6b9b341e6 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java index d386f4ab05b15..431f614d05c12 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java index 977dba0bc7ce2..649bb9602cce2 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java index 49af96730ec8f..ce758038b6d8b 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java index 7a3b4c69d0866..f64950e01fbb4 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java index ccc1a5fc3df80..6f1ba96b729ab 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java @@ -14,10 +14,10 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; +import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java index 0e2db7ea35e13..09b6b82a83772 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.inteface.CodecStrategy; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java index 19997b1b4c296..b002078257874 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java index b1abf1c85b2ae..5122fd302893d 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java index 3dda375ec08ec..b5776bb79421b 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java index f0e53db85614b..1df94dd92b243 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; -import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java index ed16258159429..824bda90f5d8f 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java @@ -19,10 +19,10 @@ package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.inteface.CodecStrategy; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.HexUtils; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.SpookyHashV2Utils; +import org.apache.iotdb.commons.exception.SemanticException; import com.google.common.hash.Hashing; import com.google.common.io.BaseEncoding; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDFParametersFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDFParametersFactory.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDFParametersFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDFParametersFactory.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDTFExecutor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDTFExecutor.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDTFExecutor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDTFExecutor.java index 57feac18ac656..6dd5fb08b1490 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDTFExecutor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDTFExecutor.java @@ -19,11 +19,11 @@ package org.apache.iotdb.calc_commons.transformation.dag.udf; -import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; -import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.calc_commons.transformation.dag.adapter.PointCollectorAdaptor; import org.apache.iotdb.calc_commons.transformation.dag.util.InputRowUtils; import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.UDTF; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowWindow; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/BitwiseUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/BitwiseUtils.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/BitwiseUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/BitwiseUtils.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CastFunctionUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CastFunctionUtils.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CastFunctionUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CastFunctionUtils.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CommonTransformUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CommonTransformUtils.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CommonTransformUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CommonTransformUtils.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/InputRowUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/InputRowUtils.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/InputRowUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/InputRowUtils.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/Cache.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/Cache.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/Cache.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/Cache.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/SerializableList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/SerializableList.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/SerializableList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/SerializableList.java index f445f2762a661..a7f3f911f63bd 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/SerializableList.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/SerializableList.java @@ -19,9 +19,9 @@ package org.apache.iotdb.calc_commons.transformation.datastructure; +import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.tsfile.utils.PublicBAOS; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java similarity index 99% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java index 0f5df3073b9c7..500d6b5948ef3 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java @@ -19,11 +19,11 @@ package org.apache.iotdb.calc_commons.transformation.datastructure.row; -import org.apache.iotdb.commons.utils.TestOnly; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.calc_commons.transformation.datastructure.Cache; import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.commons.utils.TestOnly; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/SerializableRowList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/SerializableRowList.java similarity index 99% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/SerializableRowList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/SerializableRowList.java index 1b70a6af37c2c..640e79d01e133 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/SerializableRowList.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/SerializableRowList.java @@ -19,8 +19,8 @@ package org.apache.iotdb.calc_commons.transformation.datastructure.row; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; @@ -35,9 +35,9 @@ import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.commons.conf.IoTDBConstant.MB; import static org.apache.iotdb.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_ARRAY_HEADER_SIZE; import static org.apache.iotdb.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_OBJECT_HEADER_SIZE; +import static org.apache.iotdb.commons.conf.IoTDBConstant.MB; public class SerializableRowList implements SerializableList { private final SerializationRecorder serializationRecorder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/SerializableTVList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/SerializableTVList.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/SerializableTVList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/SerializableTVList.java index 1fb60a5a9c54b..fe0680151c50a 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/SerializableTVList.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/SerializableTVList.java @@ -19,8 +19,8 @@ package org.apache.iotdb.calc_commons.transformation.datastructure.tv; -import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; +import org.apache.iotdb.commons.utils.TestOnly; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; @@ -37,9 +37,9 @@ import java.util.List; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.commons.conf.IoTDBConstant.MB; import static org.apache.iotdb.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_ARRAY_HEADER_SIZE; import static org.apache.iotdb.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_OBJECT_HEADER_SIZE; +import static org.apache.iotdb.commons.conf.IoTDBConstant.MB; public class SerializableTVList implements SerializableList { protected final SerializationRecorder serializationRecorder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/util/BinaryUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/util/BinaryUtils.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/util/BinaryUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/util/BinaryUtils.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/HeapTraversal.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/HeapTraversal.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/HeapTraversal.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/HeapTraversal.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileService.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileService.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileService.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileService.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileServiceProvider.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileServiceProvider.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileServiceProvider.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileServiceProvider.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectPath.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectPath.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectPath.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectPath.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/ObjectTypeUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/ObjectTypeUtils.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/ObjectTypeUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/ObjectTypeUtils.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/constant/SqlConstant.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/constant/SqlConstant.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/constant/SqlConstant.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/constant/SqlConstant.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortHeap.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortHeap.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortHeap.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortHeap.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortKey.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortKey.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortKey.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortKey.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/SortKey.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/SortKey.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/SortKey.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/SortKey.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/DiskSpiller.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/DiskSpiller.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/DiskSpiller.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/DiskSpiller.java index f2d7930d169b7..2d5af5ccb7673 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/DiskSpiller.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/DiskSpiller.java @@ -19,8 +19,8 @@ package org.apache.iotdb.calc_commons.utils.sort; -import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/FileSpillerReader.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/FileSpillerReader.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/FileSpillerReader.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/FileSpillerReader.java index 0a126ba5f49ff..c1a8aa4a81c7b 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/FileSpillerReader.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/FileSpillerReader.java @@ -19,8 +19,8 @@ package org.apache.iotdb.calc_commons.utils.sort; -import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/MemoryReader.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/MemoryReader.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/MemoryReader.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/MemoryReader.java index 03d314e3ede91..f1cc616e2179c 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/MemoryReader.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/MemoryReader.java @@ -19,8 +19,8 @@ package org.apache.iotdb.calc_commons.utils.sort; -import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.commons.exception.IoTDBException; import java.util.List; diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortBufferManager.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortBufferManager.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortBufferManager.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortBufferManager.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortReader.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortReader.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortReader.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortReader.java index e4460bcf9accb..e5be6abcdfec3 100644 --- a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortReader.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortReader.java @@ -19,8 +19,8 @@ package org.apache.iotdb.calc_commons.utils.sort; -import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.commons.exception.IoTDBException; public interface SortReader { diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TableDiskSpiller.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TableDiskSpiller.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TableDiskSpiller.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TableDiskSpiller.java diff --git a/iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TreeDiskSpiller.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TreeDiskSpiller.java similarity index 100% rename from iotdb-core/calc_commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TreeDiskSpiller.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TreeDiskSpiller.java diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl b/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl deleted file mode 100644 index d6ff9c9fdbdf2..0000000000000 --- a/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl +++ /dev/null @@ -1,230 +0,0 @@ -/* - * 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. - */ - -<@pp.dropOutputFile /> -<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/ArithmeticColumnTransformerApi.java" /> -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; - -import org.apache.tsfile.read.common.type.Type; - -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.AdditionResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.DivisionResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.ModulusResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.SubtractionResolver; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.DoubleNegationColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.FloatNegationColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.IntNegationColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.LongNegationColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.unary.TimestampNegationColumnTransformer; - -import java.time.ZoneId; -import java.util.Arrays; -import java.util.List; - -public class ArithmeticColumnTransformerApi { - <#list mathematicalOperator.binaryOperators as operator> - - public static ColumnTransformer get${operator.name}Transformer( - ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { - switch (leftTransformer.getType().getTypeEnum()) { - case INT32: - return getInt${operator.name}Transformer(leftTransformer, rightTransformer, zoneId); - case INT64: - return getLong${operator.name}Transformer(leftTransformer, rightTransformer, zoneId); - case FLOAT: - return getFloat${operator.name}Transformer(leftTransformer, rightTransformer, zoneId); - case DOUBLE: - return getDouble${operator.name}Transformer(leftTransformer, rightTransformer, zoneId); - <#if operator.name == "Addition" || operator.name == "Subtraction"> - case DATE: - return getDate${operator.name}Transformer(leftTransformer, rightTransformer, zoneId); - case TIMESTAMP: - return getTimestamp${operator.name}Transformer(leftTransformer, rightTransformer, zoneId); - - default: - throw new UnsupportedOperationException("Unsupported Type"); - } - } - - - public static ColumnTransformer getNegationTransformer(ColumnTransformer columnTransformer) { - switch (columnTransformer.getType().getTypeEnum()) { - case INT32: - return new IntNegationColumnTransformer( - columnTransformer.getType(), columnTransformer); - case INT64: - return new LongNegationColumnTransformer( - columnTransformer.getType(), columnTransformer); - case FLOAT: - return new FloatNegationColumnTransformer( - columnTransformer.getType(), columnTransformer); - case DOUBLE: - return new DoubleNegationColumnTransformer( - columnTransformer.getType(), columnTransformer); - case TIMESTAMP: - return new TimestampNegationColumnTransformer( - columnTransformer.getType(), columnTransformer); - default: - throw new UnsupportedOperationException("Unsupported Type"); - } - } - <#-- Parting line --> - <#list mathematicalOperator.binaryOperators as operator> - <#list mathematicalDataType.types as first> - <#assign firstType = first.type?replace("Type","")> - <#-- The getTransformer method without Date and Timesatmp --> - <#if firstType != "Date" && firstType != "Timestamp"> - - private static ColumnTransformer get${firstType}${operator.name}Transformer( - ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { - List argumentTypes = - Arrays.asList(leftTransformer.getType(), rightTransformer.getType()); - switch (rightTransformer.getType().getTypeEnum()) { - case INT32: - return new ${firstType}${operator.name}IntColumnTransformer( - ${operator.name}Resolver.checkConditions(argumentTypes).get(), - leftTransformer, - rightTransformer); - case INT64: - return new ${firstType}${operator.name}LongColumnTransformer( - ${operator.name}Resolver.checkConditions(argumentTypes).get(), - leftTransformer, - rightTransformer); - case FLOAT: - return new ${firstType}${operator.name}FloatColumnTransformer( - ${operator.name}Resolver.checkConditions(argumentTypes).get(), - leftTransformer, - rightTransformer); - case DOUBLE: - return new ${firstType}${operator.name}DoubleColumnTransformer( - ${operator.name}Resolver.checkConditions(argumentTypes).get(), - leftTransformer, - rightTransformer); - <#if operator.name == "Addition" && (firstType == "Int" || firstType == "Long")> - case DATE: - return new ${firstType}${operator.name}DateColumnTransformer( - ${operator.name}Resolver.checkConditions(argumentTypes).get(), - leftTransformer, - rightTransformer, - zoneId); - case TIMESTAMP: - return new ${firstType}${operator.name}TimestampColumnTransformer( - ${operator.name}Resolver.checkConditions(argumentTypes).get(), - leftTransformer, - rightTransformer, - zoneId); - - default: - throw new UnsupportedOperationException("Unsupported Type"); - } - } - - - - - private static ColumnTransformer getDateAdditionTransformer( - ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { - List argumentTypes = - Arrays.asList(leftTransformer.getType(), rightTransformer.getType()); - switch (rightTransformer.getType().getTypeEnum()) { - case INT32: - return new DateAdditionIntColumnTransformer( - AdditionResolver.checkConditions(argumentTypes).get(), - leftTransformer, - rightTransformer, - zoneId); - case INT64: - return new DateAdditionLongColumnTransformer( - AdditionResolver.checkConditions(argumentTypes).get(), - leftTransformer, - rightTransformer, - zoneId); - default: - throw new UnsupportedOperationException("Unsupported Type"); - } - } - - private static ColumnTransformer getTimestampAdditionTransformer( - ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { - List argumentTypes = - Arrays.asList(leftTransformer.getType(), rightTransformer.getType()); - switch (rightTransformer.getType().getTypeEnum()) { - case INT32: - return new TimestampAdditionIntColumnTransformer( - AdditionResolver.checkConditions(argumentTypes).get(), - leftTransformer, - rightTransformer, - zoneId); - case INT64: - return new TimestampAdditionLongColumnTransformer( - AdditionResolver.checkConditions(argumentTypes).get(), - leftTransformer, - rightTransformer, - zoneId); - default: - throw new UnsupportedOperationException("Unsupported Type"); - } - } - - private static ColumnTransformer getDateSubtractionTransformer( - ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { - List argumentTypes = - Arrays.asList(leftTransformer.getType(), rightTransformer.getType()); - switch (rightTransformer.getType().getTypeEnum()) { - case INT32: - return new DateSubtractionIntColumnTransformer( - AdditionResolver.checkConditions(argumentTypes).get(), - leftTransformer, - rightTransformer, - zoneId); - case INT64: - return new DateSubtractionLongColumnTransformer( - AdditionResolver.checkConditions(argumentTypes).get(), - leftTransformer, - rightTransformer, - zoneId); - default: - throw new UnsupportedOperationException("Unsupported Type"); - } - } - - private static ColumnTransformer getTimestampSubtractionTransformer( - ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { - List argumentTypes = - Arrays.asList(leftTransformer.getType(), rightTransformer.getType()); - switch (rightTransformer.getType().getTypeEnum()) { - case INT32: - return new TimestampSubtractionIntColumnTransformer( - AdditionResolver.checkConditions(argumentTypes).get(), - leftTransformer, - rightTransformer, - zoneId); - case INT64: - return new TimestampSubtractionLongColumnTransformer( - AdditionResolver.checkConditions(argumentTypes).get(), - leftTransformer, - rightTransformer, - zoneId); - default: - throw new UnsupportedOperationException("Unsupported Type"); - } - } -} diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl b/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl deleted file mode 100644 index 3080829c754a2..0000000000000 --- a/iotdb-core/calc_commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl +++ /dev/null @@ -1,85 +0,0 @@ -/* - * 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. - */ - -<@pp.dropOutputFile /> -<#list mathematicalDataType.types as type> - <#assign newType = type.type?replace("Type","")> - <#assign className = "${newType}NegationColumnTransformer"> -<#if newType != "Date"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/unary/${className}.java" /> -package org.apache.iotdb.db.calc_commons.transformation.dag.column.unary; - -import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; - -import org.apache.tsfile.block.column.Column; -import org.apache.tsfile.block.column.ColumnBuilder; -import org.apache.tsfile.read.common.type.Type; - -import static org.apache.iotdb.rpc.TSStatusCode.NUMERIC_VALUE_OUT_OF_RANGE; - -public class ${className} extends UnaryColumnTransformer { - - public ${className}( - Type returnType, ColumnTransformer childColumnTransformer) { - super(returnType, childColumnTransformer); - } - - @Override - protected void doTransform( - Column column, ColumnBuilder columnBuilder) { - for (int i = 0, n = column.getPositionCount(); i < n; i++) { - if (!column.isNull(i)) { - returnType.write${type.dataType?cap_first}( - columnBuilder, transform(childColumnTransformer.getType().get${type.dataType?cap_first}(column, i))); - } else { - columnBuilder.appendNull(); - } - } - } - - @Override - protected void doTransform( - Column column, ColumnBuilder columnBuilder, boolean[] selection) { - for (int i = 0, n = column.getPositionCount(); i < n; i++) { - if (selection[i] && !column.isNull(i)) { - returnType.write${type.dataType?cap_first}( - columnBuilder, transform(childColumnTransformer.getType().get${type.dataType?cap_first}(column, i))); - } else { - columnBuilder.appendNull(); - } - } - } - - @Override - protected void checkType() { - // do nothing - } - - public static ${type.dataType} transform(${type.dataType} value){ - <#if type.dataType == "int" || type.dataType == "long"> - if(value == <#if type.dataType == "int">Integer<#else>Long.MIN_VALUE){ - throw new IoTDBRuntimeException(String.format("The %s is out of range of ${type.dataType}.", value), NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), true); - } - - return -value; - } -} - - diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/ModeAccumulator.ftl b/iotdb-core/calc_commons/src/main/codegen/templates/ModeAccumulator.ftl deleted file mode 100644 index 7a3f154f002fb..0000000000000 --- a/iotdb-core/calc_commons/src/main/codegen/templates/ModeAccumulator.ftl +++ /dev/null @@ -1,203 +0,0 @@ -/* - * 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. - */ -<@pp.dropOutputFile /> - -<#list allDataTypes.types as type> - - <#assign className = "${type.dataType?cap_first}ModeAccumulator"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/aggregation/${className}.java" /> - -package org.apache.iotdb.db.calc_commons.execution.aggregation; - -import com.google.common.collect.ImmutableList; -import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.tsfile.external.commons.collections4.comparators.ComparatorChain; -import org.apache.tsfile.enums.TSDataType; -import org.apache.tsfile.file.metadata.statistics.Statistics; -import org.apache.tsfile.block.column.Column; -import org.apache.tsfile.block.column.ColumnBuilder; -import org.apache.tsfile.utils.Binary; -import org.apache.tsfile.utils.BitMap; -import org.apache.tsfile.utils.Pair; -import org.apache.tsfile.utils.ReadWriteIOUtils; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -import static com.google.common.base.Preconditions.checkArgument; - -/* -* This class is generated using freemarker and the ${.template_name} template. -*/ -@SuppressWarnings("unused") -public class ${className} implements Accumulator { - // pair left records count of element, pair right records min time of element - private final Map<${type.javaBoxName}, Pair> countMap = new HashMap<>(); - - <#if type.dataType != "boolean"> - private final int MAP_SIZE_THRESHOLD = CommonDescriptor.getInstance().getConfig().getModeMapSizeThreshold(); - - - @Override - public void addInput(Column[] column, BitMap bitMap) { - int count = column[0].getPositionCount(); - for (int i = 0; i < count; i++) { - if (bitMap != null && !bitMap.isMarked(i)) { - continue; - } - if (!column[1].isNull(i)) { - final long time = column[0].getLong(i); - countMap.compute( - column[1].get${type.dataType?cap_first}(i), - (k, v) -> - v == null ? new Pair<>(1L, time) : new Pair<>(v.left + 1, Math.min(v.right, time))); - <#if type.dataType != "boolean"> - - if (countMap.size() > MAP_SIZE_THRESHOLD) { - throw new RuntimeException( - String.format( - "distinct values has exceeded the threshold %s when calculate Mode", - MAP_SIZE_THRESHOLD)); - } - - } - } - } - - @Override - public void addIntermediate(Column[] partialResult) { - checkArgument(partialResult.length == 1, "partialResult of Mode should be 1"); - checkArgument(!partialResult[0].isNull(0), "partialResult of Mode should not be null"); - deserializeAndMergeCountMap(partialResult[0].getBinary(0)); - } - - @Override - public void addStatistics(Statistics statistics) { - throw new UnsupportedOperationException(getClass().getName()); - } - - @Override - public void setFinal(Column finalResult) { - if (finalResult.isNull(0)) { - return; - } - - // Step of ModeAccumulator is STATIC, - // countMap only need to record one entry which key is finalResult - countMap.put(finalResult.get${type.dataType?cap_first}(0), new Pair<>(0L, Long.MIN_VALUE)); - } - - @Override - public void outputIntermediate(ColumnBuilder[] tsBlockBuilder) { - tsBlockBuilder[0].writeBinary(serializeCountMap()); - } - - @Override - public void outputFinal(ColumnBuilder tsBlockBuilder) { - if (countMap.isEmpty()) { - tsBlockBuilder.appendNull(); - } else { - tsBlockBuilder.write${type.dataType?cap_first}( - Collections.max( - countMap.entrySet(), - Map.Entry.comparingByValue( - new ComparatorChain<>( - ImmutableList.of( - (v1, v2) -> v1.left.compareTo(v2.left), - (v1, v2) -> v2.right.compareTo(v1.right))))) - .getKey()); - } - } - - @Override - public void reset() { - countMap.clear(); - } - - @Override - public boolean hasFinalResult() { - return false; - } - - @Override - public TSDataType[] getIntermediateType() { - return new TSDataType[] {TSDataType.TEXT}; - } - - @Override - public TSDataType getFinalType() { - return ${type.tsDataType}; - } - - private Binary serializeCountMap() { - ByteArrayOutputStream stream = new ByteArrayOutputStream(); - try { - ReadWriteIOUtils.write(countMap.size(), stream); - for (Map.Entry<${type.javaBoxName}, Pair> entry : countMap.entrySet()) { - ReadWriteIOUtils.write(entry.getKey(), stream); - ReadWriteIOUtils.write(entry.getValue().left, stream); - ReadWriteIOUtils.write(entry.getValue().right, stream); - } - } catch (IOException e) { - // Totally memory operation. This case won't happen. - } - return new Binary(stream.toByteArray()); - } - - private void deserializeAndMergeCountMap(Binary partialResult) { - InputStream stream = new ByteArrayInputStream(partialResult.getValues()); - try { - int size = ReadWriteIOUtils.readInt(stream); - for (int i = 0; i < size; i++) { - countMap.compute( - ReadWriteIOUtils.read${type.dataType?cap_first}(stream), - (k, v) -> { - try { - return v == null - ? new Pair<>( - ReadWriteIOUtils.readLong(stream), ReadWriteIOUtils.readLong(stream)) - : new Pair<>( - v.left + ReadWriteIOUtils.readLong(stream), - Math.min(v.right, ReadWriteIOUtils.readLong(stream))); - } catch (IOException e) { - throw new RuntimeException(e); - } - }); - <#if type.dataType != "boolean"> - - if (countMap.size() > MAP_SIZE_THRESHOLD) { - throw new RuntimeException( - String.format( - "distinct values has exceeded the threshold %s when calculate Mode", - MAP_SIZE_THRESHOLD)); - } - - } - } catch (IOException e) { - // Totally memory operation. This case won't happen. - } - } -} - - \ No newline at end of file diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/linearFill.ftl b/iotdb-core/calc_commons/src/main/codegen/templates/linearFill.ftl deleted file mode 100644 index acc3d72f270f0..0000000000000 --- a/iotdb-core/calc_commons/src/main/codegen/templates/linearFill.ftl +++ /dev/null @@ -1,122 +0,0 @@ -/* -* 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. -*/ -<@pp.dropOutputFile /> - -<#list decimalDataTypes.types as type> - - <#assign className = "${type.dataType?cap_first}LinearFill"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/linear/${className}.java" /> -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear; - -import org.apache.tsfile.block.column.Column; -import org.apache.tsfile.read.common.block.column.${type.column}; -import org.apache.tsfile.read.common.block.column.${type.column}Builder; - - -import java.util.Optional; - -/* -* This class is generated using freemarker and the ${.template_name} template. -*/ -@SuppressWarnings("unused") -public class ${className} extends LinearFill { - - // previous value - private ${type.dataType} previousValue; - // next non-null value whose time is closest to the current TsBlock's endTime - private ${type.dataType} nextValue; - - private ${type.dataType} nextValueInCurrentColumn; - - @Override - void fillValue(Column column, int index, Object array) { - ((${type.dataType}[]) array)[index] = column.get${type.dataType?cap_first}(index); - } - - @Override - void fillValue(Object array, int index, double factor) { - ((${type.dataType}[]) array)[index] = getFilledValue(factor); - } - - @Override - Object createValueArray(int size) { - return new ${type.dataType}[size]; - } - - @Override - Column createNullValueColumn() { - return ${type.column}Builder.NULL_VALUE_BLOCK; - } - - @Override - Column createFilledValueColumn(double[] factors, Optional valueIsNull) { - int size = factors.length; - ${type.dataType}[] filledValue = new ${type.dataType}[size]; - - if (valueIsNull.isPresent()) { - // has null value - boolean[] isNull = valueIsNull.get(); - for (int i = 0; i < size; i++) { - if (!isNull[i]) { - filledValue[i] = getFilledValue(factors[i]); - } - } - } else { - for (int i = 0; i < size; i++) { - filledValue[i] = getFilledValue(factors[i]); - } - } - return new ${type.column}(size, valueIsNull, filledValue); - } - - @Override - Column createFilledValueColumn(Object array, boolean[] isNull, boolean hasNullValue, int size) { - if (hasNullValue) { - return new ${type.column}(size, Optional.of(isNull), (${type.dataType}[]) array); - } else { - return new ${type.column}(size, Optional.empty(), (${type.dataType}[]) array); - } - } - - @Override - void updatePreviousValue(Column column, int index) { - previousValue = column.get${type.dataType?cap_first}(index); - } - - @Override - void updateNextValue(Column nextValueColumn, int index) { - this.nextValue = nextValueColumn.get${type.dataType?cap_first}(index); - } - - @Override - void updateNextValueInCurrentColumn(Column nextValueColumn, int index) { - this.nextValueInCurrentColumn = nextValueColumn.get${type.dataType?cap_first}(index); - } - - @Override - void updateNextValueInCurrentColumn() { - this.nextValueInCurrentColumn = this.nextValue; - } - - private ${type.dataType} getFilledValue(double factor) { - return (${type.dataType}) (previousValue + (nextValueInCurrentColumn - previousValue) * factor); - } -} - - diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/previousFill.ftl b/iotdb-core/calc_commons/src/main/codegen/templates/previousFill.ftl deleted file mode 100644 index 41c5227447a0d..0000000000000 --- a/iotdb-core/calc_commons/src/main/codegen/templates/previousFill.ftl +++ /dev/null @@ -1,109 +0,0 @@ -/* -* 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. -*/ -<@pp.dropOutputFile /> - -<#list allDataTypes.types as type> - - <#assign className = "${type.dataType?cap_first}PreviousFill"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/previous/${className}.java" /> -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous; - -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; -import org.apache.tsfile.block.column.Column; -import org.apache.tsfile.read.common.block.column.${type.column}; -import org.apache.tsfile.read.common.block.column.${type.column}Builder; -import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; -<#if type.dataType == "Binary"> - import org.apache.tsfile.utils.Binary; - - -import java.util.Optional; - -/* -* This class is generated using freemarker and the ${.template_name} template. -*/ -@SuppressWarnings("unused") -// PreviousFill without time duration parameter -public class ${className} implements IFill { - - // previous value - private ${type.dataType} value; - // previous time - private long previousTime; - // whether previous value is null - private boolean previousIsNull = true; - - @Override - public Column fill(Column timeColumn, Column valueColumn) { - int size = valueColumn.getPositionCount(); - // if this valueColumn is empty, just return itself; - if (size == 0) { - return valueColumn; - } - // if this valueColumn doesn't have any null value, record the last value, and then return - // itself. - if (!valueColumn.mayHaveNull()) { - previousIsNull = false; - // update the value using last non-null value - previousTime = timeColumn.getLong(size - 1); - value = valueColumn.get${type.dataType?cap_first}(size - 1); - return valueColumn; - } - // if its values are all null - if (valueColumn instanceof RunLengthEncodedColumn) { - if (previousIsNull) { - return new RunLengthEncodedColumn(${type.column}Builder.NULL_VALUE_BLOCK, size); - } else { - return new RunLengthEncodedColumn( - new ${type.column}(1, Optional.empty(), new ${type.dataType}[] {value}), size); - } - } - - ${type.dataType}[] array = new ${type.dataType}[size]; - boolean[] isNull = new boolean[size]; - // have null value - boolean hasNullValue = false; - for (int i = 0; i < size; i++) { - if (valueColumn.isNull(i)) { - if (previousIsNull) { - isNull[i] = true; - hasNullValue = true; - } else { - array[i] = value; - } - } else { - array[i] = valueColumn.get${type.dataType?cap_first}(i); - previousTime = timeColumn.getLong(i); - value = array[i]; - previousIsNull = false; - } - } - if (hasNullValue) { - return new ${type.column}(size, Optional.of(isNull), array); - } else { - return new ${type.column}(size, Optional.empty(), array); - } - } - - @Override - public void reset() { - previousIsNull = true; - } -} - diff --git a/iotdb-core/calc_commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl b/iotdb-core/calc_commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl deleted file mode 100644 index 4a740be669ac4..0000000000000 --- a/iotdb-core/calc_commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl +++ /dev/null @@ -1,130 +0,0 @@ -/* -* 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. -*/ -<@pp.dropOutputFile /> - -<#list allDataTypes.types as type> - - <#assign className = "${type.dataType?cap_first}PreviousFillWithTimeDuration"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/previous/${className}.java" /> -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous; - -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFillFilter; -import org.apache.tsfile.block.column.Column; -import org.apache.tsfile.read.common.block.column.${type.column}; -import org.apache.tsfile.read.common.block.column.${type.column}Builder; -import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; -<#if type.dataType == "Binary"> - import org.apache.tsfile.utils.Binary; - - -import java.util.Optional; - -/* -* This class is generated using freemarker and the ${.template_name} template. -*/ -@SuppressWarnings("unused") -// PreviousFill without time duration parameter -public class ${className} implements IFill { - - // previous value - private ${type.dataType} value; - // previous time - private long previousTime; - // whether previous value is null - private boolean previousIsNull = true; - - private final IFillFilter filter; - - public ${className}(IFillFilter filter) { - this.filter = filter; - } - - @Override - public Column fill(Column timeColumn, Column valueColumn) { - int size = valueColumn.getPositionCount(); - // if this valueColumn is empty, just return itself; - if (size == 0) { - return valueColumn; - } - // if this valueColumn doesn't have any null value, record the last value, and then return itself. - if (!valueColumn.mayHaveNull()) { - if (!timeColumn.mayHaveNull()) { - previousIsNull = false; - // update the value using last non-null value - previousTime = timeColumn.getLong(size - 1); - value = valueColumn.get${type.dataType?cap_first}(size - 1); - } else { - // find the row that last helper column is not null - for (int i = size - 1; i >= 0; i--) { - if (!timeColumn.isNull(i)) { - previousIsNull = false; - // update the value using last non-null value - previousTime = timeColumn.getLong(size - 1); - value = valueColumn.get${type.dataType?cap_first}(size - 1); - break; - } - } - } - return valueColumn; - } - // if its values are all null - if (valueColumn instanceof RunLengthEncodedColumn) { - if (previousIsNull) { - return new RunLengthEncodedColumn(${type.column}Builder.NULL_VALUE_BLOCK, size); - } else if (!timeColumn.mayHaveNull() && filter.needFill(timeColumn.getLong(size - 1), previousTime)) { - return new RunLengthEncodedColumn(new ${type.column}(1, Optional.empty(), new ${type.dataType}[] {value}), size); - } - } - - ${type.dataType}[] array = new ${type.dataType}[size]; - boolean[] isNull = new boolean[size]; - // have null value - boolean hasNullValue = false; - for (int i = 0; i < size; i++) { - boolean helperColumnIsNull = timeColumn.isNull(i); - if (valueColumn.isNull(i)) { - if (previousIsNull || helperColumnIsNull || !filter.needFill(timeColumn.getLong(i), previousTime)) { - isNull[i] = true; - hasNullValue = true; - } else { - array[i] = value; - } - } else { - array[i] = valueColumn.get${type.dataType?cap_first}(i); - if (!helperColumnIsNull) { - previousTime = timeColumn.getLong(i); - value = array[i]; - previousIsNull = false; - } - } - } - if (hasNullValue) { - return new ${type.column}(size, Optional.of(isNull), array); - } else { - return new ${type.column}(size, Optional.empty(), array); - } - } - - @Override - public void reset() { - previousIsNull = true; - } -} - diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java index 5b1af4366269f..4c0bd4ad9417c 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java @@ -19,9 +19,9 @@ package org.apache.iotdb.confignode.consensus.request.read.ttl; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType; import org.apache.iotdb.confignode.consensus.request.read.ConfigPhysicalReadPlan; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; public class ShowTTLPlan extends ConfigPhysicalReadPlan { private final String[] pathPattern; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java index 533e20d0c7784..065cd1ac9841f 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java @@ -19,6 +19,7 @@ package org.apache.iotdb.confignode.manager; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.Model; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; @@ -152,7 +153,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TSubscribeReq; import org.apache.iotdb.confignode.rpc.thrift.TUnsubscribeReq; import org.apache.iotdb.consensus.ConsensusFactory; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.BatchProcessException; import org.apache.iotdb.rpc.RpcUtils; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml index 6dd2d520026bf..fdcc21680fbb2 100644 --- a/iotdb-core/datanode/pom.xml +++ b/iotdb-core/datanode/pom.xml @@ -71,7 +71,7 @@ org.apache.iotdb - calc_commons + calc-commons 2.0.7-SNAPSHOT @@ -407,6 +407,10 @@ ${project.build.directory}/codegen + + ${maven.multiModuleProjectDirectory}/iotdb-core/calc_commons/src/main/codegen + false + src/main/codegen false diff --git a/iotdb-core/datanode/src/main/codegen/config.fmpp b/iotdb-core/datanode/src/main/codegen/config.fmpp deleted file mode 100644 index 46b529484ab65..0000000000000 --- a/iotdb-core/datanode/src/main/codegen/config.fmpp +++ /dev/null @@ -1,28 +0,0 @@ -<#-- -* 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. ---> - -data: { - allDataTypes: tdd(../dataModel/AllDataType.tdd), - decimalDataTypes: tdd(../dataModel/DecimalDataType.tdd), - compareTypes: tdd(../dataModel/CompareType.tdd), - mathematicalOperator: tdd(../dataModel/MathematicalOperator.tdd), - mathematicalDataType: tdd(../dataModel/MathematicalDataType.tdd) -} -freemarkerLinks: { - includes: includes/ -} diff --git a/iotdb-core/datanode/src/main/codegen/dataModel/AllDataType.tdd b/iotdb-core/datanode/src/main/codegen/dataModel/AllDataType.tdd deleted file mode 100644 index 018b24956a9bc..0000000000000 --- a/iotdb-core/datanode/src/main/codegen/dataModel/AllDataType.tdd +++ /dev/null @@ -1,58 +0,0 @@ -<#-- -* 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. ---> - -{ - "types": [ - { - "dataType": "boolean", - "column": "BooleanColumn", - "javaBoxName": "Boolean", - "tsDataType": "TSDataType.BOOLEAN" - } - ,{ - "dataType": "int", - "column": "IntColumn", - "javaBoxName": "Integer", - "tsDataType": "TSDataType.INT32" - } - ,{ - "dataType": "long", - "column": "LongColumn", - "javaBoxName": "Long", - "tsDataType": "TSDataType.INT64" - } - ,{ - "dataType": "float", - "column": "FloatColumn", - "javaBoxName": "Float", - "tsDataType": "TSDataType.FLOAT" - } - ,{ - "dataType": "double", - "column": "DoubleColumn", - "javaBoxName": "Double", - "tsDataType": "TSDataType.DOUBLE" - } - ,{ - "dataType": "Binary", - "column": "BinaryColumn", - "javaBoxName": "Binary", - "tsDataType": "TSDataType.TEXT" - } - ] -} diff --git a/iotdb-core/datanode/src/main/codegen/dataModel/CompareType.tdd b/iotdb-core/datanode/src/main/codegen/dataModel/CompareType.tdd deleted file mode 100644 index 00eb05280cdfd..0000000000000 --- a/iotdb-core/datanode/src/main/codegen/dataModel/CompareType.tdd +++ /dev/null @@ -1,28 +0,0 @@ -<#-- -* 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. ---> - -{ - "types": [ - { - "compareType": "equal" - } - ,{ - "compareType": "variation" - } - ] -} \ No newline at end of file diff --git a/iotdb-core/datanode/src/main/codegen/dataModel/DecimalDataType.tdd b/iotdb-core/datanode/src/main/codegen/dataModel/DecimalDataType.tdd deleted file mode 100644 index 28a94a8a7f695..0000000000000 --- a/iotdb-core/datanode/src/main/codegen/dataModel/DecimalDataType.tdd +++ /dev/null @@ -1,38 +0,0 @@ -<#-- -* 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. ---> - -{ - "types": [ - { - "dataType": "int", - "column": "IntColumn" - } - ,{ - "dataType": "long", - "column": "LongColumn" - } - ,{ - "dataType": "float", - "column": "FloatColumn" - } - ,{ - "dataType": "double", - "column": "DoubleColumn" - } - ] -} diff --git a/iotdb-core/datanode/src/main/codegen/dataModel/MathematicalDataType.tdd b/iotdb-core/datanode/src/main/codegen/dataModel/MathematicalDataType.tdd deleted file mode 100644 index f60d818c6d91f..0000000000000 --- a/iotdb-core/datanode/src/main/codegen/dataModel/MathematicalDataType.tdd +++ /dev/null @@ -1,52 +0,0 @@ -<#-- -* 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. ---> - -{ - "types": [ - { - "type": "IntType", - "dataType": "int", - "instance": "INT" - }, - { - "type": "LongType", - "dataType": "long", - "instance": "LONG" - }, - { - "type": "FloatType", - "dataType": "float", - "instance": "FLOAT" - }, - { - "type": "DoubleType", - "dataType": "double", - "instance": "DOUBLE" - }, - { - "type": "DateType", - "dataType": "int", - "instance": "DATE" - }, - { - "type": "TimestampType", - "dataType": "long", - "instance": "TIMESTAMP" - } - ] -} diff --git a/iotdb-core/datanode/src/main/codegen/dataModel/MathematicalOperator.tdd b/iotdb-core/datanode/src/main/codegen/dataModel/MathematicalOperator.tdd deleted file mode 100644 index 722b32bc43e20..0000000000000 --- a/iotdb-core/datanode/src/main/codegen/dataModel/MathematicalOperator.tdd +++ /dev/null @@ -1,52 +0,0 @@ -<#-- -* 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. ---> - -{ - "binaryOperators": [ - { - "name": "Addition", - "operator": "ADD", - "symbol": "+" - }, - { - "name": "Subtraction", - "operator": "SUBTRACT", - "symbol": "-" - }, - { - "name": "Multiplication", - "operator": "MULTIPLY", - "symbol": "*" - }, - { - "name": "Division", - "operator": "DIVIDE", - "symbol": "/" - }, - { - "name": "Modulus", - "operator": "MODULUS", - "symbol": "%" - } - ], - "unaryOperators": [ - { - "operator": "NEGATION" - } - ] -} \ No newline at end of file diff --git a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl b/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl deleted file mode 100644 index 2b8f23b9d4723..0000000000000 --- a/iotdb-core/datanode/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl +++ /dev/null @@ -1,419 +0,0 @@ -/* - * 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. - */ -<@pp.dropOutputFile /> -<#list mathematicalOperator.binaryOperators as operator> -<#list mathematicalDataType.types as first> -<#list mathematicalDataType.types as second> -<#--Parting line--> -<#assign className = "${first.type?replace('Type','')}${operator.name}${second.type?replace('Type','')}ColumnTransformer"> - -<#--Main Part--> -<#if (first.instance == "DATE" || first.instance == "TIMESTAMP") && (second.instance == "INT" || second.instance == "LONG")><#if operator.name == "Addition" || operator.name == "Subtraction"> -<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/${className}.java" /> -<#--Date + int || Date + long || Timestamp + int || Timestamp + long--> -<#--Date - int || Date - long || Timestamp - int || Timestamp - long--> -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; - -import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; - -import org.apache.tsfile.block.column.Column; -import org.apache.tsfile.block.column.ColumnBuilder; -import org.apache.tsfile.read.common.type.Type; -import org.apache.tsfile.utils.DateUtils; - -import java.time.ZoneId; - -<#if first.instance == "DATE"> -import java.time.format.DateTimeParseException; - -import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE; - -<#if first.dataType == "int" || second.dataType == "int" || first.dataType == "long" || second.dataType == "long"> -import static org.apache.iotdb.rpc.TSStatusCode.NUMERIC_VALUE_OUT_OF_RANGE; - - -public class ${className} extends BinaryColumnTransformer { - - private static ZoneId zoneId; - - public ${className}( - Type returnType, ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { - super(returnType, leftTransformer, rightTransformer); - this.zoneId = zoneId; - } - - @Override - protected void doTransform( - Column leftColumn, Column rightColumn, ColumnBuilder builder, int positionCount) { - for (int i = 0; i < positionCount; i++) { - if (!leftColumn.isNull(i) && !rightColumn.isNull(i)) { - returnType.write${first.dataType?cap_first}( - builder, - transform( - leftTransformer.getType().get${first.dataType?cap_first}(leftColumn, i), - rightTransformer.getType().get${second.dataType?cap_first}(rightColumn, i))); - } else { - builder.appendNull(); - } - } - } - - @Override - protected void doTransform( - Column leftColumn, - Column rightColumn, - ColumnBuilder builder, - int positionCount, - boolean[] selection){ - for (int i = 0; i < positionCount; i++) { - if (!leftColumn.isNull(i) && !rightColumn.isNull(i) && selection[i]) { - returnType.write${first.dataType?cap_first}( - builder, - transform( - leftTransformer.getType().get${first.dataType?cap_first}(leftColumn, i), - rightTransformer.getType().get${second.dataType?cap_first}(rightColumn, i))); - } else { - builder.appendNull(); - } - } - } - - @Override - protected void checkType() { - // do nothing - } - - public static ${first.dataType} transform(${first.dataType} left, ${second.dataType} right) { - <#switch operator.name> - <#case "Addition"> - <#if first.instance == "DATE"> - <#--Date + int || Date + long--> - try{ - long timestamp = - Math.addExact( - DateTimeUtils.correctPrecision(DateUtils.parseIntToTimestamp(left,zoneId)), right); - return DateUtils.parseDateExpressionToInt( - DateTimeUtils.convertToLocalDate(timestamp, zoneId)); - }catch (ArithmeticException e){ - throw new IoTDBRuntimeException( - String.format("long ${operator.name} overflow: %s + %s", left, right), - NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), - true); - }catch (DateTimeParseException e) { - throw new IoTDBRuntimeException( - "Year must be between 1000 and 9999.", - DATE_OUT_OF_RANGE.getStatusCode(), - true); - } - <#else> - <#--Timestamp + int || Timestamp + long--> - try{ - return Math.addExact(left, right); - }catch (ArithmeticException e){ - throw new IoTDBRuntimeException(String.format("long ${operator.name} overflow: %s + %s", left, right),NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(),true); - } - - <#break> - <#case "Subtraction"> - <#if first.instance == "DATE"> - <#--Date - int || Date - long--> - try{ - long timestamp = - Math.subtractExact( - DateTimeUtils.correctPrecision(DateUtils.parseIntToTimestamp(left, zoneId)), right); - return DateUtils.parseDateExpressionToInt( - DateTimeUtils.convertToLocalDate(timestamp, zoneId)); - }catch (ArithmeticException e){ - throw new IoTDBRuntimeException( - String.format("long ${operator.name} overflow: %s - %s", left, right), - NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), - true); - }catch (DateTimeParseException e) { - throw new IoTDBRuntimeException( - "Year must be between 1000 and 9999.", - DATE_OUT_OF_RANGE.getStatusCode(), - true); - } - <#else> - <#--Timestamp - int || Timestamp - long--> - try{ - return Math.subtractExact(left, right); - }catch (ArithmeticException e){ - throw new IoTDBRuntimeException( - String.format("long ${operator.name} overflow: %s - %s", left, right), - NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), - true); - } - - <#break> - - } -} - -<#elseif (second.instance == "DATE" || second.instance =="TIMESTAMP") && (first.instance == "INT" || first.instance == "LONG")> - <#if operator.name == "Addition"> -<#--int + Date || long + Date || int + Timestamp || long + Timestamp--> -<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/${className}.java" /> -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; - -import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; - -import org.apache.tsfile.block.column.Column; -import org.apache.tsfile.block.column.ColumnBuilder; -import org.apache.tsfile.read.common.type.Type; -import org.apache.tsfile.utils.DateUtils; - -import java.time.ZoneId; -<#if second.instance == "DATE"> -import java.time.format.DateTimeParseException; - - -<#if first.dataType == "int" || second.dataType == "int" || first.dataType == "long" || second.dataType == "long"> -<#if second.instance == "DATE"> -import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE; - -import static org.apache.iotdb.rpc.TSStatusCode.NUMERIC_VALUE_OUT_OF_RANGE; - - -public class ${className} extends BinaryColumnTransformer { - - private static ZoneId zoneId; - - public ${className}( - Type returnType, ColumnTransformer leftTransformer, ColumnTransformer rightTransformer, ZoneId zoneId) { - super(returnType, leftTransformer, rightTransformer); - this.zoneId = zoneId; - } - - @Override - protected void doTransform( - Column leftColumn, Column rightColumn, ColumnBuilder builder, int positionCount) { - for (int i = 0; i < positionCount; i++) { - if (!leftColumn.isNull(i) && !rightColumn.isNull(i)) { - returnType.write${second.dataType?cap_first}( - builder, - transform( - leftTransformer.getType().get${first.dataType?cap_first}(leftColumn, i), - rightTransformer.getType().get${second.dataType?cap_first}(rightColumn, i))); - } else { - builder.appendNull(); - } - } - } - - @Override - protected void doTransform( - Column leftColumn, - Column rightColumn, - ColumnBuilder builder, - int positionCount, - boolean[] selection){ - for (int i = 0; i < positionCount; i++) { - if (!leftColumn.isNull(i) && !rightColumn.isNull(i) && selection[i]) { - returnType.write${second.dataType?cap_first}( - builder, - transform( - leftTransformer.getType().get${first.dataType?cap_first}(leftColumn, i), - rightTransformer.getType().get${second.dataType?cap_first}(rightColumn, i))); - } else { - builder.appendNull(); - } - } - } - - @Override - protected void checkType() { - // do nothing - } - - public static ${second.dataType} transform(${first.dataType} left, ${second.dataType} right) { - <#if second.instance == "DATE"> - try{ - long timestamp = Math.addExact(left,DateTimeUtils.correctPrecision(DateUtils.parseIntToTimestamp(right, zoneId))); - return DateUtils.parseDateExpressionToInt(DateTimeUtils.convertToLocalDate(timestamp, zoneId)); - }catch (ArithmeticException e){ - throw new IoTDBRuntimeException( - String.format("long ${operator.name} overflow: %s + %s", left, right), - NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), - true); - }catch (DateTimeParseException e) { - throw new IoTDBRuntimeException( - "Year must be between 1000 and 9999.", - DATE_OUT_OF_RANGE.getStatusCode(), - true); - } - <#else> - try{ - return Math.addExact(left, right); - }catch (ArithmeticException e){ - throw new IoTDBRuntimeException( - String.format("long ${operator.name} overflow: %s + %s", left, right), - NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), - true); - } - - } -} - -<#elseif first.instance != "DATE" && first.instance != "TIMESTAMP" && second.instance != "DATE" && second.instance != "TIMESTAMP"> -<@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/transformation/dag/column/binary/${className}.java" /> -<#--int、long、float、double with + - * / %--> -<#--assign resultType--> -<#if first.dataType == "double" || second.dataType == "double"> - <#assign resultType = "double" /> -<#elseif first.dataType == "float" || second.dataType == "float"> - <#assign resultType = "float" /> -<#elseif first.dataType == "long" || second.dataType == "long"> - <#assign resultType = "long" /> -<#else> - <#assign resultType = "int" /> - -<#--Parting line--> -package org.apache.iotdb.db.calc_commons.transformation.dag.column.binary; - -import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.ColumnTransformer; - -import org.apache.tsfile.block.column.Column; -import org.apache.tsfile.block.column.ColumnBuilder; -import org.apache.tsfile.read.common.type.Type; - -<#if operator.name == "Division" || operator.name == "Modulus"> -import static org.apache.iotdb.rpc.TSStatusCode.DIVISION_BY_ZERO; - -<#if first.dataType == "int" || second.dataType == "int" || first.dataType == "long" || second.dataType == "long"> -import static org.apache.iotdb.rpc.TSStatusCode.NUMERIC_VALUE_OUT_OF_RANGE; - - -public class ${className} extends BinaryColumnTransformer { - public ${className}( - Type returnType, ColumnTransformer leftTransformer, ColumnTransformer rightTransformer) { - super(returnType, leftTransformer, rightTransformer); - } - - @Override - protected void doTransform( - Column leftColumn, Column rightColumn, ColumnBuilder builder, int positionCount) { - for (int i = 0; i < positionCount; i++) { - if (!leftColumn.isNull(i) && !rightColumn.isNull(i)) { - returnType.write${resultType?cap_first}( - builder, - transform( - leftTransformer.getType().get${first.dataType?cap_first}(leftColumn, i), - rightTransformer.getType().get${second.dataType?cap_first}(rightColumn, i))); - } else { - builder.appendNull(); - } - } - } - - @Override - protected void doTransform( - Column leftColumn, - Column rightColumn, - ColumnBuilder builder, - int positionCount, - boolean[] selection){ - for (int i = 0; i < positionCount; i++) { - if (!leftColumn.isNull(i) && !rightColumn.isNull(i) && selection[i]) { - returnType.write${resultType?cap_first}( - builder, - transform( - leftTransformer.getType().get${first.dataType?cap_first}(leftColumn, i), - rightTransformer.getType().get${second.dataType?cap_first}(rightColumn, i))); - } else { - builder.appendNull(); - } - } - } - - @Override - protected void checkType() { - // do nothing - } - - public static ${resultType} transform(${first.dataType} left, ${second.dataType} right) { - <#if (first.dataType == "int" || first.dataType == "long") && (second.dataType == "int" || second.dataType =="long")> - <#switch operator.name> - <#case "Addition"> - try{ - return Math.addExact(left, right); - }catch (ArithmeticException e){ - throw new IoTDBRuntimeException( - String.format("${resultType} ${operator.name} overflow: %s + %s", left, right), - NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), - false); - } - <#break> - <#case "Subtraction"> - try{ - return Math.subtractExact(left, right); - }catch (ArithmeticException e){ - throw new IoTDBRuntimeException( - String.format("${resultType} ${operator.name} overflow: %s - %s", left, right), - NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), - false); - } - <#break> - <#case "Multiplication"> - try{ - return Math.multiplyExact(left, right); - }catch (ArithmeticException e){ - throw new IoTDBRuntimeException( - String.format("${resultType} ${operator.name} overflow: %s * %s", left, right), - NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), - true); - } - <#break> - <#case "Division"> - try{ - if (left == <#if first.dataType == "int">Integer.MIN_VALUE<#elseif first.dataType == "long">Long.MIN_VALUE && right == -1) { - throw new IoTDBRuntimeException( - String.format("${resultType} overflow: %s / %s", left, right), - NUMERIC_VALUE_OUT_OF_RANGE.getStatusCode(), - true); - } - return left / right; - }catch (ArithmeticException e){ - throw new IoTDBRuntimeException("Division by zero",DIVISION_BY_ZERO.getStatusCode(),true); - } - <#break> - <#case "Modulus"> - try{ - return left % right; - }catch (ArithmeticException e){ - throw new IoTDBRuntimeException("Division by zero",DIVISION_BY_ZERO.getStatusCode(),true); - } - <#break> - - <#else> - return left ${operator.symbol} right; - - } -} - -<#--Parting line--> - - - \ No newline at end of file diff --git a/iotdb-core/datanode/src/main/codegen/templates/constantFill.ftl b/iotdb-core/datanode/src/main/codegen/templates/constantFill.ftl deleted file mode 100644 index d4cb860c34115..0000000000000 --- a/iotdb-core/datanode/src/main/codegen/templates/constantFill.ftl +++ /dev/null @@ -1,81 +0,0 @@ -/* -* 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. -*/ -<@pp.dropOutputFile /> - -<#list allDataTypes.types as type> - - <#assign className = "${type.dataType?cap_first}ConstantFill"> - <@pp.changeOutputFile name="/org/apache/iotdb/db/calc_commons/execution/operator/process/fill/constant/${className}.java" /> -package org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant; - -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.IFill; -import org.apache.tsfile.read.common.block.column.${type.column}; -import org.apache.tsfile.block.column.Column; -import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; -<#if type.dataType == "Binary"> -import org.apache.tsfile.utils.Binary; - - -import java.util.Optional; - -/* -* This class is generated using freemarker and the ${.template_name} template. -*/ -@SuppressWarnings("unused") -public class ${className} implements IFill { - - // fill value - private final ${type.dataType} value; - // used for constructing RunLengthEncodedColumn, size of it must be 1 - private final ${type.dataType}[] valueArray; - - public ${className}(${type.dataType} value) { - this.value = value; - this.valueArray = new ${type.dataType}[] {value}; - } - - @Override - public Column fill(Column timeColumn, Column valueColumn) { - int size = valueColumn.getPositionCount(); - // if this valueColumn doesn't have any null value, or it's empty, just return itself; - if (!valueColumn.mayHaveNull() || size == 0) { - return valueColumn; - } - // if its values are all null - if (valueColumn instanceof RunLengthEncodedColumn) { - return new RunLengthEncodedColumn(new ${type.column}(1, Optional.empty(), valueArray), size); - } else { - ${type.dataType}[] array = new ${type.dataType}[size]; - for (int i = 0; i < size; i++) { - if (valueColumn.isNull(i)) { - array[i] = value; - } else { - array[i] = valueColumn.get${type.dataType?cap_first}(i); - } - } - return new ${type.column}(size, Optional.empty(), array); - } - } - - @Override - public void reset() { - // do nothing - } -} - - diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java index a209998e6f8a4..39b090b225584 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.conf; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.binaryallocator.BinaryAllocator; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; @@ -35,7 +36,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TRatisConfig; import org.apache.iotdb.consensus.config.IoTConsensusV2Config; import org.apache.iotdb.db.consensus.DataRegionConsensusImpl; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.pipe.resource.log.PipePeriodicalLogReducer; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.LastCacheLoadStrategy; import org.apache.iotdb.db.service.metrics.IoTDBInternalLocalReporter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/BatchProcessException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/BatchProcessException.java index a0442e53e2247..6db4981cbb36b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/BatchProcessException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/BatchProcessException.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.exception; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.db.exception.query.QueryProcessException; import java.util.Arrays; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java index b93b25033871b..6851493b080cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.pipe.processor.aggregate; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.consensus.index.ProgressIndex; @@ -29,7 +30,6 @@ import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskProcessorRuntimeEnvironment; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.utils.PathUtils; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.agent.plugin.dataregion.PipeDataRegionPluginAgent; import org.apache.iotdb.db.pipe.event.common.row.PipeResetTabletRow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertRowStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertRowStatement.java index a81e1206cf600..8095d0f4ea06f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertRowStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertRowStatement.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.pipe.receiver.transform.statement; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.pipe.resource.log.PipeLogger; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.metadata.PathNotExistException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.pipe.receiver.transform.converter.ValueConverter; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java index fb5dfebab7857..5a28e060ff4ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.protocol.thrift.impl; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; @@ -109,7 +110,6 @@ import org.apache.iotdb.db.consensus.DataRegionConsensusImpl; import org.apache.iotdb.db.consensus.SchemaRegionConsensusImpl; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.partition.DataPartitionTableGenerator; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.protocol.client.ConfigNodeInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java index 2867b49802d3c..b6f3b518dd8f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.common; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.audit.AuditEventType; @@ -32,7 +33,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java index e132eab87971e..661291dc0cd38 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.db.calc_commons.execution.aggregation.BinaryModeAccumulator; -import org.apache.iotdb.db.calc_commons.execution.aggregation.BooleanModeAccumulator; -import org.apache.iotdb.db.calc_commons.execution.aggregation.DoubleModeAccumulator; -import org.apache.iotdb.db.calc_commons.execution.aggregation.FloatModeAccumulator; -import org.apache.iotdb.db.calc_commons.execution.aggregation.IntModeAccumulator; -import org.apache.iotdb.db.calc_commons.execution.aggregation.LongModeAccumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.BinaryModeAccumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.BooleanModeAccumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.DoubleModeAccumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.FloatModeAccumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.IntModeAccumulator; +import org.apache.iotdb.calc_commons.execution.aggregation.LongModeAccumulator; import org.apache.iotdb.calc_commons.execution.aggregation.VarianceAccumulator; +import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java index 104763eb5e2a1..bbd8bf6c5706f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java index b3a7bb9fc6478..84d964f0b5f8f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; -import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; +import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.udf.api.State; import org.apache.iotdb.udf.api.UDAF; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java index f090efaaee5ac..1134bd2edcf28 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java index acb97baf4ca0d..97973c9775ae8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java index 78de2dd068fb4..b30d410a1f51d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java index c891463c77c22..0edfeb038a3bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java index d44cbc39f1d6d..7b5e807fc4ed0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java index b4d43b59d1a89..024e24ee6b2be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java index 289e9f6c8f816..7f3020e358213 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.driver; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.execution.operator.source.DataSourceOperator; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriverContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriverContext.java index 03bd7bb8e626f..dede7d8919836 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriverContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriverContext.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.driver; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.path.IFullPath; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.operator.source.DataSourceOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java index e5307631ba348..973251ab7ba15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.driver; -import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FakedFragmentInstanceContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FakedFragmentInstanceContext.java index 138bba8035e4b..56b9274ed5195 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FakedFragmentInstanceContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FakedFragmentInstanceContext.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.fragment; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.path.IFullPath; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.planner.memory.FakedMemoryReservationManager; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java index 42aee021c3fe4..26f2f8a1089ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.fragment; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.conf.CommonConfig; @@ -31,10 +33,8 @@ import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.PatternTreeMap; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java index b8d27d9678d8e..8da2bfc5cf1f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.fragment; -import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java index 9576edfdca54c..62d86c768ff88 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.fragment; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil; @@ -27,7 +28,6 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.QueryTimeoutException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java index a841345619594..7885abedb922c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java index f5eba1f187f5a..935d8bf97513f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.client.IClientManager; import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; @@ -27,8 +29,6 @@ import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java index 7b2d85567b726..3f1b6e2b27eaa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java index 5aca8937b5644..80fbeea66d2d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.common.rpc.thrift.TSStatus; +import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.IntoProcessException; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java index bb091d8449386..32bb08a33a020 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java index ae64a6a4e603b..763084c673ecc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java index bde199d6dd4a6..51349e44b5ac1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/ColumnInjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java index b445d172cd869..8b15bc2485287 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.columngenerator.ColumnGenerator; 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 9b67451be6a5f..9dbb4ca77f364 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; 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.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.runtime.IntoProcessException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java index a501d45e1c7fb..018ffd1af4d1d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java index 998eae6f18069..f6333e495fb42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java index 6a9f91103d808..04dea28b22d42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/SingleDeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java index f442d8d9db090..7e68e514b3ea9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java index 3f03a9cd05091..44ae7d0852d06 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow.SlidingWindowAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java index 74eb0485addb9..8278df9d5b07b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; @@ -26,7 +27,6 @@ import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java index bb3ae6502c9e9..3c72ceacef191 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; 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/TransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java index ba87453793e3c..afd970189bd4f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java index 3bb7a4af3d555..5c7f3814d3e1e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; 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.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java index a7575c13a7d4d..99525bf422791 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java @@ -21,11 +21,11 @@ import org.apache.iotdb.ainode.rpc.thrift.TInferenceReq; import org.apache.iotdb.ainode.rpc.thrift.TInferenceResp; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; import org.apache.iotdb.db.exception.runtime.ModelInferenceProcessException; import org.apache.iotdb.db.protocol.client.an.AINodeClient; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java index f2a28bf89a4b1..bf45d6ca98ecf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.copyto; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.CopyToTsFileOptions; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.TsFileFormatCopyToWriter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java index 0db76abdb8b4f..0225a3a4bd79b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.planner.RelationPlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java index 731b0d127ed09..357d65458ccdc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.ColumnMerger; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java index ec9dd6817fcc4..a48e9685864a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java index 99c4fd76511ad..5cf6a9c2bd38d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java index 623d03c0356bc..e974669cc055d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java index 0e73e06f6e8e2..215cc36a3d521 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java index 2fa977c2c8d68..e9fe266bdfece 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; 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/last/AlignedUpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java index 3deb1bc8ebbec..b3f6a969d97d4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; 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.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java index 025893c35a851..26b1e5f50cc7a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java index 8c5966bb456df..99600ad784b9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java index 7fd2f9dc3655a..4e1aaa00cca0c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java index 0bb7534fc7682..276b4fb672c2c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java index 9470cdc4534d9..d290ef25e9f6b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java index 9278671ebc85b..9e2b442c6a949 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java index 564000037f9ea..0cef4dbd75455 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java index a84d496ca57af..98376c43c456d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java index 75ae53ad05b21..329553e728986 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java index fe00d15d7d7aa..aa8ee1afee1da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 5298abc18c27e..9e6a05bcbae81 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 @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.common.rpc.thrift.TSchemaNode; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; 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.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 2547dd0613704..4e9d91f0f2091 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 @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; 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.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 dc1f58288a56c..36dc3035dc821 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java index 8ad55123e8e9c..7f6c52bd6577c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java index 8edb75a088944..b4bde6e6e03b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 ef85e83da6cb5..64c4b837adc51 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 24fe2800119bb..5c41f03a420d2 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo; 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 a29b1fc67ece4..de9623345f408 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.rescon.MemSchemaRegionStatistics; 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/DevicePredicateFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateFilter.java index ffb9f24306117..360ce586e4d99 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,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source; -import org.apache.iotdb.commons.schema.table.TsTable; -import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.commons.schema.table.TsTable; +import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import java.util.Iterator; 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 806e681e17bc8..0055e90baf030 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.utils.PathUtils; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo; import org.apache.iotdb.db.schemaengine.table.DataNodeTreeViewSchemaUtils; 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 2dec8da4a6747..ee29834134536 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.TableDeviceInfo; import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.impl.ShowDevicesResult; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java index 6563abb30af0e..db8de516ca5c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; 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/sink/ShuffleHelperOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java index f8c93c8b140ee..7827257178e8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; 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/source/AbstractSourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java index cf38e6fccb87d..11ac141b0c654 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; public abstract class AbstractSourceOperator extends AbstractOperator implements SourceOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java index 125fe0d4b21f7..2c416ea5afd62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; public interface SourceOperator extends Operator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java index 32fdf835e8db1..70b4bc6fa7b6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java index f2addf69f5e51..726b6d83d9ec6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.path.AlignedFullPath; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractSeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java index 24cc7bca5b2f2..0e3746dc9b5a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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 index 7621e94b18ca2..f0eb0dc6ff8ee 100644 --- 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.common.rpc.thrift.Model; import org.apache.iotdb.common.rpc.thrift.TAINodeLocation; import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation; @@ -71,7 +72,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowTopicReq; import org.apache.iotdb.confignode.rpc.thrift.TTableInfo; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java index 2d732ee34aca7..c9885c364979a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; @@ -51,8 +51,8 @@ import java.util.concurrent.TimeUnit; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_PRIMITIVE_TYPE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_TIME_VALUE_PAIR; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java index 9f93b735f7b2b..30c0b0935ad89 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java index 3995ffe719645..a1506afe2a497 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java index 7cc98be2193e1..ee41669c81d79 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.schedule; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.StartupException; @@ -26,7 +27,6 @@ import org.apache.iotdb.commons.service.IService; import org.apache.iotdb.commons.service.ServiceType; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java index 8732878ed2f4d..d5d94463431fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.schedule; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.exception.CpuNotEnoughException; 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 ba203ce1997e6..973faeebcf6b2 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; @@ -40,7 +41,6 @@ import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.utils.TimePartitionUtils; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.ainode.GetModelInfoException; @@ -173,6 +173,8 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkState; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME_HEADER; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.TREE_MODEL_DATABASE_PREFIX; import static org.apache.iotdb.commons.conf.IoTDBConstant.ALLOWED_SCHEMA_PROPS; import static org.apache.iotdb.commons.conf.IoTDBConstant.DEADBAND; import static org.apache.iotdb.commons.conf.IoTDBConstant.LOSS; @@ -180,8 +182,6 @@ import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_MATCH_PATTERN; 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.calc_commons.utils.constant.SqlConstant.COUNT_TIME_HEADER; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.TREE_MODEL_DATABASE_PREFIX; 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.plan.analyze.AnalyzeUtils.removeLogicalView; 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 1ec48ce20e5ce..f0c01f5943092 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinScalarFunction; @@ -27,7 +28,6 @@ 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.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.expression.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java index 14e039ce90367..33fd6f30cf1f2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.analyze; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.binary.ArithmeticBinaryExpression; 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 2ddc497767cbd..c88bb258d35ee 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,8 +44,8 @@ import java.util.Map; import java.util.Set; -import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.ENDTIME; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +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/analyze/load/TreeSchemaAutoCreatorAndVerifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java index b2264df2cb48c..6ac706e2caf5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze.load; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.auth.AuthException; @@ -33,7 +34,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TGetDatabaseReq; import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadAnalyzeException; import org.apache.iotdb.db.exception.load.LoadAnalyzeTypeMismatchException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java index 0352f344cc6a5..d12edaf29c82b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze.schema; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.MetadataException; @@ -27,7 +28,6 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.commons.schema.template.Template; -import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.protocol.session.SessionManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java index f677082cbd069..190157f891ae8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.analyze.schema; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; 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 ba898d868f285..b791e32d67211 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 @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.queryengine.plan.execution; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.conf.IoTDBConstant; @@ -25,7 +26,6 @@ import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.query.KilledByOthersException; @@ -72,8 +72,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Throwables.throwIfUnchecked; -import static org.apache.iotdb.commons.utils.ErrorHandlingCommonUtils.getRootCause; import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.WAIT_FOR_RESULT; +import static org.apache.iotdb.commons.utils.ErrorHandlingCommonUtils.getRootCause; import static org.apache.iotdb.db.queryengine.common.DataNodeEndPoints.isSameNode; import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java index c7f604c77f460..d196e39ee62f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java @@ -387,11 +387,11 @@ import java.util.function.Predicate; import java.util.stream.Collectors; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.ROOT; import static org.apache.iotdb.commons.conf.IoTDBConstant.MAX_DATABASE_NAME_LENGTH; import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_MATCH_SCOPE; import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_RESULT_NODES; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.ROOT; import static org.apache.iotdb.db.protocol.client.ConfigNodeClient.MSG_RECONNECTION_FAIL; import static org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory.getShowExternalServiceHeader; import static org.apache.iotdb.db.queryengine.plan.execution.config.metadata.externalservice.ShowExternalServiceTask.appendServiceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java index 87200f0c51df5..e70ecfdb191a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java index a696e5c2b1adf..935c02426b5e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression.binary; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java index 43f1bcbd10e93..dbb7a7da76cb5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.leaf; -import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java index 969cc29f4c2e6..0ccca6e183e3b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; @@ -27,7 +28,6 @@ import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; 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/expression/multi/builtin/BuiltInScalarFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java index 0322e2bb38b24..fc0a71c761fce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java index 3dcd34aa631bf..46b233dcf1c52 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java index 037c9f900f60e..0989d6c16d4c2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java index 2623e3a355a91..b9ec60d170585 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java index 670ebc8e4a347..208202115cb94 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java index dc89a9be0818f..d94eb6bf290bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java index 8ccd54f5b8125..3c3ed62a8e54c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression.other; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java index a4aced0bd1cf2..9763ee66f798d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.other; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java index 759195135ef17..c60705ded3c7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java @@ -21,9 +21,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.ternary; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java index e15d65eaa8887..851acc9adbfc3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java index 72b928bd628be..aa438a25be58b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; -import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.TreeCaseWhenThenColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; @@ -36,8 +34,8 @@ import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareNonEqualColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.LogicAndColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.LogicOrColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.LongDivisionLongColumnTransformer; -import org.apache.iotdb.db.calc_commons.transformation.dag.column.binary.LongModulusLongColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.LongDivisionLongColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.binary.LongModulusLongColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; @@ -52,6 +50,8 @@ import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.RegularColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java index 9be42a2083850..ad92ee465e77f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; -import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java index 99efbe0df02f9..60380a5300778 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java index b8ae3338fb02b..e1e2eaa6da134 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.expression.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java index 8c2c9f71bd9d7..50280d7e813c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java index ce99b0522246c..c3b97e9973772 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; 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 406893ddea6e5..244f27de27d0a 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.parser; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; import org.apache.iotdb.common.rpc.thrift.TTimedQuota; import org.apache.iotdb.common.rpc.thrift.ThrottleType; @@ -51,7 +52,6 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.PathUtils; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; @@ -302,15 +302,6 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.stream.Collectors.toList; -import static org.apache.iotdb.commons.conf.IoTDBConstant.COLUMN_TIMESERIES_COMPRESSION; -import static org.apache.iotdb.commons.conf.IoTDBConstant.COLUMN_TIMESERIES_COMPRESSOR; -import static org.apache.iotdb.commons.conf.IoTDBConstant.COLUMN_TIMESERIES_ENCODING; -import static org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; -import static org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils.currPrecision; -import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_RESULT_NODES; -import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; -import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; -import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.CAST_FUNCTION; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.CAST_TYPE; @@ -323,6 +314,15 @@ import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_IS_STANDARD; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_LENGTH; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_START; +import static org.apache.iotdb.commons.conf.IoTDBConstant.COLUMN_TIMESERIES_COMPRESSION; +import static org.apache.iotdb.commons.conf.IoTDBConstant.COLUMN_TIMESERIES_COMPRESSOR; +import static org.apache.iotdb.commons.conf.IoTDBConstant.COLUMN_TIMESERIES_ENCODING; +import static org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; +import static org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils.currPrecision; +import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_RESULT_NODES; +import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; +import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; +import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.canPushDownLimitOffsetToGroupByTime; import static org.apache.iotdb.db.queryengine.plan.optimization.LimitOffsetPushDown.pushDownLimitOffsetToTimeParameter; import static org.apache.iotdb.db.queryengine.plan.relational.sql.parser.AstBuilder.lowerIdentifier; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java index e36071d7e4c60..1f6c82f42484a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.parser; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; @@ -27,8 +29,6 @@ import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.SqlLexer; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index 764739d221a1b..d5baa7712ae93 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -14,6 +14,17 @@ package org.apache.iotdb.db.queryengine.plan.planner; +import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; +import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.calc_commons.execution.relational.ColumnTransformerBuilder; +import org.apache.iotdb.calc_commons.plan.planner.TableOperatorGenerator; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; @@ -36,17 +47,6 @@ 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.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.calc_commons.execution.relational.ColumnTransformerBuilder; -import org.apache.iotdb.calc_commons.plan.planner.TableOperatorGenerator; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; @@ -172,9 +172,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; -import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; -import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.AVG; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; @@ -186,6 +183,9 @@ import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.MAX; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.MIN; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUM; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; +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.sink.IdentitySinkOperator.DELIMITER_BETWEEN_ID; import static org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator.DOWNSTREAM_PLAN_NODE_ID; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java index be4fcb46e1942..2a1caba9f2251 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.plan.planner.ITableOperatorGeneratorContext; import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.plan.planner.ITableOperatorGeneratorContext; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java index 680afc1c90dcf..312aba8441a2f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.planner; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.memory.IMemoryBlock; import org.apache.iotdb.commons.memory.MemoryBlockType; import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.IFullPath; -import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; 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 e5c3f768dc536..14c2ba4cd98d5 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 @@ -125,12 +125,12 @@ import java.util.Set; import java.util.stream.Collectors; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_VALUE; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.MAX_TIME; import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; import static org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy.LINEAR; 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.calc_commons.utils.constant.SqlConstant.LAST_VALUE; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.MAX_TIME; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index 875beb396f098..d04859634a12b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -19,6 +19,25 @@ package org.apache.iotdb.db.queryengine.plan.planner; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.AggregationMergeSortOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.CollectOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.BinaryConstantFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.BooleanConstantFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.FloatConstantFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.IntConstantFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.LongConstantFill; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.model.ModelInformation; @@ -35,26 +54,7 @@ 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.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.AggregationMergeSortOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.CollectOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BinaryConstantFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.BooleanConstantFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.FloatConstantFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.IntConstantFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.LongConstantFill; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java index 0af02f8741325..e640e76cdac2b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner; -import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.execution.driver.DataDriver; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; import org.apache.iotdb.db.queryengine.execution.driver.Driver; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java index efa0539eeca55..27de8f45c5f7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; @@ -36,7 +37,6 @@ import org.apache.iotdb.commons.schema.table.Audit; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; @@ -106,14 +106,14 @@ import java.util.TreeSet; import java.util.stream.Collectors; -import static org.apache.iotdb.commons.conf.IoTDBConstant.LAST_VALUE; -import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; -import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.AVG; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_IF; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.DIFF; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_VALUE; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.TIME_DURATION; +import static org.apache.iotdb.commons.conf.IoTDBConstant.LAST_VALUE; +import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; +import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionTypeAnalyzer.analyzeExpression; import static org.apache.iotdb.db.queryengine.plan.planner.LogicalPlanBuilder.updateTypeProviderByPartialAggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java index b530b2b861092..32bd7e6cbee15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; -import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.utils.TestOnly; public class ConsumeChildrenOneByOnePipelineMemoryEstimator extends PipelineMemoryEstimator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java index ac875356ca8c6..8023b29a17a64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; -import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.utils.TestOnly; import java.util.LinkedList; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java index 59e1f652a150d..b4f1a5415e304 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; public class PipelineMemoryEstimatorFactory { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java index 21592ec845402..31aa61a59b98d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.write; +import org.apache.iotdb.calc_commons.utils.IObjectPath; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.exception.ObjectFileNotExist; @@ -27,7 +28,6 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.calc_commons.utils.IObjectPath; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java index 4ca26b3d468f6..cd435b54febcf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java index 80da25ce5cc28..0bcc6d2f0673b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; -import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index 6a75d664f2042..e95b8bcad5ae2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; @@ -85,7 +86,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; @@ -142,6 +142,13 @@ import static java.util.Collections.unmodifiableSet; import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_AGGREGATION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression.isQualifiedAllFieldsReference; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.FOLLOWING; @@ -152,13 +159,6 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.ROWS; import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_AGGREGATION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.ExpressionTreeUtils.extractExpressions; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; import static org.apache.tsfile.read.common.type.BlobType.BLOB; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index bf87686da4586..f7e1bb8b2ede2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.common.SessionInfo; @@ -118,7 +119,6 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; import org.apache.iotdb.db.queryengine.execution.warnings.IoTDBWarning; @@ -270,6 +270,7 @@ import static java.util.Collections.emptyList; import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTimestampType; import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.ForecastTableFunction.TIMECOL_PARAMETER_NAME; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression.getQualifiedName; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.FULL; @@ -279,7 +280,6 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; import static org.apache.iotdb.commons.schema.table.TsTable.TABLE_ALLOWED_PROPERTIES; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTimestampType; import static org.apache.iotdb.db.queryengine.execution.warnings.StandardWarningCode.REDUNDANT_ORDER_BY; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AggregationAnalyzer.verifyOrderByAggregations; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AggregationAnalyzer.verifySourceAggregations; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java index 56d37d9e2c5c2..2ad741a9413f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; +import org.apache.iotdb.calc_commons.plan.relational.metadata.ITypeMetadata; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionFactory; @@ -32,7 +33,6 @@ import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinWindowFunction; -import org.apache.iotdb.calc_commons.plan.relational.metadata.ITypeMetadata; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableHeaderSchemaValidator; 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 d7dd71c8daddb..3347f8d83a570 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 @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; +import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; @@ -44,8 +46,6 @@ import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java index 84f3cf8cd0ec4..9cca3e4c3b87f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher; +import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.MetadataException; @@ -36,7 +37,6 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; import org.apache.iotdb.db.exception.sql.ColumnCreationFailException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java index 87b02ae6731e1..b2f5706e739f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.calc_commons.transformation.dag.util.CastFunctionUtils; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; @@ -48,7 +49,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.calc_commons.transformation.dag.util.CastFunctionUtils; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator; @@ -77,10 +77,10 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.MINUS; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.PLUS; import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java index fdd95619dd4b4..a8f0082ba4ad1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java @@ -44,10 +44,10 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBool; import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; import static org.apache.tsfile.read.common.type.FloatType.FLOAT; import static org.apache.tsfile.read.common.type.IntType.INT32; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index 92a5d060b2c09..564f5cfd9b310 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -101,6 +101,7 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.lang.String.format; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.groupingSets; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; @@ -111,7 +112,6 @@ import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.ROWS; import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingTranslator.sortItemToSortOrder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware.scopeAwareKey; 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 527197bc8cace..5145d3ffe9df5 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; +import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; @@ -42,7 +43,6 @@ import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; 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 5196608f0cf36..7fb84440b69d6 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 @@ -143,12 +143,12 @@ import java.util.stream.IntStream; import static com.google.common.collect.ImmutableList.toImmutableList; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; import static org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind.AGGREGATE; import static org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PushPredicateIntoTableScan.containsDiffFunction; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.TransformSortToStreamSort.isOrderByAllIdsAndTime; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.split; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java index 19cd7ae7bfcac..5bf1427be95d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java @@ -34,13 +34,13 @@ import java.time.ZoneId; +import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; public class GapFillStartAndEndTimeExtractVisitor implements AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java index 7036b351ed2ab..9b5719607d80b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Match; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Match; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.PlanOptimizersStatsCollector; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java index d3d9e28fd555f..a01ca7e8193eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; 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 251071e52f8d2..9857907504a58 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 @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; 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.TableScanNode; 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 f06d9b18f09d6..333d63704e156 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 @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; 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.TableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java index 2efb95f334786..3c2af3684354e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java index 64f9f301c553e..a311f0a277f73 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; @@ -28,8 +30,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java index 098e24cc05bcf..ed65e6f734905 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java @@ -19,6 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PropertyPattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; @@ -26,10 +30,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PropertyPattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java index debd1d06bde0e..45b0ff02ab49e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; @@ -30,8 +32,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java index 1c22cce0e5602..2e7b831088a6c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; @@ -26,8 +28,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java index b15810f74ab3e..0abd00f6137ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; @@ -28,8 +30,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java index 60e42e45c207b..e82a81a46bc57 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; @@ -26,8 +28,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java index 278a6788ed6c0..2201054a368a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java index 1df179f970468..1343a9fa1b8ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; @@ -26,8 +28,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java index f190a1f49b57f..56ac79a200358 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; @@ -26,9 +29,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java index a459ff2f6a1e8..284ab2486e450 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java index f9eaf56a1cd8e..4595961a107c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java index ef2de8d3c4d5d..f404a1c941447 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java index 177f7920a0839..2150cd4d53d6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java index 2f98442a5f6eb..0e43c93e35f1e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java index 496990e9e2e54..00cea51176e4e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java index 99c77f7daaca9..1b47f5571bd40 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java index 64f18d8c5dd77..599063d896d42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java index 87b2b826219b5..6d5a330be3399 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java index c136ce2e230b6..8fec44904ad21 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.base.Predicates; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java index 24fa15cd4a4a4..789df0f92e4c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrPatternAlternationOptimizer; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPatternFlattener; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.patternRecognition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java index f62eed4329d82..81734ffd6aa90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java index 08a914d9ab349..88cc20b10ca0c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java index ba9ed818a35a4..7d4488291ef6b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java index 8daddf52bfb4a..5791c9a745243 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java index 12a902b630bee..27bcb1cd45975 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java index 67bfc426f45c0..fe3b7d17a7eb0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java index 0c03d2fd62871..9493aafe7db90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java index 9e4b4b333b73f..18018c9cf025b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java index bddb0fb11e8b4..5b91c09b98a19 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java index e19834a405745..4aa54a1914a19 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java index 40ba3f05b9d9d..75d980f21c9f0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java index 9e1cc27a0a7a0..4bcc3db116188 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java index 9c24544b5fe67..18981cf63fd67 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java index c0c0e427d9f6b..017cb0af7c021 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; @@ -28,9 +31,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java index de564ffb26131..63ac7bcd17ec7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; @@ -34,8 +34,8 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.lang.Math.toIntExact; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.toTopNRankingType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.ChildReplacer.replaceChildren; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java index c8df55a2cda16..ebd1878f264c5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java index 9e85481c81dcb..3861a2fd52832 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java index 105c9b1411d9c..558fb0e3090ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java @@ -18,12 +18,12 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java index bd0f3168946a7..8486d32152b7e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java index 508fa92093807..4449e91d0c92a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; @@ -26,9 +29,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java index 14983e0aa5a35..92e2fe67a04f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java index 407c660ada034..4b48652ebb14d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java index b6dccfc0672fd..d7bdcf526998c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java index 087bba2e0d89b..eb09bd250a923 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.enforceSingleRow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java index 8077abd8037b0..1215945c07671 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java index 992c549f5575e..0721f6f802b53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java index d87691225acaa..b9e748ef6b820 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java index ddd233bccbf2e..d61b66d4a4264 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static com.google.common.base.Preconditions.checkArgument; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java index dec1d772b0897..2cb32c1f821d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java index b445d2af8e56a..971107116e42f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java index 22a396c05dcba..8723ee2a22800 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java index 92d0bc23c66e8..f537d12f9e33b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; @@ -41,7 +42,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; @@ -63,10 +63,10 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.concat; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.LongType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java index a7d8f8aa36ac0..8854a5c0bcb9d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; @@ -28,9 +31,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; @@ -44,10 +44,10 @@ import static com.google.common.base.Verify.verify; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind.AGGREGATE; -import static org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; +import static org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind.AGGREGATE; +import static org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java index 515434b211b09..b41de6808edd3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java index 1fbe1d6fa6c2b..54138297fee53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; @@ -27,9 +30,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -45,11 +45,11 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java index 83169057f63ef..f088d109f2b43 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -40,11 +40,11 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java index 0eaef8870a3fa..bb079016462ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; @@ -28,9 +31,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -50,13 +50,13 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.empty; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.empty; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java index 1d1eddccec410..31ef8b78600f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; @@ -28,9 +31,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -47,13 +47,13 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.empty; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.empty; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java index 7d4678fbf1d46..b80c8d5ff0f70 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; @@ -27,9 +30,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -45,11 +45,11 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Aggregation.groupingColumns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java index 2c86b28cb84c5..2f277468af468 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -40,11 +40,11 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java index 1d0b51c454076..e60b692930a5b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; @@ -35,10 +35,10 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index 81a7e55a8e51a..30f05cd5563c8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; @@ -34,8 +36,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; @@ -46,12 +46,12 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanNodeSearcher.searchFrom; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java index 977de8a55408b..c3ce3a6aca901 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; @@ -33,8 +35,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java index eb7398f5b819d..307ff77283ed6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; @@ -27,9 +30,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; @@ -40,11 +40,11 @@ import java.util.function.Predicate; import static com.google.common.collect.ImmutableList.toImmutableList; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractConjuncts; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java index 4c0506c9d17ed..cc5cc0b04373c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static com.google.common.collect.Iterables.getOnlyElement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java index 3a0cbc8b1614a..38a6bf148fd28 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; @@ -28,8 +30,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; @@ -41,9 +41,9 @@ import java.util.Optional; import static com.google.common.base.Preconditions.checkState; +import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.empty; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.empty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; 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 d742417b5fe53..c0f4bb005d236 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 @@ -58,10 +58,10 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; -import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST_BY; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.TABLE_TIME_COLUMN_NAME; +import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; +import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST_BY; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator.DATE_BIN_PREFIX; public class AggregationTableScanNode extends DeviceTableScanNode { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java index d4b40e06c8a3e..aaeda594eaccd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Property; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; @@ -51,8 +53,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Property; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import java.util.List; 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 217d2f3c126a5..3f414f7062399 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 @@ -103,6 +103,7 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableMap.toImmutableMap; import static java.util.Objects.requireNonNull; +import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.extractGlobalTimeFilter; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; @@ -117,7 +118,6 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ATTRIBUTE; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; -import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.extractGlobalTimeFilter; 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.plan.analyze.AnalyzeVisitor.getTimePartitionSlotList; 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 9a87cdbb7d747..8ac8d0a045095 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 @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.calc_commons.execution.relational.ColumnTransformerBuilder; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; @@ -31,9 +34,6 @@ import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; -import org.apache.iotdb.calc_commons.execution.relational.ColumnTransformerBuilder; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceBlackListConstructor; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.TableDeviceQuerySource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java index 31e41df275d31..5247e7bbf7cc8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaValidator; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java index 7343d0d37a4c3..06a5c226ccdc4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeUtils; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ITableDeviceSchemaValidation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java index 1589d9f6115bf..fb804d118e447 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaValidator; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java index d8564c958bc69..9d6d1f1b8f61e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException; import org.apache.iotdb.db.exception.metadata.PathNotExistException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeUtils; import org.apache.iotdb.db.queryengine.plan.relational.metadata.ITableDeviceSchemaValidation; 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 75e168ca3bf04..e83912c6a1edf 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; import org.apache.iotdb.commons.auth.entity.PrivilegeType; import org.apache.iotdb.commons.cluster.NodeStatus; @@ -148,7 +149,6 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; @@ -309,6 +309,9 @@ import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toList; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.APPROX_COUNT_DISTINCT; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.APPROX_MOST_FREQUENT; +import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.APPROX_PERCENTILE; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_END; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_START; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets.Type.CUBE; @@ -332,9 +335,6 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.APPROX_COUNT_DISTINCT; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.APPROX_MOST_FREQUENT; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.APPROX_PERCENTILE; import static org.apache.iotdb.db.queryengine.plan.execution.config.TableConfigTaskVisitor.DATABASE_NOT_SPECIFIED; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.SERVICE_MANAGEMENT_NOT_SUPPORTED; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.parseDateTimeFormat; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java index bd8317ca814b6..cdd441673c32d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java @@ -18,12 +18,12 @@ */ package org.apache.iotdb.db.queryengine.plan.scheduler; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.IClientManager; import org.apache.iotdb.commons.client.async.AsyncDataNodeInternalServiceClient; import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.QueryStateMachine; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java index aa8461ddd0c58..9ae5e74cb939b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.scheduler; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSStatus; @@ -34,7 +35,6 @@ import org.apache.iotdb.commons.utils.RetryUtils; import org.apache.iotdb.consensus.exception.ConsensusGroupNotExistException; import org.apache.iotdb.consensus.exception.RatisReadUnavailableException; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.mpp.FragmentInstanceDispatchException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java index 921ac0cc1cf17..409ec033426ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.crud; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException; import org.apache.iotdb.db.exception.metadata.DuplicateInsertException; import org.apache.iotdb.db.exception.metadata.PathNotExistException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java index bd3753dff68a6..877d6e23bd3f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.crud; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.SemanticException; @@ -30,7 +31,6 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException; import org.apache.iotdb.db.exception.metadata.PathNotExistException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.IMeasurementSchemaInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java index 774a09a9c5492..ba72d6884cdb0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.statement.crud; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.utils.TimePartitionUtils; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java index 8386182f60f92..88aec7bb9f44a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.statement.crud; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/api/LayerRowWindowReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/api/LayerRowWindowReader.java index 327f90d10b166..d14c2b4255b80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/api/LayerRowWindowReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/api/LayerRowWindowReader.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.api; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.udf.api.access.RowWindow; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java index 2ec2dea260b68..7759ab2219021 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; -import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowIterator; import org.apache.iotdb.udf.api.access.RowWindow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java index fd1fb1db8bcdf..9cb1d5bb28c04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; +import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.commons.udf.utils.UDFBinaryTransformer; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.type.Binary; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java index 45a70972bfe83..041c59647c54a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; -import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowIterator; import org.apache.iotdb.udf.api.access.RowWindow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java index 14643a7b6ac50..2c6d913c774c2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.input; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java index a288c40213f61..68cdbb10c716a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.input; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.memory.SafetyLine; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java index 72127aad5a56e..2569d4bd63672 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java index 149485ef3b5b5..fff60452e2952 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java index f15fb07155309..4c28de3ca13ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/ArithmeticBinaryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/ArithmeticBinaryTransformer.java index 971d91a712f0b..2d246b527b2ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/ArithmeticBinaryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/ArithmeticBinaryTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/BinaryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/BinaryTransformer.java index e1819be19f5b8..dc1dab7f70664 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/BinaryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/BinaryTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareBinaryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareBinaryTransformer.java index 7175c311df4bd..095c0e0144bd7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareBinaryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareBinaryTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java index cf3f677a40f64..5376c0b52d6b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; -import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.TypeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/CompareTernaryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/CompareTernaryTransformer.java index 6e4515878332d..948e8aa14729a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/CompareTernaryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/CompareTernaryTransformer.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.ternary; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/TernaryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/TernaryTransformer.java index e2d8980a2c885..f935fc0dfb857 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/TernaryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/TernaryTransformer.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.ternary; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/ArithmeticNegationTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/ArithmeticNegationTransformer.java index 59b3dbbc8b636..5b5222f177fad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/ArithmeticNegationTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/ArithmeticNegationTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/InTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/InTransformer.java index 09cc6e76ad380..f8e77914deae5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/InTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/InTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/IsNullTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/IsNullTransformer.java index aa6da69532a89..fc4b241488abc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/IsNullTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/IsNullTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LikeTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LikeTransformer.java index 80690826d74d6..a0cb4da7e4774 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LikeTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LikeTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LogicNotTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LogicNotTransformer.java index 50f9a9e55736f..b1e3f51609839 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LogicNotTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LogicNotTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/RegularTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/RegularTransformer.java index 61cfb15d82c93..2e7151bc606ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/RegularTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/RegularTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/TransparentTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/TransparentTransformer.java index da73f54bb64c9..5c10b93073a75 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/TransparentTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/TransparentTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/UnaryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/UnaryTransformer.java index f9a246ba30739..22ab915fb27da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/UnaryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/UnaryTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java index 2c3063da85190..557822e5d8df8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.calc_commons.transformation.dag.util.CastFunctionUtils; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.UnaryTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/DiffFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/DiffFunctionTransformer.java index 03081f9206f1f..ffc9afb5cb01e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/DiffFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/DiffFunctionTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.UnaryTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/RoundFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/RoundFunctionTransformer.java index 47e4261807730..4a3100f6d80e0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/RoundFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/RoundFunctionTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.UnaryTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java index a2c4060814cca..56287c1754727 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.udf.api.UDAF; import org.apache.iotdb.udf.api.customizer.config.UDAFConfigurations; import org.apache.iotdb.udf.api.customizer.parameter.UDFParameterValidator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java index 540dfa630e743..b17b89172c336 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; -import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java index bd242f7a83aa8..bf03678ac8f5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; +import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.udf.api.UDTF; import org.apache.iotdb.udf.api.customizer.config.UDTFConfigurations; import org.apache.iotdb.udf.api.customizer.parameter.UDFParameterValidator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java index 2e1eba2fb29f4..e823a999c40c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.datastructure.util.ValueRecorder; import org.apache.iotdb.db.utils.CommonUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TypeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TypeUtils.java index c3d7d13b5113a..42c1692ea278b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TypeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TypeUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; -import org.apache.iotdb.db.exception.query.QueryProcessException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; 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 127c0b01c71b6..f96f213fe2e6d 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 @@ -19,6 +19,9 @@ package org.apache.iotdb.db.schemaengine.schemaregion.impl; +import org.apache.iotdb.calc_commons.execution.relational.ColumnTransformerBuilder; +import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.MetadataException; @@ -42,9 +45,6 @@ import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.consensus.ConsensusFactory; -import org.apache.iotdb.calc_commons.execution.relational.ColumnTransformerBuilder; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.metadata.PathNotExistException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java index 6d0c9091a281a..920f9faab9846 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.schemaengine.schemaregion.utils; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.storageengine.dataregion.memtable.AlignedReadOnlyMemChunk; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java index 074a8fdd47c00..d69d8ef969bac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.schemaengine.table; +import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.commons.schema.table.NonCommittableTsTable; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.TsTableInternalRPCUtil; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.confignode.rpc.thrift.TFetchTableResp; -import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.plan.execution.config.executor.ClusterConfigTaskExecutor; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java index 35443a3cd96ce..3678cc95c01f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.service; +import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.common.rpc.thrift.Model; import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; @@ -71,7 +72,6 @@ import org.apache.iotdb.consensus.common.Peer; import org.apache.iotdb.db.audit.DNAuditLogger; import org.apache.iotdb.db.auth.AuthorityChecker; -import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.db.conf.DataNodeStartupCheck; import org.apache.iotdb.db.conf.DataNodeSystemPropertiesHandler; import org.apache.iotdb.db.conf.IoTDBConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java index cf53ed9e92ca2..422e4210b55f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.service.metrics; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.commons.client.ClientManagerMetrics; import org.apache.iotdb.commons.concurrent.ThreadModule; import org.apache.iotdb.commons.concurrent.ThreadName; @@ -29,7 +30,6 @@ import org.apache.iotdb.commons.service.metric.MetricService; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.commons.service.metric.cpu.CpuUsageMetrics; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.pipe.metric.PipeDataNodeMetrics; import org.apache.iotdb.db.protocol.thrift.handler.RPCServiceThriftHandlerMetrics; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java index 683470dc824e4..85a2667045235 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.service.metrics; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.client.IClientManager; @@ -33,7 +34,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.protocol.client.ConfigNodeClient; import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager; import org.apache.iotdb.db.protocol.client.ConfigNodeInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java index e4857537dc189..b686130f4d18e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.storageengine.dataregion; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.cluster.NodeStatus; @@ -51,8 +54,6 @@ import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.consensus.iot.IoTConsensus; import org.apache.iotdb.consensus.iot.IoTConsensusServerImpl; -import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; -import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.consensus.DataRegionConsensusImpl; @@ -65,7 +66,6 @@ import org.apache.iotdb.db.exception.WriteProcessRejectException; import org.apache.iotdb.db.exception.load.LoadFileException; import org.apache.iotdb.db.exception.query.OutOfTTLException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.quota.ExceedQuotaException; import org.apache.iotdb.db.exception.runtime.TableLostRuntimeException; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/IDataRegionForQuery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/IDataRegionForQuery.java index b087ab2db544d..c90448359d16f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/IDataRegionForQuery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/IDataRegionForQuery.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.storageengine.dataregion; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/VirtualDataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/VirtualDataRegion.java index 6ead0b2eed5e5..fed8f0a73f9ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/VirtualDataRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/VirtualDataRegion.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.storageengine.dataregion; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.path.IFullPath; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java index bcd682435b295..284e0f22b91f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.AlignedFullPath; @@ -29,7 +30,6 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.exception.WriteProcessException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java index aaf74af2bcd31..155f911d2b7da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; -import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.IWALByteBufferView; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/IMemTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/IMemTable.java index 58a490769819b..9ad8a8be3195d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/IMemTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/IMemTable.java @@ -18,12 +18,12 @@ */ package org.apache.iotdb.db.storageengine.dataregion.memtable; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.exception.WriteProcessException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/ReadOnlyMemChunk.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/ReadOnlyMemChunk.java index f6fa9403c7b56..5609f03825707 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/ReadOnlyMemChunk.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/ReadOnlyMemChunk.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java index 2a5bd76dc10c8..b84b0814b7b58 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; @@ -29,13 +31,11 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.TsFileProcessorException; import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.exception.WriteProcessRejectException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.source.dataregion.realtime.listener.PipeInsertionDataNodeListener; import org.apache.iotdb.db.queryengine.common.DeviceContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java index 28b1b2441ca79..b9cc17cea50cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.utils; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; @@ -26,8 +28,6 @@ import org.apache.iotdb.commons.service.metric.enums.Metric; import org.apache.iotdb.commons.service.metric.enums.Tag; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.protocol.thrift.OperationType; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java index 7cda7051eb504..2fc37ebd65e7d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.utils; -import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.commons.exception.ObjectFileNotExist; import org.apache.iotdb.calc_commons.utils.IObjectFileService; import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.commons.exception.IoTDBRuntimeException; +import org.apache.iotdb.commons.exception.ObjectFileNotExist; import org.apache.iotdb.db.service.metrics.FileMetrics; import org.apache.iotdb.db.storageengine.rescon.disk.TierManager; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java index 390686b0ac8e1..d2dc98ba61954 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.utils; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; @@ -28,7 +29,6 @@ import org.apache.iotdb.db.exception.BatchProcessException; import org.apache.iotdb.db.exception.QueryInBatchStatementException; import org.apache.iotdb.db.exception.StorageGroupNotReadyException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.exception.query.QueryTimeoutRuntimeException; import org.apache.iotdb.db.protocol.thrift.OperationType; import org.apache.iotdb.db.queryengine.plan.planner.exceptions.ReplicaSetUnreachableException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java index 840b8aca2504e..707c935abfb22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.utils; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java index 47f7bea35f4f7..aed1f2c2b2c51 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.utils; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java index ee63cad028417..1eb171d4f2315 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.qp.sql; +import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor; import org.junit.After; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java index 5f10a3ec15362..b184e8225e8a0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java @@ -18,6 +18,8 @@ */ package org.apache.iotdb.db.queryengine.execution; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; @@ -25,8 +27,6 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java index a66ce478f0047..0bfa7ebd31eb0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java index 053f74fd20436..63e9f0e01e45a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.execution.fragment; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.exception.CpuNotEnoughException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java index 4956d131e9f11..c96fbea9e9240 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.calc_commons.execution.operator.process.AggregationMergeSortOperator; import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.CountAccumulator; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java index 6de0271395f1e..4425ac7dff0e0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; @@ -26,8 +28,6 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java index 962d9e914a962..05567e5172f28 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java index ca25d60f898c1..e540076c94d81 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; @@ -27,7 +28,6 @@ import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java index 05e1d5692e961..c183448c9a331 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java index ff86cb0e85dbf..512f8327ce6b5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java @@ -18,14 +18,14 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.FixedIntervalFillFilter; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.IntPreviousFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.IntPreviousFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; +import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java index 2db7d947472bd..ca4c055587bba 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java index 31a692f5c6971..c4114aa28ab0f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; @@ -25,7 +26,6 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; 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 7d7d7d3093096..f7cb393d4bfa4 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 @@ -18,14 +18,14 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java index 10800e987657d..4c61f5634a28d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java @@ -19,6 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; @@ -34,9 +37,6 @@ import org.apache.iotdb.commons.schema.table.column.TagColumnSchema; import org.apache.iotdb.commons.schema.table.column.TimeColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java index 8b50461ae65e0..7ab147a9322b6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java @@ -18,6 +18,8 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; @@ -25,8 +27,6 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index da902fd9c5617..5cafb77e27a7d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -18,15 +18,6 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.path.AlignedFullPath; -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.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator; import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; @@ -38,6 +29,15 @@ import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.exception.IllegalPathException; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.path.AlignedFullPath; +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.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java index c8667f88b2ba7..d5fcd76803e9d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; @@ -27,7 +28,6 @@ import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java index 6c39034d556ab..ee3b6c4697355 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.SortOperator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.SortOperator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java index 0eb122aa6409e..164442743e8c6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java index 9b44ba5a879d3..cfc7998a4a764 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; @@ -26,7 +27,6 @@ import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java index 6416bdce2686e..513184ce02d98 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java @@ -18,13 +18,13 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; -import org.apache.iotdb.db.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; +import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.LinearFill; +import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java index 4fceb968c135b..40c0d712888b4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java index 612468d39e744..0c0d148c530f9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java index a9283e31accb1..93c6e15ab7436 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java index 920c56844cbca..469bbbcc9cf62 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.TableStreamSortOperator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java index f901ea2dad1dc..3c16e58e8de8a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.calc_commons.execution.operator.process.ValuesOperator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java index 7228db726f8f2..585d4bfc0a183 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; -import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWGroupWMoOperator; import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java index d0c5a962d1bed..a79b877ac25dd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; -import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java index 8f8e9d4310a08..6296ebe8bb33b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; -import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java index d3cb233c1510b..024d27e5eacad 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; -import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.MergeSortOperator; import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java index a6108518eb08f..6168a2da36fb9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java index fadf2b0cbb3a6..35cecdbed1131 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java @@ -19,8 +19,6 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregator; import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; @@ -29,6 +27,8 @@ import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Program; import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java index eaa077fa79e33..9b4af1ab0c52e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.tvf; -import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.function.PartitionRecognizer; import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionState; import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java index 9da9fffcbcc3d..3bc374ebaaa8e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; -import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.window.RowNumberOperator; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java index 2ef3ff55a15a9..8fdad77ea74dc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; -import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.process.window.TableWindowOperator; import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.RankFunction; import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java index 38493a4aa218f..954c9dcf54bd0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.window.TopKRankingOperator; +import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.window.TopKRankingOperator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java index 00fc29ef737c5..1597b9ae1281c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function; -import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; import org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; import org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate.WindowAggregator; @@ -27,6 +26,7 @@ import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java index 2f416ae7c677c..0c24346eaa960 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate; -import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java index 5c8f89e03489b..8ad85f8f923c4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java index c67f403c779ed..5dbab80a74eff 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java index 6f298edc5cf65..7d1192275a21a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.parser; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.auth.entity.PrivilegeType; import org.apache.iotdb.commons.exception.IllegalPathException; @@ -28,7 +29,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; 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/planner/PipelineBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java index 7360bfa414343..a5b6e5211a23d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; @@ -28,7 +29,6 @@ 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.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java index 07b4e5e7b8b43..131417b0c41a9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java @@ -19,9 +19,6 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; -import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.FirstAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.FirstByAccumulator; @@ -32,6 +29,9 @@ import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.common.rpc.thrift.TAggregationType; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.enums.TSDataType; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java index 47e88b00ca115..f3de7cbacd379 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java @@ -18,12 +18,12 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.node.source; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java index accb94bc76a13..f056bd88710a4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.node.source; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java index 216f620777e55..10a9518ce06d2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; +import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -52,15 +52,15 @@ import java.util.List; import java.util.OptionalInt; +import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; +import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.EXTREME; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.FIRST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.SUM; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; -import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; 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 b9754d1a569c0..162a232e1f1ff 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 @@ -19,6 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; +import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc_commons.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; @@ -34,8 +36,6 @@ import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -72,12 +72,12 @@ import java.util.List; import java.util.Optional; +import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AnalyzerTest.analyzeSQL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.ALL_DEVICE_ENTRIES; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index 88189890cdeb8..8e9c5163312ee 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -83,10 +83,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import static org.apache.iotdb.commons.schema.table.InformationSchema.INFORMATION_DATABASE; import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isOneNumericType; import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoNumericType; import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; +import static org.apache.iotdb.commons.schema.table.InformationSchema.INFORMATION_DATABASE; 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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java index fab86989c0a26..9b7ba564dc6b7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.transformation.builder; +import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; -import org.apache.iotdb.calc_commons.execution.operator.Operator; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java index 1efe4a039263a..993627a253bab 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java index 2f46ee418f1fb..d5aa27082fb34 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java index 5d4084638acc0..5231969524835 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java index 9f73e40c2800f..3257e98e7aac9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java index bef232c3b1eff..667faca4dea3e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.LpadColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java index 238041872696d..a398ddc7e79a6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.RpadColumnTransformer; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java index cd128dfbb8e49..d9a6256020b71 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java index e08894742527f..d1819511b4fdd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java index fd306b3e386e5..a30ec9075cf2f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java index a9c2f5ec5e328..702f5e21aea15 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java index d0b450edafbd2..c392ce8cf0fb8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java index 1a287ef338d21..188f93c8193e4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java index c56d5c86265bf..2ac82cf5aa367 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java @@ -21,10 +21,10 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base32Encoding; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.commons.exception.SemanticException; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java index 3c0ea0d435f41..508bca05fe880 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java index 9f4d495a5df57..be7fcc6d0a7ca 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java index ce4ea1bd74f55..b9feb8f7dda6c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; -import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.commons.exception.SemanticException; import org.junit.Assert; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java index 7bd333884d0d5..0b51e47d5a3ed 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java index a91934137b187..2ed85a215b979 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.DataRegionId; @@ -37,7 +38,6 @@ import org.apache.iotdb.db.exception.TsFileProcessorException; import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.exception.WriteProcessRejectException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLQueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLQueryTest.java index 10869cf1b87b7..3d746f3a96e50 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLQueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLQueryTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.storageengine.dataregion; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; import org.apache.iotdb.db.storageengine.dataregion.compaction.AbstractCompactionTest; import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java index 52be97716c6ce..16ececb02ce56 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.storageengine.dataregion; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.consensus.DataRegionId; @@ -34,7 +35,6 @@ import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.exception.query.OutOfTTLException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache; import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AlignedTVListIteratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AlignedTVListIteratorTest.java index b0c383e32135d..4204c8e3862ba 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AlignedTVListIteratorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AlignedTVListIteratorTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemChunkDeserializeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemChunkDeserializeTest.java index e2319406a8a95..3abf1e4e0902d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemChunkDeserializeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemChunkDeserializeTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALByteBufferForTest; import org.apache.iotdb.db.utils.EnvironmentUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/NonAlignedTVListIteratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/NonAlignedTVListIteratorTest.java index b28979efd677a..67752fd95f96a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/NonAlignedTVListIteratorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/NonAlignedTVListIteratorTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java index bcd76e85cb9a9..eaa652959351c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java @@ -18,6 +18,9 @@ */ package org.apache.iotdb.db.storageengine.dataregion.memtable; +import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; @@ -26,12 +29,9 @@ 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.calc_commons.exception.MemoryNotEnoughException; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.WriteProcessException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java index a91d104381beb..1bb04617abc6d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.storageengine.dataregion.wal; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java index 5f7fec5253ff3..3ff93e9997071 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java @@ -18,12 +18,12 @@ */ package org.apache.iotdb.db.storageengine.dataregion.wal.buffer; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.io.WALReader; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALFileUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/compression/WALCompressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/compression/WALCompressionTest.java index 7d5223b3c6823..26d7c1729c725 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/compression/WALCompressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/compression/WALCompressionTest.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.storageengine.dataregion.wal.compression; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.WALTestUtils; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALBuffer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java index 30b1780a3b355..a51f0a2ed0c07 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java @@ -18,6 +18,7 @@ */ package org.apache.iotdb.db.storageengine.dataregion.wal.recover; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.concurrent.ExceptionalCountDownLatch; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; @@ -28,7 +29,6 @@ import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/rescon/memory/TimePartitionManagerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/rescon/memory/TimePartitionManagerTest.java index 7be3dc0191d9b..81b884ba41326 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/rescon/memory/TimePartitionManagerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/rescon/memory/TimePartitionManagerTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.storageengine.rescon.memory; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.StorageEngineException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.tsfile.exception.write.WriteProcessException; import org.junit.After; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ErrorHandlingUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ErrorHandlingUtilsTest.java index f3719c09d4344..dcc39b2f431b3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ErrorHandlingUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ErrorHandlingUtilsTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.utils; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.exception.StorageGroupNotReadyException; import org.apache.iotdb.db.exception.metadata.PathNotExistException; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.protocol.thrift.OperationType; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java index d804ef682624a..6057d0465d485 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.utils; -import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.commons.exception.MetadataException; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.AbstractAlignedChunkMetadata; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TypeInferenceUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TypeInferenceUtilsTest.java index cc63f38edfddc..8a8cac8fe2881 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TypeInferenceUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TypeInferenceUtilsTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.utils; +import org.apache.iotdb.calc_commons.exception.QueryProcessException; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.tsfile.common.constant.TsFileConstant; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java index 5b4f4d4f626e8..1dd148253e274 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java @@ -19,9 +19,6 @@ package org.apache.iotdb.db.utils.sort; -import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; import org.apache.iotdb.calc_commons.utils.sort.FileSpillerReader; @@ -29,6 +26,9 @@ import org.apache.iotdb.calc_commons.utils.sort.SortBufferManager; import org.apache.iotdb.calc_commons.utils.sort.SortReader; import org.apache.iotdb.calc_commons.utils.sort.TreeDiskSpiller; +import org.apache.iotdb.commons.conf.CommonDescriptor; +import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.utils.FileUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/pom.xml b/iotdb-core/pom.xml index 0a41cb71c657d..7566dbd82adf1 100644 --- a/iotdb-core/pom.xml +++ b/iotdb-core/pom.xml @@ -37,7 +37,7 @@ metrics node-commons relational-grammar - calc_commons + calc-commons From 127e6fa70215fb9dc065babd4717255266e75074 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Tue, 21 Apr 2026 11:29:43 +0800 Subject: [PATCH 44/45] rename package --- .../apache/iotdb/mqtt/MPPPublishHandler.java | 4 +- .../table/v1/handler/ExceptionHandler.java | 4 +- .../v1/handler/ExecuteStatementHandler.java | 4 +- .../table/v1/handler/QueryDataSetHandler.java | 4 +- .../handler/StatementConstructionHandler.java | 2 +- .../table/v1/impl/RestApiServiceImpl.java | 4 +- .../protocol/v1/handler/ExceptionHandler.java | 2 +- .../handler/StatementConstructionHandler.java | 2 +- .../protocol/v2/handler/ExceptionHandler.java | 2 +- .../handler/StatementConstructionHandler.java | 2 +- .../protocol/v2/impl/RestApiServiceImpl.java | 2 +- integration-test/pom.xml | 5 + .../apache/iotdb/it/env/cluster/EnvUtils.java | 2 +- .../BuiltinAggregationFunctionEnum.java | 9 +- .../it/partition/IoTDBTimePartitionIT.java | 2 +- .../it/procedure/IoTDBProcedureIT.java | 2 +- .../IoTDBMultiTAGsWithAttributesTableIT.java | 8 +- .../it/udf/IoTDBSQLFunctionManagementIT.java | 2 +- .../scalar/IoTDBCastFunctionTableIT.java | 2 +- .../scalar/IoTDBFormatFunctionTableIT.java | 2 +- .../old/query/IoTDBArithmeticTableIT.java | 2 +- .../old/query/IoTDBArithmeticTableViewIT.java | 2 +- .../iotdb/tool/data/AbstractDataTool.java | 4 +- .../ArithmeticBinaryColumnTransformer.ftl | 22 +- .../ArithmeticColumnTransformerApi.ftl | 26 +- .../ArithmeticUnaryColumnTransformer.ftl | 6 +- .../codegen/templates/ModeAccumulator.ftl | 4 +- .../main/codegen/templates/constantFill.ftl | 6 +- .../src/main/codegen/templates/linearFill.ftl | 4 +- .../main/codegen/templates/previousFill.ftl | 6 +- .../previousFillWithTimeDuration.ftl | 8 +- .../exception/MemoryNotEnoughException.java | 2 +- .../exception/QueryProcessException.java | 2 +- .../execution/aggregation/Accumulator.java | 2 +- .../aggregation/VarianceAccumulator.java | 2 +- .../execution/operator/AbstractOperator.java | 2 +- .../operator/CommonOperatorContext.java | 6 +- .../operator/GroupedTopNBuilder.java | 2 +- .../GroupedTopNRowNumberAccumulator.java | 8 +- .../operator/GroupedTopNRowNumberBuilder.java | 8 +- .../execution/operator/IdRegistry.java | 4 +- .../execution/operator/Operator.java | 2 +- .../operator/RowIdComparisonStrategy.java | 2 +- .../execution/operator/RowIdHashStrategy.java | 2 +- .../execution/operator/RowReference.java | 2 +- .../operator/RowReferenceTsBlockManager.java | 6 +- .../SimpleTsBlockWithPositionComparator.java | 10 +- .../TsBlockWithPositionComparator.java | 2 +- .../process/AbstractConsumeAllOperator.java | 8 +- .../process/AbstractFillOperator.java | 10 +- .../process/AbstractLinearFillOperator.java | 10 +- .../process/AbstractSortOperator.java | 22 +- .../process/AggregationMergeSortOperator.java | 18 +- .../process/AssignUniqueIdOperator.java | 8 +- .../operator/process/CollectOperator.java | 8 +- .../process/EnforceSingleRowOperator.java | 8 +- .../process/FilterAndProjectOperator.java | 30 +- .../operator/process/LimitOperator.java | 8 +- .../process/MappingCollectOperator.java | 8 +- .../operator/process/MergeSortOperator.java | 14 +- .../operator/process/OffsetOperator.java | 8 +- .../process/PatternRecognitionOperator.java | 34 +- .../PreviousFillWithGroupOperator.java | 12 +- .../operator/process/ProcessOperator.java | 4 +- .../operator/process/SortOperator.java | 12 +- .../operator/process/TableFillOperator.java | 8 +- .../process/TableLinearFillOperator.java | 8 +- .../TableLinearFillWithGroupOperator.java | 12 +- .../process/TableMergeSortOperator.java | 10 +- .../operator/process/TableSortOperator.java | 12 +- .../process/TableStreamSortOperator.java | 14 +- .../operator/process/TableTopKOperator.java | 10 +- .../operator/process/TopKOperator.java | 16 +- .../operator/process/ValuesOperator.java | 8 +- .../operator/process/fill/IFill.java | 2 +- .../operator/process/fill/IFillFilter.java | 2 +- .../operator/process/fill/ILinearFill.java | 2 +- .../AbstractMonthIntervalFillFilter.java | 4 +- .../fill/filter/FixedIntervalFillFilter.java | 4 +- .../filter/MonthIntervalMSFillFilter.java | 2 +- .../filter/MonthIntervalNSFillFilter.java | 2 +- .../filter/MonthIntervalUSFillFilter.java | 2 +- .../process/fill/identity/IdentityFill.java | 4 +- .../fill/identity/IdentityLinearFill.java | 4 +- .../process/fill/linear/LinearFill.java | 4 +- .../process/function/PartitionRecognizer.java | 12 +- .../function/TableFunctionLeafOperator.java | 8 +- .../function/TableFunctionOperator.java | 20 +- .../function/partition/PartitionCache.java | 2 +- .../function/partition/PartitionState.java | 2 +- .../process/function/partition/Slice.java | 6 +- .../gapfill/AbstractGapFillOperator.java | 16 +- .../AbstractGapFillWGroupOperator.java | 8 +- .../AbstractGapFillWoGroupOperator.java | 8 +- .../gapfill/GapFillWGroupWMoOperator.java | 10 +- .../gapfill/GapFillWGroupWoMoOperator.java | 10 +- .../gapfill/GapFillWoGroupWMoOperator.java | 8 +- .../gapfill/GapFillWoGroupWoMoOperator.java | 8 +- .../SimpleNestedLoopCrossJoinOperator.java | 16 +- .../join/merge/MergeSortComparator.java | 6 +- .../process/join/merge/SortKeyComparator.java | 4 +- .../AscBinaryTypeJoinKeyComparator.java | 2 +- .../AscBooleanTypeJoinKeyComparator.java | 2 +- .../AscDoubleTypeJoinKeyComparator.java | 2 +- .../AscFloatTypeJoinKeyComparator.java | 2 +- .../AscIntTypeJoinKeyComparator.java | 2 +- ...cLongTypeIgnoreEqualJoinKeyComparator.java | 2 +- .../AscLongTypeJoinKeyComparator.java | 2 +- .../DescBinaryTypeJoinKeyComparator.java | 2 +- .../DescBooleanTypeJoinKeyComparator.java | 2 +- .../DescDoubleTypeJoinKeyComparator.java | 2 +- .../DescFloatTypeJoinKeyComparator.java | 2 +- .../DescIntTypeJoinKeyComparator.java | 2 +- ...cLongTypeIgnoreEqualJoinKeyComparator.java | 2 +- .../DescLongTypeJoinKeyComparator.java | 2 +- .../merge/comparator/JoinKeyComparator.java | 2 +- .../comparator/JoinKeyComparatorFactory.java | 2 +- .../rowpattern/LogicalIndexNavigation.java | 8 +- .../rowpattern/PatternAggregationTracker.java | 6 +- .../process/rowpattern/PatternAggregator.java | 14 +- .../rowpattern/PatternAggregators.java | 2 +- .../rowpattern/PatternPartitionExecutor.java | 24 +- .../rowpattern/PatternVariableRecognizer.java | 10 +- .../PhysicalAggregationPointer.java | 2 +- .../rowpattern/PhysicalValueAccessor.java | 2 +- .../rowpattern/PhysicalValuePointer.java | 2 +- .../expression/ArithmeticOperator.java | 2 +- .../expression/BinaryComputation.java | 2 +- .../rowpattern/expression/BinaryOperator.java | 2 +- .../expression/CastComputation.java | 6 +- .../expression/ComparisonOperator.java | 2 +- .../rowpattern/expression/Computation.java | 34 +- .../expression/ConstantComputation.java | 2 +- .../expression/LogicalOperator.java | 2 +- .../expression/NaryComputation.java | 2 +- .../rowpattern/expression/NaryOperator.java | 2 +- .../PatternExpressionComputation.java | 20 +- .../expression/ReferenceComputation.java | 2 +- .../process/rowpattern/matcher/ArrayView.java | 2 +- .../process/rowpattern/matcher/Done.java | 2 +- .../rowpattern/matcher/Instruction.java | 2 +- .../process/rowpattern/matcher/IntList.java | 2 +- .../rowpattern/matcher/IntMultimap.java | 2 +- .../process/rowpattern/matcher/IntStack.java | 2 +- .../IrRowPatternToProgramRewriter.java | 26 +- .../process/rowpattern/matcher/Jump.java | 2 +- .../process/rowpattern/matcher/MatchEnd.java | 2 +- .../rowpattern/matcher/MatchLabel.java | 2 +- .../rowpattern/matcher/MatchResult.java | 2 +- .../rowpattern/matcher/MatchStart.java | 2 +- .../process/rowpattern/matcher/Matcher.java | 10 +- .../rowpattern/matcher/PatternCaptures.java | 4 +- .../process/rowpattern/matcher/Program.java | 2 +- .../process/rowpattern/matcher/Save.java | 2 +- .../process/rowpattern/matcher/Split.java | 2 +- .../process/window/RowNumberOperator.java | 20 +- .../process/window/TableWindowOperator.java | 34 +- .../process/window/TopKRankingOperator.java | 32 +- .../window/function/WindowFunction.java | 4 +- .../function/WindowFunctionFactory.java | 24 +- .../aggregate/AggregationWindowFunction.java | 6 +- .../function/aggregate/WindowAggregator.java | 10 +- .../function/rank/CumeDistFunction.java | 4 +- .../function/rank/DenseRankFunction.java | 4 +- .../window/function/rank/NTileFunction.java | 4 +- .../function/rank/PercentRankFunction.java | 4 +- .../window/function/rank/RankFunction.java | 4 +- .../function/rank/RankWindowFunction.java | 6 +- .../function/rank/RowNumberFunction.java | 4 +- .../function/value/FirstValueFunction.java | 4 +- .../window/function/value/LagFunction.java | 4 +- .../function/value/LastValueFunction.java | 4 +- .../window/function/value/LeadFunction.java | 4 +- .../function/value/NthValueFunction.java | 4 +- .../function/value/ValueWindowFunction.java | 6 +- .../process/window/partition/Partition.java | 6 +- .../window/partition/PartitionExecutor.java | 22 +- .../process/window/partition/frame/Frame.java | 4 +- .../window/partition/frame/FrameInfo.java | 8 +- .../window/partition/frame/GroupsFrame.java | 10 +- .../window/partition/frame/RangeFrame.java | 16 +- .../window/partition/frame/RowsFrame.java | 6 +- .../process/window/utils/ColumnList.java | 2 +- .../operator/process/window/utils/Range.java | 2 +- .../process/window/utils/RowComparator.java | 2 +- .../AbstractAsofMergeSortJoinOperator.java | 8 +- .../AbstractMergeSortJoinOperator.java | 16 +- .../AsofMergeSortInnerJoinOperator.java | 10 +- .../AsofMergeSortLeftJoinOperator.java | 10 +- .../relational/MarkDistinctOperator.java | 18 +- .../MergeSortFullOuterJoinOperator.java | 12 +- .../MergeSortInnerJoinOperator.java | 10 +- .../relational/MergeSortLeftJoinOperator.java | 10 +- .../relational/MergeSortSemiJoinOperator.java | 10 +- ...AbstractApproxMostFrequentAccumulator.java | 4 +- .../AbstractApproxPercentileAccumulator.java | 4 +- .../aggregation/AccumulatorFactory.java | 76 ++-- .../aggregation/AggregationMask.java | 2 +- .../aggregation/AggregationOperator.java | 16 +- .../ApproxCountDistinctAccumulator.java | 8 +- .../ApproxPercentileAccumulator.java | 2 +- ...ApproxPercentileWithWeightAccumulator.java | 2 +- .../aggregation/AvgAccumulator.java | 2 +- .../BinaryApproxMostFrequentAccumulator.java | 8 +- .../BlobApproxMostFrequentAccumulator.java | 2 +- .../BooleanApproxMostFrequentAccumulator.java | 8 +- .../aggregation/CountAccumulator.java | 2 +- .../aggregation/CountAllAccumulator.java | 2 +- .../aggregation/CountIfAccumulator.java | 2 +- .../DoubleApproxMostFrequentAccumulator.java | 8 +- .../aggregation/ExtremeAccumulator.java | 2 +- .../aggregation/FirstAccumulator.java | 4 +- .../aggregation/FirstByAccumulator.java | 4 +- .../aggregation/FirstByDescAccumulator.java | 2 +- .../aggregation/FirstDescAccumulator.java | 2 +- .../FloatApproxMostFrequentAccumulator.java | 8 +- .../IntApproxMostFrequentAccumulator.java | 8 +- .../aggregation/LastAccumulator.java | 4 +- .../aggregation/LastByAccumulator.java | 4 +- .../aggregation/LastByDescAccumulator.java | 2 +- .../aggregation/LastDescAccumulator.java | 2 +- .../LongApproxMostFrequentAccumulator.java | 8 +- .../aggregation/MaskedRecordIterator.java | 2 +- .../aggregation/MaxAccumulator.java | 2 +- .../aggregation/MinAccumulator.java | 2 +- .../aggregation/RecordIterator.java | 4 +- .../aggregation/SumAccumulator.java | 2 +- .../aggregation/TableAccumulator.java | 2 +- .../aggregation/TableAggregator.java | 10 +- .../aggregation/TableMaxByAccumulator.java | 2 +- .../TableMaxMinByBaseAccumulator.java | 6 +- .../aggregation/TableMinByAccumulator.java | 2 +- .../aggregation/TableModeAccumulator.java | 6 +- .../aggregation/TableVarianceAccumulator.java | 4 +- ...erDefinedAggregateFunctionAccumulator.java | 2 +- .../source/relational/aggregation/Utils.java | 2 +- .../ApproxMostFrequentBucketDeserializer.java | 2 +- .../ApproxMostFrequentBucketSerializer.java | 2 +- .../aggregation/approximate/Counter.java | 2 +- .../approximate/DoublyLinkedList.java | 2 +- .../approximate/ExternalizableUtil.java | 2 +- .../aggregation/approximate/HyperLogLog.java | 2 +- .../approximate/HyperLogLogStateFactory.java | 4 +- .../aggregation/approximate/ITopK.java | 2 +- .../aggregation/approximate/ListNode2.java | 2 +- .../aggregation/approximate/Pair.java | 2 +- .../aggregation/approximate/SpaceSaving.java | 2 +- .../SpaceSavingByteCalculator.java | 2 +- .../approximate/SpaceSavingStateFactory.java | 6 +- .../approximate/StreamSummary.java | 2 +- .../aggregation/approximate/TDigest.java | 2 +- ...tGroupedApproxMostFrequentAccumulator.java | 6 +- ...actGroupedApproxPercentileAccumulator.java | 8 +- ...yGroupedApproxMostFrequentAccumulator.java | 10 +- ...bGroupedApproxMostFrequentAccumulator.java | 2 +- ...nGroupedApproxMostFrequentAccumulator.java | 10 +- ...eGroupedApproxMostFrequentAccumulator.java | 10 +- ...tGroupedApproxMostFrequentAccumulator.java | 10 +- .../grouped/GroupedAccumulator.java | 4 +- .../grouped/GroupedAggregator.java | 8 +- ...GroupedApproxCountDistinctAccumulator.java | 12 +- .../GroupedApproxPercentileAccumulator.java | 6 +- ...ApproxPercentileWithWeightAccumulator.java | 6 +- .../grouped/GroupedAvgAccumulator.java | 8 +- .../grouped/GroupedCountAccumulator.java | 6 +- .../grouped/GroupedCountAllAccumulator.java | 6 +- .../grouped/GroupedCountIfAccumulator.java | 6 +- .../grouped/GroupedExtremeAccumulator.java | 14 +- .../grouped/GroupedFirstAccumulator.java | 18 +- .../grouped/GroupedFirstByAccumulator.java | 18 +- .../grouped/GroupedLastAccumulator.java | 18 +- .../grouped/GroupedLastByAccumulator.java | 18 +- .../grouped/GroupedMaxAccumulator.java | 18 +- .../grouped/GroupedMaxByAccumulator.java | 2 +- .../GroupedMaxMinByBaseAccumulator.java | 18 +- .../grouped/GroupedMinAccumulator.java | 18 +- .../grouped/GroupedMinByAccumulator.java | 2 +- .../grouped/GroupedModeAccumulator.java | 12 +- .../grouped/GroupedSumAccumulator.java | 8 +- ...roupedUserDefinedAggregateAccumulator.java | 10 +- .../grouped/GroupedVarianceAccumulator.java | 10 +- .../grouped/HashAggregationOperator.java | 22 +- ...tGroupedApproxMostFrequentAccumulator.java | 10 +- ...gGroupedApproxMostFrequentAccumulator.java | 10 +- .../grouped/StreamingAggregationOperator.java | 20 +- .../StreamingHashAggregationOperator.java | 28 +- .../aggregation/grouped/array/BigArrays.java | 2 +- .../grouped/array/BinaryBigArray.java | 2 +- .../grouped/array/BooleanBigArray.java | 10 +- .../grouped/array/ByteBigArray.java | 10 +- .../grouped/array/DoubleBigArray.java | 10 +- .../grouped/array/FloatBigArray.java | 10 +- .../grouped/array/HyperLogLogBigArray.java | 4 +- .../grouped/array/IntArrayFIFOQueue.java | 2 +- .../grouped/array/IntBigArray.java | 10 +- .../grouped/array/IntBigArrays.java | 6 +- .../grouped/array/IntComparator.java | 2 +- .../grouped/array/LongBigArray.java | 10 +- .../grouped/array/LongBigArrayFIFOQueue.java | 2 +- .../grouped/array/MapBigArray.java | 2 +- .../grouped/array/ObjectBigArray.java | 10 +- .../grouped/array/ShortBigArray.java | 10 +- .../grouped/array/SpaceSavingBigArray.java | 10 +- .../grouped/array/TDigestBigArray.java | 4 +- .../builder/HashAggregationBuilder.java | 2 +- .../InMemoryHashAggregationBuilder.java | 18 +- .../relational/ColumnTransformerBuilder.java | 372 +++++++++--------- .../metric/QueryExecutionMetricSet.java | 2 +- .../plan/planner/CommonOperatorUtils.java | 54 +-- .../ITableOperatorGeneratorContext.java | 4 +- .../plan/planner/TableOperatorGenerator.java | 338 ++++++++-------- .../memory/MemoryReservationManager.java | 2 +- .../metadata/CommonMetadataUtils.java | 2 +- .../relational/metadata/ITypeMetadata.java | 6 +- .../planner/CastToBlobLiteralVisitor.java | 22 +- .../planner/CastToBooleanLiteralVisitor.java | 22 +- .../planner/CastToDateLiteralVisitor.java | 22 +- .../planner/CastToDoubleLiteralVisitor.java | 22 +- .../planner/CastToFloatLiteralVisitor.java | 22 +- .../planner/CastToInt32LiteralVisitor.java | 22 +- .../planner/CastToInt64LiteralVisitor.java | 22 +- .../planner/CastToStringLiteralVisitor.java | 24 +- .../CastToTimestampLiteralVisitor.java | 24 +- .../ir/GlobalTimePredicateExtractVisitor.java | 48 +-- .../relational/utils/matching/Capture.java | 2 +- .../relational/utils/matching/Captures.java | 2 +- .../utils/matching/DefaultPrinter.java | 12 +- .../plan/relational/utils/matching/Match.java | 2 +- .../relational/utils/matching/Pattern.java | 10 +- .../utils/matching/PatternVisitor.java | 12 +- .../relational/utils/matching/Property.java | 6 +- .../utils/matching/PropertyPattern.java | 2 +- .../matching/pattern/CapturePattern.java | 12 +- .../utils/matching/pattern/EqualsPattern.java | 10 +- .../utils/matching/pattern/FilterPattern.java | 10 +- .../utils/matching/pattern/TypeOfPattern.java | 10 +- .../utils/matching/pattern/WithPattern.java | 14 +- ...AbstractTemporaryQueryDataFileService.java | 4 +- ...TemporaryQueryDataFileServiceProvider.java | 2 +- .../dag/adapter/PointCollectorAdaptor.java | 2 +- ...AbstractCaseWhenThenColumnTransformer.java | 2 +- .../dag/column/ColumnCache.java | 2 +- .../dag/column/ColumnTransformer.java | 6 +- .../column/FailFunctionColumnTransformer.java | 2 +- .../TableCaseWhenThenColumnTransformer.java | 2 +- .../TreeCaseWhenThenColumnTransformer.java | 2 +- .../ArithmeticAdditionColumnTransformer.java | 4 +- .../ArithmeticBinaryColumnTransformer.java | 4 +- .../ArithmeticDivisionColumnTransformer.java | 4 +- .../ArithmeticModuloColumnTransformer.java | 4 +- ...hmeticMultiplicationColumnTransformer.java | 4 +- ...rithmeticSubtractionColumnTransformer.java | 4 +- .../binary/BinaryColumnTransformer.java | 4 +- .../CompareBinaryColumnTransformer.java | 12 +- .../CompareEqualToColumnTransformer.java | 6 +- .../CompareGreaterEqualColumnTransformer.java | 4 +- .../CompareGreaterThanColumnTransformer.java | 4 +- .../CompareLessEqualColumnTransformer.java | 4 +- .../CompareLessThanColumnTransformer.java | 4 +- .../CompareNonEqualColumnTransformer.java | 6 +- .../column/binary/HmacColumnTransformer.java | 8 +- .../column/binary/Like2ColumnTransformer.java | 6 +- .../binary/LogicAndColumnTransformer.java | 4 +- .../binary/LogicBinaryColumnTransformer.java | 4 +- .../binary/LogicOrColumnTransformer.java | 4 +- .../binary/factory/HmacStrategiesFactory.java | 4 +- .../binary/strategies/HmacStrategy.java | 2 +- .../leaf/ConstantColumnTransformer.java | 2 +- .../leaf/IdentityColumnTransformer.java | 2 +- .../column/leaf/LeafColumnTransformer.java | 4 +- .../column/leaf/NullColumnTransformer.java | 2 +- .../column/leaf/TimeColumnTransformer.java | 2 +- ...bstractGreatestLeastColumnTransformer.java | 4 +- .../BinaryGreatestColumnTransformer.java | 4 +- .../multi/BinaryLeastColumnTransformer.java | 4 +- .../BooleanGreatestColumnTransformer.java | 4 +- .../multi/BooleanLeastColumnTransformer.java | 4 +- .../multi/CoalesceColumnTransformer.java | 4 +- .../DoubleGreatestColumnTransformer.java | 4 +- .../multi/DoubleLeastColumnTransformer.java | 4 +- .../multi/FloatGreatestColumnTransformer.java | 4 +- .../multi/FloatLeastColumnTransformer.java | 4 +- .../multi/InBinaryMultiColumnTransformer.java | 4 +- .../InBooleanMultiColumnTransformer.java | 4 +- .../multi/InDoubleMultiColumnTransformer.java | 4 +- .../multi/InFloatMultiColumnTransformer.java | 4 +- .../multi/InInt32MultiColumnTransformer.java | 4 +- .../multi/InInt64MultiColumnTransformer.java | 4 +- .../multi/InMultiColumnTransformer.java | 4 +- .../multi/Int32GreatestColumnTransformer.java | 4 +- .../multi/Int32LeastColumnTransformer.java | 4 +- .../multi/Int64GreatestColumnTransformer.java | 4 +- .../multi/Int64LeastColumnTransformer.java | 4 +- .../LogicalAndMultiColumnTransformer.java | 4 +- .../multi/LogicalMultiColumnTransformer.java | 4 +- .../LogicalOrMultiColumnTransformer.java | 4 +- .../multi/MappableUDFColumnTransformer.java | 6 +- .../column/multi/MultiColumnTransformer.java | 4 +- .../ternary/BetweenColumnTransformer.java | 12 +- .../CompareTernaryColumnTransformer.java | 4 +- .../ternary/Like3ColumnTransformer.java | 8 +- .../column/ternary/LpadColumnTransformer.java | 6 +- .../column/ternary/RpadColumnTransformer.java | 6 +- .../ternary/TernaryColumnTransformer.java | 4 +- .../ternary/utils/BytePaddingUtils.java | 2 +- .../UserDefineScalarFunctionTransformer.java | 8 +- .../ArithmeticNegationColumnTransformer.java | 4 +- .../dag/column/unary/InColumnTransformer.java | 4 +- .../column/unary/IsNullColumnTransformer.java | 4 +- .../column/unary/LikeColumnTransformer.java | 6 +- .../unary/LogicNotColumnTransformer.java | 4 +- .../unary/RegularColumnTransformer.java | 6 +- .../column/unary/UnaryColumnTransformer.java | 4 +- .../unary/scalar/AbsColumnTransformer.java | 6 +- .../AbstractBitwise2ColumnTransformer.java | 6 +- .../AbstractBitwiseColumnTransformer.java | 6 +- ...AbstractCastFunctionColumnTransformer.java | 12 +- .../AbstractLengthColumnTransformer.java | 6 +- .../unary/scalar/AcosColumnTransformer.java | 6 +- .../unary/scalar/AsinColumnTransformer.java | 6 +- .../unary/scalar/AtanColumnTransformer.java | 6 +- .../scalar/BitCount2ColumnTransformer.java | 8 +- .../scalar/BitCountColumnTransformer.java | 8 +- .../scalar/BitwiseAnd2ColumnTransformer.java | 6 +- .../scalar/BitwiseAndColumnTransformer.java | 6 +- .../BitwiseLeftShift2ColumnTransformer.java | 6 +- .../BitwiseLeftShiftColumnTransformer.java | 6 +- .../scalar/BitwiseNotColumnTransformer.java | 8 +- .../scalar/BitwiseOr2ColumnTransformer.java | 6 +- .../scalar/BitwiseOrColumnTransformer.java | 6 +- .../BitwiseRightShift2ColumnTransformer.java | 6 +- ...ightShiftArithmetic2ColumnTransformer.java | 6 +- ...RightShiftArithmeticColumnTransformer.java | 6 +- .../BitwiseRightShiftColumnTransformer.java | 6 +- .../scalar/BitwiseXor2ColumnTransformer.java | 6 +- .../scalar/BitwiseXorColumnTransformer.java | 6 +- .../scalar/BlobLengthColumnTransformer.java | 4 +- .../BytesToDoubleColumnTransformer.java | 10 +- .../scalar/BytesToFloatColumnTransformer.java | 10 +- .../scalar/BytesToIntColumnTransformer.java | 10 +- .../scalar/BytesToLongColumnTransformer.java | 10 +- .../column/unary/scalar/CRC32Transformer.java | 6 +- .../scalar/CastFunctionColumnTransformer.java | 4 +- .../unary/scalar/CeilColumnTransformer.java | 6 +- .../scalar/Concat2ColumnTransformer.java | 8 +- .../unary/scalar/ConcatColumnTransformer.java | 6 +- .../scalar/ConcatMultiColumnTransformer.java | 6 +- .../unary/scalar/CosColumnTransformer.java | 6 +- .../unary/scalar/CoshColumnTransformer.java | 6 +- .../DateBinFunctionColumnTransformer.java | 6 +- .../scalar/DegreesColumnTransformer.java | 6 +- .../unary/scalar/DiffColumnTransformer.java | 6 +- .../scalar/DiffFunctionColumnTransformer.java | 6 +- .../DoubleToBytesColumnTransformer.java | 8 +- .../scalar/EndsWith2ColumnTransformer.java | 8 +- .../scalar/EndsWithColumnTransformer.java | 8 +- .../unary/scalar/ExpColumnTransformer.java | 6 +- .../unary/scalar/ExtractTransformer.java | 16 +- .../scalar/FloatToBytesColumnTransformer.java | 8 +- .../unary/scalar/FloorColumnTransformer.java | 6 +- .../unary/scalar/FormatColumnTransformer.java | 8 +- .../scalar/GenericCodecColumnTransformer.java | 10 +- .../HmacConstantKeyColumnTransformer.java | 8 +- .../scalar/IntToBytesColumnTransformer.java | 8 +- .../unary/scalar/LTrim2ColumnTransformer.java | 8 +- .../unary/scalar/LTrimColumnTransformer.java | 8 +- .../unary/scalar/LengthColumnTransformer.java | 4 +- .../unary/scalar/LnColumnTransformer.java | 6 +- .../unary/scalar/Log10ColumnTransformer.java | 6 +- .../scalar/LongToBytesColumnTransformer.java | 8 +- .../unary/scalar/LowerColumnTransformer.java | 6 +- .../scalar/ObjectLengthColumnTransformer.java | 6 +- .../unary/scalar/RTrim2ColumnTransformer.java | 8 +- .../unary/scalar/RTrimColumnTransformer.java | 8 +- .../scalar/RadiansColumnTransformer.java | 6 +- .../scalar/RegexpLike2ColumnTransformer.java | 6 +- .../scalar/RegexpLikeColumnTransformer.java | 6 +- .../scalar/Replace2ColumnTransformer.java | 6 +- .../scalar/Replace3ColumnTransformer.java | 6 +- .../ReplaceFunctionColumnTransformer.java | 6 +- .../unary/scalar/RoundColumnTransformer.java | 6 +- .../RoundFunctionColumnTransformer.java | 6 +- .../unary/scalar/SignColumnTransformer.java | 6 +- .../unary/scalar/SinColumnTransformer.java | 6 +- .../unary/scalar/SinhColumnTransformer.java | 6 +- .../unary/scalar/SqrtColumnTransformer.java | 6 +- .../scalar/StartsWith2ColumnTransformer.java | 8 +- .../scalar/StartsWithColumnTransformer.java | 6 +- .../scalar/Strcmp2ColumnTransformer.java | 6 +- .../unary/scalar/StrcmpColumnTransformer.java | 6 +- .../scalar/Strpos2ColumnTransformer.java | 6 +- .../unary/scalar/StrposColumnTransformer.java | 6 +- .../scalar/SubString2ColumnTransformer.java | 6 +- .../scalar/SubString3ColumnTransformer.java | 8 +- .../scalar/SubStringColumnTransformer.java | 6 +- .../unary/scalar/TanColumnTransformer.java | 6 +- .../unary/scalar/TanhColumnTransformer.java | 6 +- .../unary/scalar/Trim2ColumnTransformer.java | 8 +- .../unary/scalar/TrimColumnTransformer.java | 6 +- .../TryCastFunctionColumnTransformer.java | 4 +- .../unary/scalar/UpperColumnTransformer.java | 6 +- .../factory/CodecStrategiesFactory.java | 8 +- .../NumericCodecStrategiesFactory.java | 2 +- .../unary/scalar/inteface/CodecStrategy.java | 2 +- .../column/unary/scalar/util/HexUtils.java | 2 +- .../unary/scalar/util/SpookyHashV2Utils.java | 2 +- .../scalar/util/TransformerDebugUtils.java | 6 +- .../dag/udf/UDFParametersFactory.java | 2 +- .../transformation/dag/udf/UDTFExecutor.java | 10 +- .../transformation/dag/util/BitwiseUtils.java | 2 +- .../dag/util/CastFunctionUtils.java | 6 +- .../dag/util/CommonTransformUtils.java | 6 +- .../dag/util/InputRowUtils.java | 2 +- .../transformation/datastructure/Cache.java | 2 +- .../datastructure/SerializableList.java | 4 +- .../iterator/ListForwardIterator.java | 2 +- .../iterator/RowListForwardIterator.java | 6 +- .../iterator/TVListForwardIterator.java | 6 +- .../row/ElasticSerializableRowList.java | 10 +- .../row/SerializableRowList.java | 10 +- .../tv/ElasticSerializableBinaryTVList.java | 8 +- .../tv/ElasticSerializableTVList.java | 6 +- .../datastructure/tv/SerializableTVList.java | 8 +- .../datastructure/util/BinaryUtils.java | 2 +- .../utils/HeapTraversal.java | 2 +- .../utils/IObjectFileService.java | 2 +- .../utils/IObjectFileServiceProvider.java | 2 +- .../utils/IObjectPath.java | 2 +- .../utils/ObjectTypeUtils.java | 2 +- .../utils/constant/SqlConstant.java | 2 +- .../utils/datastructure/MergeSortHeap.java | 2 +- .../utils/datastructure/MergeSortKey.java | 2 +- .../utils/datastructure/SortKey.java | 2 +- .../utils/sort/DiskSpiller.java | 4 +- .../utils/sort/FileSpillerReader.java | 4 +- .../utils/sort/MemoryReader.java | 4 +- .../utils/sort/SortBufferManager.java | 4 +- .../utils/sort/SortReader.java | 4 +- .../utils/sort/TableDiskSpiller.java | 4 +- .../utils/sort/TreeDiskSpiller.java | 2 +- .../request/read/ttl/ShowTTLPlan.java | 2 +- .../response/pipe/task/PipeTableResp.java | 2 +- .../confignode/manager/ProcedureManager.java | 2 +- .../PipeConfigTreePatternParseVisitor.java | 2 +- .../impl/region/AddRegionPeerProcedure.java | 2 +- .../region/ReconstructRegionProcedure.java | 2 +- .../impl/region/RegionMigrateProcedure.java | 2 +- .../region/RemoveRegionPeerProcedure.java | 2 +- iotdb-core/datanode/pom.xml | 2 +- .../apache/iotdb/db/conf/IoTDBDescriptor.java | 2 +- .../statemachine/BaseStateMachine.java | 4 +- .../dataregion/DataExecutionVisitor.java | 2 +- .../dataregion/DataRegionStateMachine.java | 2 +- .../IoTConsensusDataRegionStateMachine.java | 4 +- .../schemaregion/SchemaExecutionVisitor.java | 2 +- .../SchemaRegionStateMachine.java | 2 +- .../db/exception/BatchProcessException.java | 2 +- .../db/exception/query/OutOfTTLException.java | 2 +- .../agent/task/PipeDataNodeTaskAgent.java | 2 +- .../task/subtask/sink/PipeSinkSubtask.java | 2 +- .../deletion/PipeDeleteDataNodeEvent.java | 2 +- .../common/heartbeat/PipeHeartbeatEvent.java | 2 +- .../schema/PipeSchemaRegionSnapshotEvent.java | 2 +- .../PipeSchemaRegionWritePlanEvent.java | 4 +- .../aggregate/AggregateProcessor.java | 2 +- .../processor/TumblingWindowingProcessor.java | 4 +- .../TumblingTimeSamplingProcessor.java | 2 +- .../legacy/IoTDBLegacyPipeReceiverAgent.java | 2 +- .../legacy/loader/DeletionLoader.java | 2 +- .../protocol/legacy/loader/TsFileLoader.java | 2 +- .../thrift/IoTDBDataNodeReceiver.java | 10 +- .../transform/converter/ValueConverter.java | 2 +- .../PipeConvertedInsertRowStatement.java | 2 +- .../visitor/PipePlanToStatementVisitor.java | 6 +- ...PipeStatementTablePatternParseVisitor.java | 2 +- .../request/PipeTransferPlanNodeReq.java | 4 +- .../request/PipeTransferTabletBinaryReq.java | 2 +- .../request/IoTConsensusV2DeleteNodeReq.java | 2 +- .../IoTConsensusV2TabletBinaryReq.java | 2 +- .../IoTConsensusV2TabletInsertNodeReq.java | 2 +- .../protocol/opcua/server/OpcUaNameSpace.java | 4 +- .../protocol/writeback/WriteBackSink.java | 2 +- .../PipeTableModelTsFileBuilderV2.java | 2 +- .../builder/PipeTreeModelTsFileBuilderV2.java | 2 +- .../dataregion/IoTDBDataRegionSource.java | 2 +- ...icalDataRegionTsFileAndDeletionSource.java | 2 +- .../PipeRealtimeDataRegionSource.java | 2 +- .../schemaregion/IoTDBSchemaRegionSource.java | 10 +- .../PipePlanTablePatternParseVisitor.java | 2 +- .../PipePlanTablePrivilegeParseVisitor.java | 2 +- .../PipePlanTreePatternParseVisitor.java | 2 +- .../PipePlanTreePrivilegeParseVisitor.java | 2 +- .../PipeTableStatementToPlanVisitor.java | 6 +- .../PipeTreeStatementToPlanVisitor.java | 4 +- .../SchemaRegionListeningFilter.java | 4 +- .../SchemaRegionListeningQueue.java | 2 +- .../client/DataNodeInternalClient.java | 2 +- .../DataNodeTableFunctionAINodeService.java | 2 +- ...odeTableFunctionAINodeServiceProvider.java | 4 +- .../db/protocol/session/IClientSession.java | 4 +- .../session/PreparedStatementInfo.java | 2 +- .../db/protocol/session/SessionManager.java | 6 +- .../thrift/impl/ClientRPCServiceImpl.java | 46 +-- .../impl/DataNodeInternalRPCServiceImpl.java | 12 +- .../thrift/impl/NativeStatementRequest.java | 2 +- .../queryengine/common/MPPQueryContext.java | 14 +- .../iotdb/db/queryengine/common/QueryId.java | 2 +- .../queryengine/common/ResultNodeContext.java | 2 +- .../common/header/DatasetHeader.java | 4 +- .../aggregation/AccumulatorFactory.java | 16 +- .../execution/aggregation/AvgAccumulator.java | 2 +- .../aggregation/CountAccumulator.java | 2 +- .../aggregation/CountIfAccumulator.java | 2 +- .../aggregation/CountTimeAccumulator.java | 2 +- .../aggregation/ExtremeAccumulator.java | 2 +- .../aggregation/FirstValueAccumulator.java | 2 +- .../aggregation/LastValueAccumulator.java | 2 +- .../aggregation/MaxMinByBaseAccumulator.java | 2 +- .../aggregation/MaxTimeAccumulator.java | 2 +- .../aggregation/MaxValueAccumulator.java | 2 +- .../aggregation/MinTimeAccumulator.java | 2 +- .../aggregation/MinValueAccumulator.java | 2 +- .../execution/aggregation/SumAccumulator.java | 2 +- .../aggregation/TimeDurationAccumulator.java | 2 +- .../execution/aggregation/TreeAggregator.java | 10 +- .../aggregation/UDAFAccumulator.java | 6 +- .../EmptyQueueSlidingWindowAggregator.java | 4 +- ...MonotonicQueueSlidingWindowAggregator.java | 4 +- .../NormalQueueSlidingWindowAggregator.java | 4 +- .../SlidingWindowAggregator.java | 4 +- .../SlidingWindowAggregatorFactory.java | 4 +- .../SmoothQueueSlidingWindowAggregator.java | 4 +- .../timerangeiterator/AggrWindowIterator.java | 4 +- .../TableDateBinTimeRangeIterator.java | 2 +- .../TimeRangeIteratorFactory.java | 2 +- .../execution/driver/DataDriver.java | 6 +- .../execution/driver/DataDriverContext.java | 2 +- .../queryengine/execution/driver/Driver.java | 8 +- .../execution/driver/DriverContext.java | 2 +- .../execution/driver/SchemaDriver.java | 2 +- .../executor/RegionWriteExecutor.java | 2 +- .../FakedFragmentInstanceContext.java | 2 +- .../fragment/FragmentInstanceContext.java | 8 +- .../fragment/FragmentInstanceExecution.java | 2 +- .../fragment/FragmentInstanceManager.java | 4 +- .../INodeCommonFragmentInstanceContext.java | 2 +- .../execution/operator/AggregationUtil.java | 2 +- .../execution/operator/EmptyDataOperator.java | 4 +- .../operator/ExplainAnalyzeOperator.java | 10 +- .../execution/operator/OperatorContext.java | 10 +- .../process/AbstractIntoOperator.java | 4 +- .../process/AbstractTreeIntoOperator.java | 4 +- .../ActiveRegionScanMergeOperator.java | 6 +- .../operator/process/AggregationOperator.java | 6 +- .../process/ColumnInjectOperator.java | 6 +- .../process/DeviceViewIntoOperator.java | 6 +- .../operator/process/DeviceViewOperator.java | 6 +- .../InsertTabletStatementGenerator.java | 2 +- .../operator/process/ProjectOperator.java | 6 +- .../process/RawDataAggregationOperator.java | 4 +- .../process/SingleDeviceViewOperator.java | 6 +- .../SingleInputAggregationOperator.java | 4 +- .../SlidingWindowAggregationOperator.java | 4 +- .../TableInsertTabletStatementGenerator.java | 2 +- .../operator/process/TableIntoOperator.java | 8 +- .../process/TagAggregationOperator.java | 6 +- .../operator/process/TransformOperator.java | 14 +- .../operator/process/TreeFillOperator.java | 6 +- .../TreeInsertTabletStatementGenerator.java | 2 +- .../operator/process/TreeIntoOperator.java | 6 +- .../process/TreeLinearFillOperator.java | 6 +- .../process/TreeMergeSortOperator.java | 6 +- .../operator/process/TreeSortOperator.java | 8 +- .../operator/process/TreeTopKOperator.java | 6 +- .../process/ai/InferenceOperator.java | 6 +- .../process/copyto/CopyToOptions.java | 2 +- .../process/copyto/TableCopyToOperator.java | 6 +- .../copyto/tsfile/CopyToTsFileOptions.java | 8 +- .../join/FullOuterTimeJoinOperator.java | 6 +- .../join/HorizontallyConcatOperator.java | 6 +- .../process/join/InnerTimeJoinOperator.java | 8 +- .../join/LeftOuterTimeJoinOperator.java | 6 +- .../join/TableLeftOuterTimeJoinOperator.java | 4 +- .../join/merge/MergeSortComparatorUtils.java | 4 +- .../process/join/merge/MultiColumnMerger.java | 2 +- .../merge/NonOverlappedMultiColumnMerger.java | 2 +- .../join/merge/SingleColumnMerger.java | 2 +- .../last/AbstractUpdateLastCacheOperator.java | 4 +- .../last/AlignedUpdateLastCacheOperator.java | 4 +- ...lignedUpdateViewPathLastCacheOperator.java | 2 +- .../last/LastQueryCollectOperator.java | 6 +- .../process/last/LastQueryMergeOperator.java | 6 +- .../process/last/LastQueryOperator.java | 6 +- .../process/last/LastQuerySortOperator.java | 6 +- .../last/LastQueryTransformOperator.java | 6 +- .../operator/process/last/LastQueryUtil.java | 2 +- .../process/last/UpdateLastCacheOperator.java | 4 +- .../last/UpdateViewPathLastCacheOperator.java | 2 +- .../CountGroupByLevelMergeOperator.java | 6 +- .../schema/CountGroupByLevelScanOperator.java | 4 +- .../operator/schema/CountMergeOperator.java | 6 +- .../schema/NodeManageMemoryMergeOperator.java | 6 +- .../schema/NodePathsConvertOperator.java | 6 +- .../schema/NodePathsCountOperator.java | 6 +- .../operator/schema/SchemaCountOperator.java | 4 +- .../schema/SchemaFetchMergeOperator.java | 6 +- .../schema/SchemaFetchScanOperator.java | 4 +- .../schema/SchemaQueryMergeOperator.java | 6 +- .../SchemaQueryOrderByHeatOperator.java | 6 +- .../schema/SchemaQueryScanOperator.java | 4 +- .../schema/source/DeviceAttributeUpdater.java | 6 +- .../source/DeviceBlackListConstructor.java | 4 +- .../schema/source/DevicePredicateFilter.java | 4 +- .../schema/source/DevicePredicateHandler.java | 6 +- .../operator/schema/source/DeviceUpdater.java | 4 +- .../operator/sink/IdentitySinkOperator.java | 4 +- .../operator/sink/ShuffleHelperOperator.java | 4 +- .../execution/operator/sink/SinkOperator.java | 2 +- .../AbstractRegionScanDataSourceOperator.java | 2 +- ...AbstractSeriesAggregationScanOperator.java | 2 +- .../source/AbstractSourceOperator.java | 4 +- .../ActiveDeviceRegionScanOperator.java | 2 +- .../ActiveTimeSeriesRegionScanOperator.java | 2 +- .../AlignedSeriesAggregationScanOperator.java | 4 +- .../source/AlignedSeriesScanOperator.java | 4 +- .../operator/source/ExchangeOperator.java | 4 +- .../source/LastCacheScanOperator.java | 4 +- .../source/SeriesAggregationScanOperator.java | 4 +- .../operator/source/SeriesScanOperator.java | 4 +- .../source/ShowDiskUsageOperator.java | 4 +- .../operator/source/ShowQueriesOperator.java | 8 +- .../operator/source/SourceOperator.java | 4 +- .../AbstractAggTableScanOperator.java | 10 +- .../AbstractDefaultAggTableScanOperator.java | 4 +- .../relational/AbstractTableScanOperator.java | 10 +- .../source/relational/CteScanOperator.java | 6 +- .../DeviceIteratorScanOperator.java | 6 +- ...formationSchemaContentSupplierFactory.java | 18 +- .../InformationSchemaTableScanOperator.java | 4 +- .../LastQueryAggTableScanOperator.java | 16 +- .../MeasurementToTableViewAdaptorUtils.java | 4 +- ...gnedDeviceViewAggregationScanOperator.java | 8 +- .../TreeToTableViewAdaptorOperator.java | 8 +- .../execution/schedule/DriverScheduler.java | 4 +- .../execution/schedule/IDriverScheduler.java | 4 +- .../db/queryengine/plan/Coordinator.java | 34 +- .../db/queryengine/plan/analyze/Analysis.java | 2 +- .../plan/analyze/AnalyzeUtils.java | 18 +- .../plan/analyze/AnalyzeVisitor.java | 6 +- .../plan/analyze/ExpressionAnalyzer.java | 6 +- .../plan/analyze/ExpressionTypeAnalyzer.java | 4 +- .../plan/analyze/PredicateUtils.java | 10 +- .../analyze/TemplatedAggregationAnalyze.java | 4 +- .../plan/analyze/TemplatedInfo.java | 2 +- .../plan/analyze/TypeProvider.java | 6 +- .../plan/analyze/load/LoadTsFileAnalyzer.java | 6 +- .../load/LoadTsFileTableSchemaCache.java | 4 +- .../TreeSchemaAutoCreatorAndVerifier.java | 2 +- .../schema/ClusterSchemaFetchExecutor.java | 2 +- .../plan/analyze/schema/SchemaValidator.java | 2 +- .../plan/execution/IQueryExecution.java | 2 +- .../plan/execution/QueryExecution.java | 6 +- .../execution/config/ConfigExecution.java | 2 +- .../config/TableConfigTaskVisitor.java | 20 +- .../executor/ClusterConfigTaskExecutor.java | 8 +- .../config/executor/IConfigTaskExecutor.java | 4 +- .../config/metadata/GetTimeSlotListTask.java | 2 +- .../config/metadata/ShowFunctionsTask.java | 10 +- .../config/metadata/ShowRegionTask.java | 2 +- .../metadata/relational/DeleteDeviceTask.java | 2 +- .../execution/config/session/PrepareTask.java | 2 +- .../session/PreparedStatementHelper.java | 2 +- .../config/session/SetSqlDialectTask.java | 2 +- .../config/sys/pipe/ShowPipeTask.java | 2 +- .../memory/StatementMemorySourceVisitor.java | 2 +- ...ableModelStatementMemorySourceVisitor.java | 8 +- .../plan/expression/Expression.java | 6 +- .../plan/expression/ExpressionFactory.java | 2 +- .../expression/binary/BinaryExpression.java | 8 +- .../plan/expression/leaf/ConstantOperand.java | 2 +- .../plan/expression/leaf/LeafOperand.java | 4 +- .../plan/expression/leaf/NullOperand.java | 2 +- .../expression/leaf/TimeSeriesOperand.java | 4 +- .../expression/leaf/TimestampOperand.java | 2 +- .../expression/multi/FunctionExpression.java | 14 +- .../builtin/BuiltInScalarFunctionHelper.java | 2 +- .../builtin/helper/CastFunctionHelper.java | 6 +- .../builtin/helper/DiffFunctionHelper.java | 4 +- .../builtin/helper/ReplaceFunctionHelper.java | 8 +- .../builtin/helper/RoundFunctionHelper.java | 6 +- .../helper/SubStringFunctionHelper.java | 12 +- .../other/CaseWhenThenExpression.java | 8 +- .../other/GroupByTimeExpression.java | 6 +- .../expression/ternary/BetweenExpression.java | 2 +- .../expression/ternary/TernaryExpression.java | 6 +- .../plan/expression/unary/InExpression.java | 2 +- .../expression/unary/IsNullExpression.java | 2 +- .../plan/expression/unary/LikeExpression.java | 2 +- .../expression/unary/LogicNotExpression.java | 2 +- .../expression/unary/NegationExpression.java | 2 +- .../expression/unary/RegularExpression.java | 2 +- .../expression/unary/UnaryExpression.java | 6 +- .../visitor/ColumnTransformerVisitor.java | 66 ++-- .../CountTimeAggregationAmountVisitor.java | 2 +- .../visitor/IntermediateLayerVisitor.java | 6 +- .../visitor/ReconstructVisitor.java | 2 +- .../BindSchemaForExpressionVisitor.java | 4 +- .../BindSchemaForPredicateVisitor.java | 4 +- ...viceAndBindSchemaForExpressionVisitor.java | 4 +- ...oncatExpressionWithSuffixPathsVisitor.java | 2 +- .../ConvertPredicateToFilterVisitor.java | 2 +- .../ConvertPredicateToTimeFilterVisitor.java | 2 +- .../optimization/AggregationPushDown.java | 14 +- .../optimization/ColumnInjectionPushDown.java | 8 +- .../optimization/LimitOffsetPushDown.java | 10 +- ...rderByExpressionWithLimitChangeToTopK.java | 8 +- .../plan/optimization/PlanOptimizer.java | 2 +- .../plan/optimization/PredicatePushDown.java | 8 +- .../queryengine/plan/parser/ASTVisitor.java | 60 +-- .../plan/parser/StatementGenerator.java | 6 +- .../DataNodeTableOperatorGenerator.java | 70 ++-- .../planner/LocalExecutionPlanContext.java | 10 +- .../plan/planner/LocalExecutionPlanner.java | 10 +- .../plan/planner/LogicalPlanBuilder.java | 12 +- .../plan/planner/LogicalPlanVisitor.java | 2 +- .../plan/planner/LogicalPlanner.java | 2 +- .../plan/planner/OperatorGeneratorUtil.java | 2 +- .../plan/planner/OperatorTreeGenerator.java | 52 +-- .../plan/planner/PipelineDriverFactory.java | 2 +- .../plan/planner/SubPlanTypeExtractor.java | 2 +- .../plan/planner/TemplatedLogicalPlan.java | 4 +- .../planner/TemplatedLogicalPlanBuilder.java | 2 +- .../distribution/DistributionPlanner.java | 4 +- .../distribution/ExchangeNodeAdder.java | 6 +- .../distribution/NodeGroupContext.java | 6 +- .../SimpleFragmentParallelPlanner.java | 4 +- .../planner/distribution/SourceRewriter.java | 24 +- .../WriteFragmentParallelPlanner.java | 2 +- ...umeAllChildrenPipelineMemoryEstimator.java | 2 +- ...ildrenOneByOnePipelineMemoryEstimator.java | 2 +- .../memory/FakedMemoryReservationManager.java | 2 +- ...NotThreadSafeMemoryReservationManager.java | 2 +- .../memory/PipelineMemoryEstimator.java | 2 +- .../PipelineMemoryEstimatorFactory.java | 4 +- .../plan/AbstractFragmentParallelPlanner.java | 4 +- .../plan/planner/plan/FragmentInstance.java | 2 +- .../plan/planner/plan/LogicalQueryPlan.java | 2 +- .../plan/planner/plan/PlanFragment.java | 8 +- .../planner/plan/TableModelTimePredicate.java | 2 +- .../plan/planner/plan/TimePredicate.java | 2 +- .../planner/plan/node/BaseSourceRewriter.java | 2 +- .../node/DataNodePlanNodeDeserializer.java | 4 +- .../DataNodePlanNodeDeserializerProvider.java | 4 +- .../planner/plan/node/ExplainAnalyzeNode.java | 8 +- .../planner/plan/node/PlanGraphPrinter.java | 72 ++-- .../plan/planner/plan/node/PlanNodeUtil.java | 2 +- .../plan/planner/plan/node/PlanVisitor.java | 2 +- .../planner/plan/node/SimplePlanVisitor.java | 2 +- .../plan/planner/plan/node/WritePlanNode.java | 6 +- .../plan/node/load/LoadSingleTsFileNode.java | 4 +- .../plan/node/load/LoadTsFileNode.java | 4 +- .../plan/node/load/LoadTsFilePieceNode.java | 6 +- .../read/AbstractSchemaMergeNode.java | 6 +- .../metadata/read/CountSchemaMergeNode.java | 8 +- .../read/DeviceSchemaFetchScanNode.java | 8 +- .../node/metadata/read/DevicesCountNode.java | 6 +- .../metadata/read/DevicesSchemaScanNode.java | 6 +- .../read/LevelTimeSeriesCountNode.java | 6 +- .../read/LogicalViewSchemaScanNode.java | 6 +- .../read/NodeManagementMemoryMergeNode.java | 10 +- .../metadata/read/NodePathsConvertNode.java | 10 +- .../metadata/read/NodePathsCountNode.java | 10 +- .../read/NodePathsSchemaScanNode.java | 6 +- .../read/PathsUsingTemplateScanNode.java | 6 +- .../metadata/read/SchemaFetchMergeNode.java | 8 +- .../metadata/read/SchemaFetchScanNode.java | 6 +- .../metadata/read/SchemaQueryMergeNode.java | 8 +- .../read/SchemaQueryOrderByHeatNode.java | 10 +- .../metadata/read/SchemaQueryScanNode.java | 8 +- .../read/SeriesSchemaFetchScanNode.java | 8 +- .../metadata/read/TableDeviceSourceNode.java | 8 +- .../metadata/read/TimeSeriesCountNode.java | 6 +- .../read/TimeSeriesSchemaScanNode.java | 6 +- .../metadata/write/ActivateTemplateNode.java | 8 +- .../write/AlterEncodingCompressorNode.java | 8 +- .../metadata/write/AlterTimeSeriesNode.java | 8 +- .../write/BatchActivateTemplateNode.java | 8 +- .../write/ConstructSchemaBlackListNode.java | 8 +- .../write/CreateAlignedTimeSeriesNode.java | 8 +- .../write/CreateMultiTimeSeriesNode.java | 8 +- .../metadata/write/CreateTimeSeriesNode.java | 8 +- .../write/DeactivateTemplateNode.java | 8 +- .../metadata/write/DeleteTimeSeriesNode.java | 8 +- .../InternalBatchActivateTemplateNode.java | 8 +- .../InternalCreateMultiTimeSeriesNode.java | 8 +- .../write/InternalCreateTimeSeriesNode.java | 8 +- .../write/PreDeactivateTemplateNode.java | 8 +- .../RollbackPreDeactivateTemplateNode.java | 8 +- .../write/RollbackSchemaBlackListNode.java | 8 +- .../write/view/AlterLogicalViewNode.java | 8 +- .../ConstructLogicalViewBlackListNode.java | 8 +- .../write/view/CreateLogicalViewNode.java | 8 +- .../write/view/DeleteLogicalViewNode.java | 8 +- .../RollbackLogicalViewBlackListNode.java | 8 +- .../node/pipe/PipeEnrichedDeleteDataNode.java | 8 +- .../node/pipe/PipeEnrichedInsertNode.java | 8 +- .../pipe/PipeEnrichedNonWritePlanNode.java | 8 +- .../node/pipe/PipeEnrichedWritePlanNode.java | 8 +- .../node/pipe/PipeOperateSchemaQueueNode.java | 8 +- .../plan/node/process/AI/InferenceNode.java | 10 +- .../process/ActiveRegionScanMergeNode.java | 10 +- .../process/AggregationMergeSortNode.java | 10 +- .../plan/node/process/AggregationNode.java | 10 +- .../plan/node/process/CollectNode.java | 10 +- .../plan/node/process/ColumnInjectNode.java | 10 +- .../plan/node/process/DeviceMergeNode.java | 10 +- .../plan/node/process/DeviceViewIntoNode.java | 10 +- .../plan/node/process/DeviceViewNode.java | 10 +- .../plan/node/process/ExchangeNode.java | 12 +- .../planner/plan/node/process/FillNode.java | 10 +- .../planner/plan/node/process/FilterNode.java | 8 +- .../plan/node/process/GroupByLevelNode.java | 10 +- .../plan/node/process/GroupByTagNode.java | 10 +- .../node/process/HorizontallyConcatNode.java | 10 +- .../planner/plan/node/process/IntoNode.java | 10 +- .../planner/plan/node/process/LimitNode.java | 10 +- .../plan/node/process/MergeSortNode.java | 10 +- .../planner/plan/node/process/OffsetNode.java | 10 +- .../plan/node/process/ProjectNode.java | 10 +- .../node/process/RawDataAggregationNode.java | 10 +- .../node/process/SingleDeviceViewNode.java | 10 +- .../process/SlidingWindowAggregationNode.java | 10 +- .../planner/plan/node/process/SortNode.java | 10 +- .../planner/plan/node/process/TopKNode.java | 10 +- .../plan/node/process/TransformNode.java | 10 +- .../process/join/FullOuterTimeJoinNode.java | 10 +- .../node/process/join/InnerTimeJoinNode.java | 10 +- .../process/join/LeftOuterTimeJoinNode.java | 10 +- .../process/last/LastQueryCollectNode.java | 10 +- .../node/process/last/LastQueryMergeNode.java | 10 +- .../plan/node/process/last/LastQueryNode.java | 12 +- .../process/last/LastQueryTransformNode.java | 10 +- .../plan/node/sink/IdentitySinkNode.java | 8 +- .../plan/node/sink/MultiChildrenSinkNode.java | 4 +- .../plan/node/sink/ShuffleSinkNode.java | 8 +- .../plan/planner/plan/node/sink/SinkNode.java | 4 +- .../AlignedSeriesAggregationScanNode.java | 10 +- .../node/source/AlignedSeriesScanNode.java | 10 +- .../node/source/DeviceRegionScanNode.java | 8 +- .../plan/node/source/LastQueryScanNode.java | 10 +- .../node/source/LastSeriesSourceNode.java | 2 +- .../plan/node/source/RegionScanNode.java | 6 +- .../source/SeriesAggregationScanNode.java | 10 +- .../source/SeriesAggregationSourceNode.java | 4 +- .../plan/node/source/SeriesScanNode.java | 10 +- .../node/source/SeriesScanSourceNode.java | 6 +- .../plan/node/source/SeriesSourceNode.java | 4 +- .../plan/node/source/ShowDiskUsageNode.java | 8 +- .../plan/node/source/ShowQueriesNode.java | 8 +- .../node/source/TimeseriesRegionScanNode.java | 8 +- .../plan/node/source/VirtualSourceNode.java | 4 +- .../node/write/AbstractDeleteDataNode.java | 4 +- ...ontinuousSameSearchIndexSeparatorNode.java | 6 +- .../plan/node/write/DeleteDataNode.java | 8 +- .../node/write/InsertMultiTabletsNode.java | 8 +- .../planner/plan/node/write/InsertNode.java | 4 +- .../plan/node/write/InsertRowNode.java | 8 +- .../plan/node/write/InsertRowsNode.java | 8 +- .../node/write/InsertRowsOfOneDeviceNode.java | 8 +- .../plan/node/write/InsertTabletNode.java | 10 +- .../planner/plan/node/write/ObjectNode.java | 10 +- .../node/write/RelationalDeleteDataNode.java | 8 +- .../node/write/RelationalInsertRowNode.java | 6 +- .../node/write/RelationalInsertRowsNode.java | 6 +- .../write/RelationalInsertTabletNode.java | 6 +- .../planner/plan/node/write/SearchNode.java | 2 +- .../plan/parameter/AggregationDescriptor.java | 6 +- .../CrossSeriesAggregationDescriptor.java | 2 +- .../plan/parameter/FillDescriptor.java | 2 +- .../plan/parameter/GroupByTimeParameter.java | 2 +- .../planner/plan/parameter/OutputColumn.java | 2 +- .../analyzer/AggregationAnalyzer.java | 68 ++-- .../plan/relational/analyzer/Analysis.java | 72 ++-- .../plan/relational/analyzer/Analyzer.java | 10 +- .../analyzer/CanonicalizationAware.java | 4 +- .../analyzer/ExpressionAnalysis.java | 14 +- .../analyzer/ExpressionAnalyzer.java | 164 ++++---- .../analyzer/ExpressionTreeUtils.java | 14 +- .../plan/relational/analyzer/Field.java | 2 +- .../analyzer/PatternRecognitionAnalysis.java | 10 +- .../analyzer/PatternRecognitionAnalyzer.java | 30 +- .../plan/relational/analyzer/RelationId.java | 4 +- .../relational/analyzer/RelationType.java | 2 +- .../plan/relational/analyzer/Scope.java | 12 +- .../analyzer/ScopeReferenceExtractor.java | 6 +- .../analyzer/StatementAnalyzer.java | 204 +++++----- .../analyzer/StatementAnalyzerFactory.java | 4 +- .../ConvertPredicateToFilterVisitor.java | 60 +-- .../ConvertPredicateToTimeFilterVisitor.java | 34 +- .../PredicateCombineIntoTableScanChecker.java | 34 +- .../PredicatePushIntoMetadataChecker.java | 68 ++-- .../PredicatePushIntoScanChecker.java | 30 +- .../analyzer/predicate/PredicateVisitor.java | 26 +- .../schema/CheckSchemaPredicateVisitor.java | 16 +- ...ConvertSchemaPredicateToFilterVisitor.java | 36 +- .../ExtractPredicateColumnNameVisitor.java | 30 +- .../tablefunction/TableArgumentAnalysis.java | 8 +- .../plan/relational/metadata/Metadata.java | 16 +- .../relational/metadata/MetadataUtil.java | 6 +- .../metadata/OperatorNotFoundException.java | 4 +- .../relational/metadata/TableMetadata.java | 4 +- .../metadata/TableMetadataImpl.java | 36 +- .../metadata/TreeDeviceViewSchema.java | 4 +- .../metadata/fetcher/SchemaPredicateUtil.java | 8 +- .../fetcher/TableDeviceSchemaFetcher.java | 2 +- .../fetcher/TableHeaderSchemaValidator.java | 10 +- .../relational/planner/CteMaterializer.java | 16 +- .../relational/planner/EqualityInference.java | 8 +- .../planner/ExpressionExtractor.java | 14 +- .../planner/ExpressionSymbolInliner.java | 6 +- .../planner/IrExpressionInterpreter.java | 66 ++-- .../relational/planner/IrTypeAnalyzer.java | 78 ++-- .../relational/planner/LiteralEncoder.java | 28 +- .../planner/LiteralInterpreter.java | 22 +- .../planner/NoOpSymbolResolver.java | 2 +- .../relational/planner/NodeAndMappings.java | 4 +- .../planner/OrderingTranslator.java | 4 +- .../plan/relational/planner/PlanBuilder.java | 12 +- .../relational/planner/PlanNodeSearcher.java | 2 +- .../relational/planner/PlannerContext.java | 2 +- .../relational/planner/PredicateUtils.java | 22 +- .../plan/relational/planner/QueryPlanner.java | 104 ++--- .../plan/relational/planner/RelationPlan.java | 4 +- .../relational/planner/RelationPlanner.java | 150 +++---- .../plan/relational/planner/ScopeAware.java | 6 +- .../planner/SimplePlanRewriter.java | 2 +- .../relational/planner/SubqueryPlanner.java | 48 +-- .../relational/planner/SymbolAllocator.java | 10 +- .../relational/planner/SymbolResolver.java | 2 +- .../relational/planner/SymbolsExtractor.java | 22 +- .../planner/TableLogicalPlanner.java | 36 +- .../relational/planner/TableModelPlanner.java | 10 +- .../relational/planner/TranslationMap.java | 28 +- .../planner/distribute/AddExchangeNodes.java | 6 +- .../planner/distribute/SubPlanGenerator.java | 4 +- .../TableDistributedPlanGenerator.java | 94 ++--- .../distribute/TableDistributedPlanner.java | 8 +- .../TableModelQueryFragmentPlanner.java | 6 +- .../TableModelTypeProviderExtractor.java | 36 +- .../planner/ir/DefaultTraversalVisitor.java | 32 +- .../planner/ir/DeterminismEvaluator.java | 4 +- .../planner/ir/ExpressionNodeInliner.java | 2 +- .../planner/ir/ExpressionRewriter.java | 70 ++-- .../planner/ir/ExpressionTreeRewriter.java | 78 ++-- ...actCommonPredicatesExpressionRewriter.java | 6 +- .../GapFillStartAndEndTimeExtractVisitor.java | 30 +- .../plan/relational/planner/ir/IrUtils.java | 24 +- .../ir/NormalizeOrExpressionRewriter.java | 14 +- ...correlatedScalarSubqueryReconstructor.java | 36 +- .../planner/ir/ReplaceSymbolInExpression.java | 8 +- .../planner/ir/SubExpressionExtractor.java | 4 +- .../planner/iterative/IterativeOptimizer.java | 16 +- .../relational/planner/iterative/Lookup.java | 4 +- .../relational/planner/iterative/Memo.java | 4 +- .../relational/planner/iterative/Plans.java | 4 +- .../relational/planner/iterative/Rule.java | 8 +- .../planner/iterative/RuleIndex.java | 4 +- .../rule/AggregationDecorrelation.java | 6 +- .../rule/CanonicalizeExpressionRewriter.java | 28 +- .../EliminateLimitProjectWithTableScan.java | 12 +- .../rule/EliminateLimitWithTableScan.java | 10 +- .../rule/EvaluateEmptyIntersect.java | 12 +- .../rule/ExpressionRewriteRuleSet.java | 22 +- .../iterative/rule/GatherAndMergeWindows.java | 24 +- .../iterative/rule/ImplementExceptAll.java | 26 +- .../rule/ImplementExceptDistinctAsUnion.java | 20 +- .../iterative/rule/ImplementIntersectAll.java | 20 +- .../ImplementIntersectDistinctAsUnion.java | 20 +- .../rule/ImplementPatternRecognition.java | 16 +- .../rule/ImplementTableFunctionSource.java | 20 +- .../iterative/rule/InlineProjections.java | 22 +- .../planner/iterative/rule/MergeExcept.java | 8 +- .../planner/iterative/rule/MergeFilters.java | 10 +- .../iterative/rule/MergeIntersect.java | 8 +- .../MergeLimitOverProjectWithMergeSort.java | 18 +- .../rule/MergeLimitOverProjectWithSort.java | 18 +- .../rule/MergeLimitWithMergeSort.java | 16 +- .../iterative/rule/MergeLimitWithSort.java | 16 +- .../planner/iterative/rule/MergeLimits.java | 10 +- .../planner/iterative/rule/MergeUnion.java | 8 +- ...ipleDistinctAggregationToMarkDistinct.java | 12 +- .../iterative/rule/OptimizeRowPattern.java | 12 +- .../rule/ProjectOffPushDownRule.java | 14 +- .../rule/PruneAggregationColumns.java | 6 +- .../rule/PruneAggregationSourceColumns.java | 8 +- .../iterative/rule/PruneApplyColumns.java | 6 +- .../iterative/rule/PruneApplyCorrelation.java | 8 +- .../rule/PruneApplySourceColumns.java | 10 +- .../rule/PruneAssignUniqueIdColumns.java | 6 +- .../iterative/rule/PruneCopyToColumns.java | 4 +- .../rule/PruneCorrelatedJoinColumns.java | 10 +- .../rule/PruneCorrelatedJoinCorrelation.java | 8 +- .../rule/PruneDistinctAggregation.java | 14 +- .../rule/PruneEnforceSingleRowColumns.java | 6 +- .../rule/PruneExceptSourceColumns.java | 8 +- .../rule/PruneExplainAnalyzeColumns.java | 4 +- .../iterative/rule/PruneFillColumns.java | 6 +- .../iterative/rule/PruneFilterColumns.java | 6 +- .../iterative/rule/PruneGapFillColumns.java | 6 +- .../rule/PruneIntersectSourceColumns.java | 8 +- .../rule/PruneJoinChildrenColumns.java | 8 +- .../iterative/rule/PruneJoinColumns.java | 6 +- .../iterative/rule/PruneLimitColumns.java | 6 +- .../rule/PruneMarkDistinctColumns.java | 6 +- .../iterative/rule/PruneOffsetColumns.java | 6 +- .../rule/PruneOutputSourceColumns.java | 6 +- .../PrunePatternRecognitionSourceColumns.java | 14 +- .../iterative/rule/PruneProjectColumns.java | 6 +- .../iterative/rule/PruneSortColumns.java | 6 +- .../PruneTableFunctionProcessorColumns.java | 8 +- ...neTableFunctionProcessorSourceColumns.java | 10 +- .../iterative/rule/PruneTableScanColumns.java | 6 +- .../iterative/rule/PruneTopKColumns.java | 6 +- .../iterative/rule/PruneUnionColumns.java | 6 +- .../rule/PruneUnionSourceColumns.java | 8 +- .../iterative/rule/PruneWindowColumns.java | 6 +- .../rule/PushDownFilterIntoWindow.java | 26 +- .../rule/PushDownLimitIntoWindow.java | 18 +- .../PushDownNegationsExpressionRewriter.java | 20 +- .../rule/PushDownOffsetIntoTableScan.java | 10 +- .../rule/PushLimitThroughOffset.java | 12 +- .../rule/PushLimitThroughProject.java | 14 +- .../iterative/rule/PushLimitThroughUnion.java | 14 +- .../rule/PushProjectionThroughUnion.java | 22 +- .../iterative/rule/PushTopKThroughUnion.java | 16 +- .../rule/RemoveDuplicateConditions.java | 4 +- .../rule/RemoveEmptyExceptBranches.java | 18 +- .../rule/RemoveEmptyUnionBranches.java | 14 +- .../RemoveRedundantEnforceSingleRowNode.java | 6 +- .../iterative/rule/RemoveRedundantExists.java | 18 +- .../RemoveRedundantIdentityProjections.java | 6 +- .../iterative/rule/RemoveRedundantWindow.java | 8 +- .../iterative/rule/RemoveTrivialFilters.java | 12 +- .../RemoveUnreferencedScalarApplyNodes.java | 6 +- .../RemoveUnreferencedScalarSubqueries.java | 14 +- .../rule/ReplaceWindowWithRowNumber.java | 10 +- .../iterative/rule/SetOperationMerge.java | 12 +- .../rule/SetOperationNodeTranslator.java | 54 +-- .../rule/SimplifyCountOverConstant.java | 32 +- .../iterative/rule/SimplifyExpressions.java | 8 +- .../SingleDistinctAggregationToGroupBy.java | 14 +- ...atedDistinctAggregationWithProjection.java | 32 +- ...dDistinctAggregationWithoutProjection.java | 28 +- ...elatedGlobalAggregationWithProjection.java | 38 +- ...tedGlobalAggregationWithoutProjection.java | 38 +- ...latedGroupedAggregationWithProjection.java | 32 +- ...edGroupedAggregationWithoutProjection.java | 28 +- .../rule/TransformCorrelatedJoinToJoin.java | 20 +- .../TransformCorrelatedScalarSubquery.java | 46 +-- .../TransformExistsApplyToCorrelatedJoin.java | 46 +-- ...TransformFilteringSemiJoinToInnerJoin.java | 32 +- ...rrelatedInPredicateSubqueryToSemiJoin.java | 12 +- .../TransformUncorrelatedSubqueryToJoin.java | 28 +- .../planner/iterative/rule/Util.java | 20 +- .../node/AggregationTableScanNode.java | 28 +- .../AggregationTreeDeviceViewScanNode.java | 16 +- ...gnedAggregationTreeDeviceViewScanNode.java | 16 +- .../planner/node/ChildReplacer.java | 2 +- .../relational/planner/node/CopyToNode.java | 10 +- .../relational/planner/node/CteScanNode.java | 14 +- .../planner/node/DeviceTableScanNode.java | 12 +- .../relational/planner/node/ExchangeNode.java | 12 +- .../planner/node/ExplainAnalyzeNode.java | 10 +- .../node/InformationSchemaTableScanNode.java | 14 +- .../relational/planner/node/IntoNode.java | 14 +- ...gnedAggregationTreeDeviceViewScanNode.java | 16 +- .../relational/planner/node/Patterns.java | 74 ++-- ...skUsageInformationSchemaTableScanNode.java | 12 +- .../planner/node/TableScanNode.java | 16 +- .../node/TreeAlignedDeviceViewScanNode.java | 12 +- .../planner/node/TreeDeviceViewScanNode.java | 10 +- .../TreeNonAlignedDeviceViewScanNode.java | 12 +- .../schema/AbstractTableDeviceQueryNode.java | 6 +- .../AbstractTableDevicesDeletionNode.java | 4 +- ...leSchemaQueryAttributeSecurityVisitor.java | 2 +- .../ConstructTableDevicesBlackListNode.java | 8 +- .../schema/CreateOrUpdateTableDeviceNode.java | 8 +- .../node/schema/DeleteTableDeviceNode.java | 8 +- .../DeleteTableDevicesInBlackListNode.java | 8 +- .../RollbackTableDevicesBlackListNode.java | 8 +- .../schema/TableAttributeColumnDropNode.java | 8 +- .../TableDeviceAttributeCommitUpdateNode.java | 8 +- .../TableDeviceAttributeUpdateNode.java | 14 +- .../node/schema/TableDeviceFetchNode.java | 8 +- .../schema/TableDeviceQueryCountNode.java | 10 +- .../node/schema/TableDeviceQueryScanNode.java | 10 +- .../node/schema/TableNodeLocationAddNode.java | 8 +- .../schema/TableSchemaQueryWriteVisitor.java | 2 +- .../optimizations/AdaptivePlanOptimizer.java | 4 +- .../CheckSubqueryNodesAreRewritten.java | 8 +- .../planner/optimizations/JoinUtils.java | 10 +- .../optimizations/ParallelizeGrouping.java | 30 +- .../optimizations/PlanNodeDecorrelator.java | 36 +- .../planner/optimizations/PlanOptimizer.java | 4 +- .../PushAggregationIntoTableScan.java | 16 +- .../PushLimitOffsetIntoTableScan.java | 36 +- .../PushPredicateIntoTableScan.java | 68 ++-- .../optimizations/QueryCardinalityUtil.java | 18 +- .../optimizations/SortElimination.java | 20 +- .../planner/optimizations/SymbolMapper.java | 50 +-- .../TransformAggregationToStreamable.java | 26 +- ...tifiedComparisonApplyToCorrelatedJoin.java | 60 +-- .../TransformSortToStreamSort.java | 18 +- .../UnaliasSymbolReferences.java | 78 ++-- .../planner/optimizations/Util.java | 22 +- .../rowpattern/RowPatternToIrRewriter.java | 58 +-- .../relational/sql/ParameterExtractor.java | 12 +- .../sql/ast/AbstractQueryDeviceWithCache.java | 8 +- .../sql/ast/AbstractTraverseDevice.java | 16 +- .../plan/relational/sql/ast/AddColumn.java | 12 +- .../sql/ast/AlterColumnDataType.java | 16 +- .../plan/relational/sql/ast/AlterDB.java | 4 +- .../plan/relational/sql/ast/AlterPipe.java | 4 +- .../plan/relational/sql/ast/AsofJoinOn.java | 20 +- .../plan/relational/sql/ast/AstVisitor.java | 2 +- .../plan/relational/sql/ast/ClearCache.java | 8 +- .../relational/sql/ast/ColumnDefinition.java | 14 +- .../plan/relational/sql/ast/CopyTo.java | 10 +- .../plan/relational/sql/ast/CountDevice.java | 8 +- .../relational/sql/ast/CountStatement.java | 12 +- .../plan/relational/sql/ast/CreateDB.java | 4 +- .../sql/ast/CreateExternalService.java | 10 +- .../relational/sql/ast/CreateFunction.java | 10 +- .../plan/relational/sql/ast/CreateIndex.java | 14 +- .../plan/relational/sql/ast/CreateModel.java | 8 +- .../sql/ast/CreateOrUpdateDevice.java | 8 +- .../plan/relational/sql/ast/CreatePipe.java | 4 +- .../relational/sql/ast/CreatePipePlugin.java | 4 +- .../plan/relational/sql/ast/CreateTable.java | 12 +- .../plan/relational/sql/ast/CreateTopic.java | 4 +- .../relational/sql/ast/CreateTraining.java | 8 +- .../plan/relational/sql/ast/CreateView.java | 8 +- .../relational/sql/ast/DatabaseStatement.java | 8 +- .../plan/relational/sql/ast/Deallocate.java | 12 +- .../DefaultExpressionTraversalVisitor.java | 2 +- .../sql/ast/DefaultTraversalVisitor.java | 118 +++--- .../plan/relational/sql/ast/Delete.java | 14 +- .../plan/relational/sql/ast/DeleteDevice.java | 20 +- .../relational/sql/ast/DescribeTable.java | 12 +- .../plan/relational/sql/ast/DropColumn.java | 14 +- .../plan/relational/sql/ast/DropDB.java | 12 +- .../sql/ast/DropExternalService.java | 10 +- .../plan/relational/sql/ast/DropFunction.java | 10 +- .../plan/relational/sql/ast/DropIndex.java | 14 +- .../plan/relational/sql/ast/DropModel.java | 8 +- .../plan/relational/sql/ast/DropPipe.java | 4 +- .../relational/sql/ast/DropPipePlugin.java | 4 +- .../relational/sql/ast/DropSubscription.java | 4 +- .../plan/relational/sql/ast/DropTable.java | 12 +- .../plan/relational/sql/ast/DropTopic.java | 4 +- .../plan/relational/sql/ast/Execute.java | 14 +- .../relational/sql/ast/ExecuteImmediate.java | 14 +- .../plan/relational/sql/ast/Explain.java | 10 +- .../relational/sql/ast/ExplainAnalyze.java | 10 +- .../plan/relational/sql/ast/ExtendRegion.java | 8 +- .../plan/relational/sql/ast/FetchDevice.java | 8 +- .../plan/relational/sql/ast/Flush.java | 2 +- .../plan/relational/sql/ast/Insert.java | 16 +- .../plan/relational/sql/ast/InsertRow.java | 4 +- .../plan/relational/sql/ast/InsertRows.java | 4 +- .../plan/relational/sql/ast/InsertTablet.java | 4 +- .../plan/relational/sql/ast/KillQuery.java | 10 +- .../relational/sql/ast/LoadConfiguration.java | 2 +- .../plan/relational/sql/ast/LoadModel.java | 8 +- .../plan/relational/sql/ast/LoadTsFile.java | 10 +- .../relational/sql/ast/MigrateRegion.java | 10 +- .../plan/relational/sql/ast/PipeEnriched.java | 8 +- .../relational/sql/ast/PipeStatement.java | 4 +- .../plan/relational/sql/ast/Prepare.java | 12 +- .../plan/relational/sql/ast/Property.java | 12 +- .../relational/sql/ast/ReconstructRegion.java | 8 +- .../sql/ast/RelationalAuthorStatement.java | 8 +- .../plan/relational/sql/ast/RemoveAINode.java | 8 +- .../relational/sql/ast/RemoveConfigNode.java | 8 +- .../relational/sql/ast/RemoveDataNode.java | 8 +- .../plan/relational/sql/ast/RemoveRegion.java | 8 +- .../plan/relational/sql/ast/RenameColumn.java | 14 +- .../plan/relational/sql/ast/RenameTable.java | 14 +- .../relational/sql/ast/SetColumnComment.java | 14 +- .../relational/sql/ast/SetConfiguration.java | 2 +- .../relational/sql/ast/SetProperties.java | 12 +- .../relational/sql/ast/SetSqlDialect.java | 12 +- .../relational/sql/ast/SetSystemStatus.java | 2 +- .../relational/sql/ast/SetTableComment.java | 12 +- .../relational/sql/ast/ShowAIDevices.java | 8 +- .../plan/relational/sql/ast/ShowAINodes.java | 10 +- .../relational/sql/ast/ShowAvailableUrls.java | 8 +- .../plan/relational/sql/ast/ShowCluster.java | 10 +- .../relational/sql/ast/ShowClusterId.java | 10 +- .../relational/sql/ast/ShowConfigNodes.java | 10 +- .../relational/sql/ast/ShowConfiguration.java | 2 +- .../sql/ast/ShowCurrentDatabase.java | 10 +- .../sql/ast/ShowCurrentSqlDialect.java | 10 +- .../sql/ast/ShowCurrentTimestamp.java | 10 +- .../relational/sql/ast/ShowCurrentUser.java | 10 +- .../plan/relational/sql/ast/ShowDB.java | 10 +- .../relational/sql/ast/ShowDataNodes.java | 10 +- .../plan/relational/sql/ast/ShowDevice.java | 14 +- .../sql/ast/ShowExternalService.java | 12 +- .../relational/sql/ast/ShowFunctions.java | 10 +- .../plan/relational/sql/ast/ShowIndex.java | 12 +- .../relational/sql/ast/ShowLoadedModels.java | 8 +- .../plan/relational/sql/ast/ShowModels.java | 8 +- .../relational/sql/ast/ShowPipePlugins.java | 4 +- .../plan/relational/sql/ast/ShowPipes.java | 4 +- .../sql/ast/ShowQueriesStatement.java | 12 +- .../plan/relational/sql/ast/ShowRegions.java | 8 +- .../relational/sql/ast/ShowStatement.java | 16 +- .../relational/sql/ast/ShowSubscriptions.java | 4 +- .../plan/relational/sql/ast/ShowTables.java | 12 +- .../plan/relational/sql/ast/ShowTopics.java | 4 +- .../relational/sql/ast/ShowVariables.java | 10 +- .../plan/relational/sql/ast/ShowVersion.java | 10 +- .../sql/ast/StackableAstVisitor.java | 2 +- .../sql/ast/StartExternalService.java | 10 +- .../plan/relational/sql/ast/StartPipe.java | 4 +- .../relational/sql/ast/StartRepairData.java | 2 +- .../sql/ast/StopExternalService.java | 10 +- .../plan/relational/sql/ast/StopPipe.java | 4 +- .../relational/sql/ast/StopRepairData.java | 2 +- .../sql/ast/SubscriptionStatement.java | 4 +- .../plan/relational/sql/ast/TimeRange.java | 6 +- .../plan/relational/sql/ast/UnloadModel.java | 8 +- .../plan/relational/sql/ast/Update.java | 12 +- .../relational/sql/ast/UpdateAssignment.java | 10 +- .../plan/relational/sql/ast/Use.java | 12 +- .../sql/ast/ViewFieldDefinition.java | 10 +- .../sql/ast/WrappedInsertStatement.java | 6 +- .../relational/sql/ast/WrappedStatement.java | 4 +- .../relational/sql/parser/AstBuilder.java | 272 ++++++------- .../relational/sql/parser/ErrorHandler.java | 2 +- .../plan/relational/sql/parser/SqlParser.java | 14 +- .../relational/sql/rewrite/ShowRewrite.java | 26 +- .../sql/rewrite/StatementRewrite.java | 10 +- .../plan/relational/sql/util/AstUtil.java | 14 +- .../sql/util/DataNodeSqlFormatter.java | 12 +- .../plan/relational/sql/util/QueryUtil.java | 56 +-- .../plan/relational/type/TypeCoercion.java | 2 +- .../plan/relational/utils/NodeUtils.java | 4 +- .../plan/scheduler/ClusterScheduler.java | 4 +- .../FragmentInstanceDispatcherImpl.java | 6 +- .../load/LoadTsFileDispatcherImpl.java | 4 +- .../queryengine/plan/statement/Statement.java | 2 +- .../statement/component/FillComponent.java | 2 +- .../statement/crud/InsertBaseStatement.java | 8 +- .../statement/crud/InsertRowStatement.java | 6 +- .../crud/InsertRowsOfOneDeviceStatement.java | 2 +- .../statement/crud/InsertRowsStatement.java | 4 +- .../statement/crud/InsertTabletStatement.java | 6 +- .../statement/crud/LoadTsFileStatement.java | 2 +- .../plan/statement/crud/QueryStatement.java | 2 +- .../statement/pipe/PipeEnrichedStatement.java | 2 +- .../statement/sys/SetSqlDialectStatement.java | 2 +- .../db/queryengine/plan/udf/TreeUDFUtils.java | 2 +- .../FragmentInstanceStatisticsDrawer.java | 2 +- .../api/LayerRowWindowReader.java | 2 +- ...eRowRecordListBackedMultiColumnWindow.java | 2 +- ...rdListBackedMultiColumnWindowIterator.java | 2 +- ...rializableTVListBackedSingleColumnRow.java | 2 +- ...lizableTVListBackedSingleColumnWindow.java | 2 +- ...VListBackedSingleColumnWindowIterator.java | 2 +- .../dag/builder/EvaluationDAGBuilder.java | 4 +- .../dag/input/ConstantInputReader.java | 2 +- .../dag/input/QueryDataSetInputLayer.java | 6 +- .../dag/input/TsBlockInputDataSet.java | 2 +- .../ConstantIntermediateLayer.java | 2 +- .../dag/intermediate/IntermediateLayer.java | 2 +- .../dag/intermediate/MultiInputLayer.java | 6 +- .../SingleInputMultiReferenceLayer.java | 4 +- .../SingleInputSingleReferenceLayer.java | 4 +- .../transformation/dag/memory/SafetyLine.java | 2 +- .../binary/ArithmeticBinaryTransformer.java | 2 +- .../transformer/binary/BinaryTransformer.java | 2 +- .../binary/CompareBinaryTransformer.java | 2 +- .../binary/CompareEqualToTransformer.java | 2 +- .../CompareGreaterEqualTransformer.java | 2 +- .../binary/CompareGreaterThanTransformer.java | 2 +- .../binary/CompareLessEqualTransformer.java | 2 +- .../binary/CompareLessThanTransformer.java | 2 +- .../binary/CompareNonEqualTransformer.java | 2 +- .../multi/MappableUDFQueryRowTransformer.java | 2 +- .../multi/UDFQueryRowTransformer.java | 2 +- .../multi/UDFQueryRowWindowTransformer.java | 2 +- .../multi/UDFQueryTransformer.java | 2 +- .../multi/UniversalUDFQueryTransformer.java | 6 +- .../ternary/BetweenTransformer.java | 2 +- .../ternary/CompareTernaryTransformer.java | 2 +- .../ternary/TernaryTransformer.java | 2 +- .../unary/ArithmeticNegationTransformer.java | 2 +- .../dag/transformer/unary/InTransformer.java | 2 +- .../transformer/unary/IsNullTransformer.java | 2 +- .../transformer/unary/LikeTransformer.java | 2 +- .../unary/LogicNotTransformer.java | 2 +- .../transformer/unary/RegularTransformer.java | 2 +- .../unary/TransparentTransformer.java | 2 +- .../transformer/unary/UnaryTransformer.java | 2 +- .../unary/scalar/CastFunctionTransformer.java | 4 +- .../unary/scalar/DiffFunctionTransformer.java | 2 +- .../scalar/RoundFunctionTransformer.java | 2 +- .../SubStringFunctionColumnTransformer.java | 4 +- .../scalar/SubStringFunctionTransformer.java | 2 +- .../dag/udf/UDAFInformationInferrer.java | 4 +- .../transformation/dag/udf/UDTFContext.java | 4 +- .../dag/udf/UDTFInformationInferrer.java | 4 +- .../dag/util/LayerCacheUtils.java | 4 +- .../dag/util/TransformUtils.java | 2 +- .../transformation/dag/util/TypeUtils.java | 2 +- ...GeneralRegionAttributeSecurityService.java | 2 +- .../impl/SchemaRegionMemoryImpl.java | 18 +- .../visitor/SchemaRegionPlanDeserializer.java | 2 +- .../visitor/SchemaRegionPlanSerializer.java | 2 +- .../impl/TimeseriesReaderWithViewFetch.java | 2 +- .../utils/ResourceByPathUtils.java | 4 +- .../table/DataNodeTableCache.java | 2 +- .../org/apache/iotdb/db/service/DataNode.java | 6 +- ...TemporaryQueryDataFileServiceProvider.java | 4 +- .../TemporaryQueryDataFileService.java | 2 +- .../metrics/DataNodeMetricsHelper.java | 2 +- .../metrics/IoTDBInternalLocalReporter.java | 4 +- .../storageengine/dataregion/DataRegion.java | 10 +- .../dataregion/IDataRegionForQuery.java | 2 +- .../dataregion/VirtualDataRegion.java | 2 +- .../dataregion/memtable/AbstractMemTable.java | 2 +- .../memtable/AbstractWritableMemChunk.java | 4 +- .../dataregion/memtable/IMemTable.java | 2 +- .../dataregion/memtable/ReadOnlyMemChunk.java | 2 +- .../dataregion/memtable/TsFileProcessor.java | 6 +- .../modification/TableDeletionEntry.java | 2 +- .../modification/TreeDeletionEntry.java | 2 +- .../reader/chunk/DiskAlignedChunkLoader.java | 2 +- .../read/reader/chunk/DiskChunkLoader.java | 2 +- .../reader/common/PriorityMergeReader.java | 2 +- .../DataRegionTableSizeQueryContext.java | 2 +- .../dataregion/wal/buffer/WALEntry.java | 4 +- .../dataregion/wal/node/WALNode.java | 2 +- ...InsertTabletStatementExceptionVisitor.java | 2 +- .../LoadTsFileDataTypeConverter.java | 2 +- .../iotdb/db/tools/IoTDBDataDirViewer.java | 2 +- .../iotdb/db/tools/TsFileResourcePrinter.java | 2 +- .../trigger/executor/TriggerFireVisitor.java | 2 +- .../apache/iotdb/db/utils/CommonUtils.java | 6 +- .../iotdb/db/utils/DataNodeAuthUtils.java | 2 +- .../iotdb/db/utils/DataNodeDateTimeUtils.java | 2 +- .../db/utils/DataNodeObjectFileService.java | 4 +- .../DataNodeObjectFileServiceProvider.java | 4 +- .../iotdb/db/utils/ErrorHandlingUtils.java | 2 +- .../apache/iotdb/db/utils/SchemaUtils.java | 2 +- .../iotdb/db/utils/TypeInferenceUtils.java | 2 +- .../iotdb/db/utils/cte/MemoryReader.java | 2 +- ...ce.ITemporaryQueryDataFileServiceProvider} | 0 ...tdb.calc.utils.IObjectFileServiceProvider} | 0 ...r.plan.node.IPlanNodeDeserializerProvider} | 0 ...ction.ITableFunctionAINodeServiceProvider} | 0 .../DataRegionStateMachineTest.java | 2 +- .../SchemaRegionSimpleRecoverTest.java | 8 +- .../schemaRegion/SchemaRegionTestUtil.java | 2 +- .../pipe/consensus/DeletionRecoverTest.java | 2 +- .../pipe/consensus/DeletionResourceTest.java | 2 +- .../event/PipeTabletInsertionEventTest.java | 2 +- .../sink/PipeDataNodeThriftRequestTest.java | 2 +- .../PipePlanTablePatternParseVisitorTest.java | 4 +- .../PipePlanTreePatternParseVisitorTest.java | 2 +- .../pipe/source/PipeRealtimeExtractTest.java | 2 +- .../SchemaRegionListeningQueueTest.java | 2 +- .../iotdb/db/qp/sql/ASTVisitorTest.java | 2 +- .../common/schematree/NodeRefTest.java | 2 +- .../queryengine/execution/DataDriverTest.java | 8 +- .../aggregation/AccumulatorTest.java | 2 +- .../executor/RegionWriteExecutorTest.java | 2 +- .../FragmentInstanceExecutionTest.java | 4 +- .../AggregationMergeSortOperatorTest.java | 8 +- .../operator/AggregationOperatorTest.java | 8 +- ...gnedSeriesAggregationScanOperatorTest.java | 4 +- .../AlignedSeriesScanOperatorTest.java | 4 +- .../operator/CteScanOperatorTest.java | 8 +- .../DeviceIteratorScanOperatorTest.java | 4 +- .../operator/DeviceViewIntoOperatorTest.java | 6 +- .../operator/DeviceViewOperatorTest.java | 4 +- .../operator/ExchangeOperatorTest.java | 2 +- .../execution/operator/FillOperatorTest.java | 14 +- .../HorizontallyConcatOperatorTest.java | 2 +- .../operator/LastQueryMergeOperatorTest.java | 4 +- .../operator/LastQueryOperatorTest.java | 2 +- .../LastQueryTreeSortOperatorTest.java | 2 +- .../execution/operator/LimitOperatorTest.java | 6 +- .../operator/MergeTreeSortOperatorTest.java | 10 +- .../operator/MultiColumnMergerTest.java | 2 +- ...nedTreeDeviceViewScanOperatorTreeTest.java | 22 +- .../NonOverlappedMultiColumnMergerTest.java | 2 +- .../operator/OffsetOperatorTest.java | 8 +- .../operator/OperatorMemoryTest.java | 24 +- .../RawDataAggregationOperatorTest.java | 6 +- .../SeriesAggregationScanOperatorTest.java | 2 +- .../operator/SeriesScanOperatorTest.java | 2 +- .../operator/SingleColumnMergerTest.java | 2 +- .../SingleDeviceViewOperatorTest.java | 4 +- .../SlidingWindowAggregationOperatorTest.java | 4 +- .../operator/SortOperatorSortBranchTest.java | 8 +- .../operator/TransformOperatorTest.java | 8 +- .../operator/TreeIntoOperatorTest.java | 6 +- .../operator/TreeLinearFillOperatorTest.java | 12 +- .../operator/TreeSortOperatorTest.java | 8 +- .../operator/TreeTopKOperatorTest.java | 6 +- .../operator/UpdateLastCacheOperatorTest.java | 2 +- .../ViewFromTreeAdaptorOperatorTest.java | 6 +- .../process/TableStreamSortOperatorTest.java | 14 +- .../operator/process/ValuesOperatorTest.java | 6 +- .../filter/MonthIntervalFillFilterTest.java | 6 +- .../gapfill/GapFillWGroupWMoOperatorTest.java | 18 +- .../GapFillWGroupWoMoOperatorTest.java | 18 +- .../GapFillWoGroupWMoOperatorTest.java | 12 +- .../GapFillWoGroupWoMoOperatorTest.java | 10 +- .../join/InnerTimeJoinOperatorTest.java | 4 +- .../join/LeftOuterTimeJoinOperatorTest.java | 2 +- .../IrRowPatternOptimizationTest.java | 26 +- .../process/rowpattern/MatcherTest.java | 38 +- .../rowpattern/PatternExpressionTest.java | 10 +- .../tvf/TableFunctionOperatorTest.java | 10 +- .../process/window/RowNumberOperatorTest.java | 8 +- .../window/TableWindowOperatorTest.java | 14 +- .../window/TableWindowOperatorTestUtils.java | 2 +- .../window/TopKRankingOperatorTest.java | 12 +- .../window/function/FunctionTestUtils.java | 14 +- .../AggregationWindowFunctionTest.java | 10 +- .../function/rank/CumeDistFunctionTest.java | 6 +- .../function/rank/DenseRankFunctionTest.java | 6 +- .../function/rank/NTileFunctionTest.java | 6 +- .../rank/PercentRankFunctionTest.java | 6 +- .../function/rank/RankFunctionTest.java | 6 +- .../function/rank/RowNumberFunctionTest.java | 6 +- .../value/FirstValueFunctionTest.java | 8 +- .../function/value/LagFunctionTest.java | 6 +- .../function/value/LastValueFunctionTest.java | 8 +- .../function/value/LeadFunctionTest.java | 6 +- .../function/value/NthValueFunctionTest.java | 8 +- .../partition/frame/FrameTestUtils.java | 18 +- .../partition/frame/GroupsFrameTest.java | 2 +- .../partition/frame/RangeFrameTest.java | 4 +- .../window/partition/frame/RowsFrameTest.java | 2 +- .../CountGroupByLevelMergeOperatorTest.java | 2 +- .../schema/SchemaCountOperatorTest.java | 2 +- .../schema/SchemaQueryScanOperatorTest.java | 2 +- .../sink/IdentitySinkOperatorTest.java | 2 +- .../SinkOperatorDownStreamNodeIdTest.java | 6 +- .../relational/TableScanOperatorTest.java | 4 +- .../schedule/DriverSchedulerTest.java | 2 +- .../ConvertPredicateToTimeFilterTest.java | 2 +- .../queryengine/plan/analyze/AnalyzeTest.java | 2 +- .../optimization/AggregationPushDownTest.java | 2 +- .../ColumnInjectionPushDownTest.java | 4 +- .../optimization/LimitOffsetPushDownTest.java | 6 +- .../optimization/OptimizationTestUtil.java | 2 +- .../optimization/PredicatePushDownTest.java | 2 +- .../plan/optimization/TestPlanBuilder.java | 6 +- .../plan/parser/StatementGeneratorTest.java | 6 +- .../plan/planner/ExpressionTest.java | 2 +- .../planner/FragmentInstanceSerdeTest.java | 6 +- .../plan/planner/PipelineBuilderTest.java | 6 +- .../AggregationAlignByDeviceTest.java | 2 +- .../AggregationDistributionTest.java | 4 +- .../AggregationTableScanTest.java | 24 +- .../AlignByDeviceOrderByLimitOffsetTest.java | 2 +- .../AlignByTimeOrderByLimitOffsetTest.java | 2 +- .../distribution/AlignedByDeviceTest.java | 2 +- .../DistributionPlannerBasicTest.java | 6 +- .../DistributionPlannerCycleTest.java | 2 +- .../planner/distribution/LastQueryTest.java | 4 +- .../NoDataRegionPlanningTest.java | 2 +- .../distribution/RegionScanPlanningTest.java | 2 +- .../plan/planner/distribution/Util.java | 2 +- .../plan/planner/distribution/Util2.java | 2 +- .../logical/DataQueryLogicalPlannerTest.java | 2 +- .../logical/LogicalPlannerTestUtil.java | 4 +- .../logical/RegionScanLogicalPlannerTest.java | 6 +- .../SchemaQueryLogicalPlannerTest.java | 4 +- .../planner/node/PlanGraphPrinterTest.java | 2 +- .../node/PlanNodeDeserializeHelper.java | 4 +- .../planner/node/load/LoadTsFileNodeTest.java | 2 +- .../read/DeviceSchemaFetchScanNodeTest.java | 4 +- .../read/DeviceSchemaScanNodeSerdeTest.java | 2 +- ...odeManagementMemoryMergeNodeSerdeTest.java | 2 +- .../read/PathsUsingTemplateScanNodeTest.java | 4 +- .../read/SchemaCountNodeSerdeTest.java | 2 +- .../read/SchemaFetchMergeNodeTest.java | 4 +- .../read/SeriesSchemaFetchScanNodeTest.java | 4 +- .../TimeSeriesSchemaScanNodeSerdeTest.java | 2 +- .../write/MetadataWriteNodeSerDeTest.java | 6 +- .../PipeEnrichedDeleteDataNodeSerdeTest.java | 6 +- .../pipe/PipeEnrichedInsertNodeSerdeTest.java | 4 +- ...PipeEnrichedNonWritePlanNodeSerdeTest.java | 6 +- .../PipeEnrichedWritePlanNodeSerdeTest.java | 6 +- .../process/AggregationNodeSerdeTest.java | 2 +- .../node/process/DeviceViewNodeSerdeTest.java | 2 +- .../node/process/ExchangeNodeSerdeTest.java | 2 +- .../node/process/FillNodeSerdeTest.java | 4 +- .../node/process/FilterNodeSerdeTest.java | 2 +- .../process/GroupByLevelNodeSerdeTest.java | 2 +- .../node/process/GroupByTagNodeSerdeTest.java | 2 +- .../node/process/IntoNodeSerdeTest.java | 6 +- .../node/process/LimitNodeSerdeTest.java | 2 +- .../node/process/OffsetNodeSerdeTest.java | 2 +- .../SingleDeviceViewNodeSerdeTest.java | 2 +- .../node/process/SortNodeSerdeTest.java | 2 +- .../node/process/TimeJoinNodeSerdeTest.java | 4 +- .../node/process/WindowNodeSerdeTest.java | 28 +- .../node/sink/IdentitySinkNodeSerdeTest.java | 2 +- .../sink/ShuffleSinkHandleNodeSerdeTest.java | 2 +- .../SeriesAggregationScanNodeSerdeTest.java | 4 +- .../node/source/SeriesScanNodeSerdeTest.java | 4 +- .../node/source/SourceNodeSerdeTest.java | 6 +- ...SameSearchIndexSeparatorNodeSerDeTest.java | 4 +- .../node/write/DeleteDataNodeSerdeTest.java | 6 +- .../InsertMultiTabletsNodeSerdeTest.java | 4 +- .../node/write/InsertRowNodeSerdeTest.java | 4 +- .../node/write/InsertRowsNodeSerdeTest.java | 4 +- .../InsertRowsOfOneDeviceNodeSerdeTest.java | 4 +- .../node/write/InsertTabletNodeSerdeTest.java | 4 +- .../node/write/WritePlanNodeSplitTest.java | 2 +- .../write/RelationalDeleteDataNodeTest.java | 6 +- .../analyzer/AggregationCornerCaseTest.java | 22 +- .../relational/analyzer/AggregationTest.java | 26 +- .../relational/analyzer/AnalyzerTest.java | 34 +- .../analyzer/AsofInnerJoinOperatorTest.java | 8 +- .../relational/analyzer/AsofJoinTest.java | 16 +- .../plan/relational/analyzer/AuthTest.java | 8 +- .../relational/analyzer/DistinctTest.java | 2 +- .../analyzer/ExtractExpressionTest.java | 4 +- .../analyzer/InsertIntoQueryTest.java | 10 +- .../plan/relational/analyzer/JoinTest.java | 44 +-- .../analyzer/LimitOffsetPushDownTest.java | 16 +- .../PushAggregationThroughUnionTest.java | 6 +- .../analyzer/RowPatternRecognitionTest.java | 8 +- .../plan/relational/analyzer/SortTest.java | 18 +- .../relational/analyzer/SubQueryTest.java | 16 +- .../relational/analyzer/TSBSMetadata.java | 28 +- .../plan/relational/analyzer/TSBSTest.java | 34 +- .../analyzer/TableFunctionTest.java | 16 +- .../relational/analyzer/TestMetadata.java | 40 +- .../relational/analyzer/TestPlanBuilder.java | 22 +- .../plan/relational/analyzer/TestUtils.java | 16 +- .../relational/analyzer/TreeViewTest.java | 6 +- .../planner/CorrelatedSubqueryTest.java | 14 +- .../planner/CteMaterializerTest.java | 16 +- .../relational/planner/CteSubqueryTest.java | 8 +- .../plan/relational/planner/ExampleTest.java | 28 +- .../PatternRecognitionNodeSerdeTest.java | 44 +-- .../plan/relational/planner/PlanTester.java | 10 +- .../planner/PredicateUtilsTest.java | 6 +- .../planner/UncorrelatedSubqueryTest.java | 24 +- .../AggregationDeviceTableScanMatcher.java | 8 +- .../assertions/AggregationFunction.java | 6 +- .../AggregationFunctionMatcher.java | 8 +- .../AggregationFunctionProvider.java | 8 +- .../assertions/AggregationMatcher.java | 8 +- .../assertions/AggregationStepMatcher.java | 6 +- .../planner/assertions/AliasMatcher.java | 8 +- .../planner/assertions/AliasPresent.java | 6 +- .../assertions/AsofJoinClauseProvider.java | 6 +- .../assertions/AssignUniqueIdMatcher.java | 8 +- .../assertions/BaseStrictSymbolsMatcher.java | 6 +- .../planner/assertions/ColumnReference.java | 10 +- .../planner/assertions/CteScanMatcher.java | 6 +- .../assertions/DeviceTableScanMatcher.java | 4 +- .../assertions/EquiJoinClauseProvider.java | 2 +- .../assertions/ExchangeNodeMatcher.java | 8 +- .../planner/assertions/ExpressionMatcher.java | 10 +- .../assertions/ExpressionVerifier.java | 60 +-- .../planner/assertions/FilterMatcher.java | 8 +- .../planner/assertions/GroupMatcher.java | 6 +- .../assertions/IdentityProjectionMatcher.java | 6 +- .../InformationSchemaTableScanMatcher.java | 4 +- .../planner/assertions/JoinMatcher.java | 10 +- .../planner/assertions/LimitMatcher.java | 8 +- .../assertions/MarkDistinctMatcher.java | 6 +- .../planner/assertions/MatchResult.java | 2 +- .../planner/assertions/Matcher.java | 4 +- .../assertions/NotPlanNodeMatcher.java | 4 +- .../planner/assertions/OffsetMatcher.java | 6 +- .../planner/assertions/OutputMatcher.java | 8 +- .../planner/assertions/PlanAssert.java | 8 +- .../planner/assertions/PlanMatchPattern.java | 80 ++-- .../assertions/PlanMatchingVisitor.java | 10 +- .../planner/assertions/PlanNodeMatcher.java | 4 +- .../planner/assertions/PlanTestSymbol.java | 2 +- .../planner/assertions/PredicateMatcher.java | 4 +- .../planner/assertions/RvalueMatcher.java | 8 +- .../planner/assertions/SemiJoinMatcher.java | 6 +- .../planner/assertions/SortMatcher.java | 6 +- .../assertions/SpecificationProvider.java | 6 +- .../StrictAssignedSymbolsMatcher.java | 8 +- .../assertions/StrictSymbolsMatcher.java | 6 +- .../planner/assertions/SymbolAlias.java | 2 +- .../planner/assertions/SymbolAliases.java | 8 +- .../TableFunctionProcessorMatcher.java | 10 +- .../planner/assertions/TableScanMatcher.java | 8 +- .../planner/assertions/TopKMatcher.java | 6 +- .../relational/planner/assertions/Util.java | 4 +- .../assertions/WindowFunctionMatcher.java | 10 +- .../informationschema/CurrentQueriesTest.java | 8 +- .../TablePredicateConversionTest.java | 14 +- .../sql/AstMemoryEstimatorTest.java | 2 +- .../sql/ast/SqlParserErrorHandlerTest.java | 2 +- .../sql/parser/AuthorStatementTest.java | 4 +- .../plan/statement/InsertStatementTest.java | 8 +- .../plan/statement/StatementTestUtils.java | 6 +- .../builder/EvaluationDAGBuilderTest.java | 6 +- ...AndCompareBinaryColumnTransformerTest.java | 24 +- .../LogicBinaryColumnTransformerTest.java | 8 +- .../hmac/HmacMd5ColumnTransformerTest.java | 10 +- .../hmac/HmacSha1ColumnTransformerTest.java | 10 +- .../hmac/HmacSha256ColumnTransformerTest.java | 10 +- .../hmac/HmacSha512ColumnTransformerTest.java | 10 +- .../ternary/LpadColumnTransformerTest.java | 4 +- .../ternary/RpadColumnTransformerTest.java | 4 +- .../unary/UnaryColumnTransformerTest.java | 16 +- .../BlobLengthColumnTransformerTest.java | 4 +- .../unary/scalar/DateBinFunctionTest.java | 2 +- .../FromBigEndian32ColumnTransformerTest.java | 6 +- .../FromBigEndian64ColumnTransformerTest.java | 6 +- ...E754_32BigEndianColumnTransformerTest.java | 6 +- ...E754_64BigEndianColumnTransformerTest.java | 6 +- ...omLittleEndian32ColumnTransformerTest.java | 6 +- ...omLittleEndian64ColumnTransformerTest.java | 6 +- .../ToBigEndian32ColumnTransformerTest.java | 6 +- .../ToBigEndian64ColumnTransformerTest.java | 6 +- ...E754_32BigEndianColumnTransformerTest.java | 6 +- ...E754_64BigEndianColumnTransformerTest.java | 6 +- ...ToLittleEndian32ColumnTransformerTest.java | 6 +- ...ToLittleEndian64ColumnTransformerTest.java | 6 +- .../scalar/ReverseColumnTransformerTest.java | 6 +- .../FromBase32ColumnTransformerTest.java | 6 +- .../FromBase64ColumnTransformerTest.java | 6 +- .../FromBase64UrlColumnTransformerTest.java | 6 +- .../ToBase32ColumnTransformerTest.java | 6 +- .../ToBase64ColumnTransformerTest.java | 6 +- .../ToBase64UrlColumnTransformerTest.java | 6 +- .../hashing/Crc32ColumnTransformerTest.java | 4 +- .../hashing/Md5ColumnTransformerTest.java | 6 +- .../hashing/Murmur3ColumnTransformerTest.java | 6 +- .../hashing/Sha1ColumnTransformerTest.java | 6 +- .../hashing/Sha256ColumnTransformerTest.java | 6 +- .../hashing/Sha512ColumnTransformerTest.java | 6 +- .../SpookyHashV2_32ColumnTransformerTest.java | 6 +- .../SpookyHashV2_64ColumnTransformerTest.java | 6 +- .../XxHash64ColumnTransformerTest.java | 6 +- .../FromHexColumnTransformerTest.java | 6 +- .../ToHexColumnTransformerTest.java | 6 +- .../dag/util/BitwiseUtilsTest.java | 18 +- .../ElasticSerializableRowListTest.java | 8 +- .../ElasticSerializableTVListTest.java | 6 +- .../datastructure/LRUCache.java | 2 +- .../SerializableRowListTest.java | 2 +- .../datastructure/SerializableTVListTest.java | 2 +- .../DataNodeInternalRPCServiceImplTest.java | 2 +- .../dataregion/DataRegionTest.java | 4 +- .../dataregion/TTLQueryTest.java | 2 +- .../db/storageengine/dataregion/TTLTest.java | 4 +- ...sSpaceCompactionWithFastPerformerTest.java | 2 +- ...eCompactionWithReadPointPerformerTest.java | 2 +- ...nerSeqCompactionWithFastPerformerTest.java | 2 +- ...qCompactionWithReadChunkPerformerTest.java | 2 +- .../settle/SettleRequestHandlerTest.java | 2 +- .../memtable/AlignedTVListIteratorTest.java | 2 +- .../memtable/MemChunkDeserializeTest.java | 2 +- .../memtable/MemTableTestUtils.java | 2 +- .../NonAlignedTVListIteratorTest.java | 2 +- .../memtable/PrimitiveMemTableTest.java | 8 +- .../memtable/TsFileProcessorTest.java | 2 +- .../dataregion/wal/WALManagerTest.java | 2 +- .../dataregion/wal/WALTestUtils.java | 4 +- .../wal/allocation/ElasticStrategyTest.java | 2 +- .../allocation/FirstCreateStrategyTest.java | 2 +- .../allocation/RoundRobinStrategyTest.java | 2 +- .../wal/buffer/WALBufferCommonTest.java | 4 +- .../wal/compression/WALCompressionTest.java | 2 +- .../dataregion/wal/io/WALFileTest.java | 2 +- .../wal/node/ConsensusReqReaderTest.java | 4 +- .../dataregion/wal/node/WALFakeNodeTest.java | 2 +- .../dataregion/wal/node/WALNodeTest.java | 2 +- .../wal/node/WalDeleteOutdatedNewTest.java | 2 +- .../wal/recover/WALRecoverManagerTest.java | 4 +- .../wal/recover/WALRepairWriterTest.java | 2 +- .../recover/file/TsFilePlanRedoerTest.java | 2 +- .../UnsealedTsFileRecoverPerformerTest.java | 2 +- .../memory/TimePartitionManagerTest.java | 2 +- .../trigger/executor/TriggerExecuteTest.java | 2 +- .../iotdb/db/utils/DateTimeUtilsTest.java | 2 +- .../iotdb/db/utils/EnvironmentUtils.java | 2 +- .../db/utils/ErrorHandlingUtilsTest.java | 2 +- .../apache/iotdb/db/utils/MemUtilsTest.java | 2 +- .../iotdb/db/utils/SchemaUtilsTest.java | 2 +- .../db/utils/TimestampPrecisionUtilsTest.java | 2 +- .../db/utils/TypeInferenceUtilsTest.java | 2 +- .../datastructure/MergeSortHeapTest.java | 6 +- .../iotdb/db/utils/sort/SortUtilTest.java | 14 +- .../common/ConnectionInfo.java | 2 +- .../common/NodeRef.java | 2 +- .../common/SessionInfo.java | 4 +- .../common/SqlDialect.java | 2 +- .../execution/MemoryEstimationHelper.java | 2 +- .../aggregation/grouped/UpdateMemory.java | 2 +- .../grouped/hash/CombineHashFunction.java | 2 +- .../grouped/hash/FlatGroupByHash.java | 8 +- .../aggregation/grouped/hash/FlatHash.java | 8 +- .../grouped/hash/FlatHashStrategy.java | 2 +- .../aggregation/grouped/hash/GroupByHash.java | 4 +- .../grouped/hash/HashStrategy.java | 8 +- .../grouped/hash/MarkDistinctHash.java | 8 +- .../grouped/hash/NoChannelGroupByHash.java | 2 +- .../grouped/hash/VariableWidthData.java | 8 +- .../aggregation/grouped/hash/XxHash64.java | 2 +- .../plan/analyze/ITableTypeProvider.java | 4 +- .../plan/expression/multi/FunctionType.java | 2 +- .../plan/node/CommonPlanNodeDeserializer.java | 64 +-- .../plan/node/ICoreQueryPlanVisitor.java | 82 ++-- .../plan/node/IPartitionRelatedNode.java | 2 +- .../plan/node/IPlanNodeDeserializer.java | 2 +- .../node/IPlanNodeDeserializerProvider.java | 2 +- .../plan/planner/plan/node/IPlanVisitor.java | 2 +- .../plan/planner/plan/node/PlanNode.java | 4 +- .../plan/planner/plan/node/PlanNodeId.java | 2 +- .../plan/planner/plan/node/PlanNodeType.java | 2 +- .../node/process/MultiChildProcessNode.java | 6 +- .../plan/node/process/ProcessNode.java | 6 +- .../node/process/SingleChildProcessNode.java | 6 +- .../node/process/TwoChildProcessNode.java | 6 +- .../planner/plan/node/source/SourceNode.java | 8 +- .../planner/plan/parameter/InputLocation.java | 2 +- .../plan/relational/analyzer/NodeRef.java | 4 +- .../relational/function/BoundSignature.java | 4 +- .../plan/relational/function/FunctionId.java | 2 +- .../relational/function/FunctionKind.java | 2 +- .../function/ITableFunctionAINodeService.java | 2 +- .../ITableFunctionAINodeServiceProvider.java | 2 +- .../function/ITableFunctionFactory.java | 2 +- .../function/InterpretedFunctionInvoker.java | 4 +- .../function/LongVariableConstraint.java | 2 +- .../relational/function/OperatorType.java | 2 +- .../function/ResolvedFunctionCallBuilder.java | 8 +- .../plan/relational/function/Signature.java | 4 +- .../function/TableBuiltinTableFunction.java | 8 +- .../function/TableFunctionFactory.java | 4 +- .../function/TypeVariableConstraint.java | 4 +- .../function/arithmetic/AdditionResolver.java | 2 +- .../function/arithmetic/DivisionResolver.java | 2 +- .../function/arithmetic/ModulusResolver.java | 2 +- .../arithmetic/MultiplicationResolver.java | 2 +- .../arithmetic/SubtractionResolver.java | 2 +- .../function/tvf/ClassifyTableFunction.java | 8 +- .../function/tvf/ForecastTableFunction.java | 12 +- .../tvf/PatternMatchTableFunction.java | 12 +- .../function/tvf/TableFunctionUtils.java | 2 +- .../function/tvf/match/MatchConfig.java | 2 +- .../function/tvf/match/QetchAlgorithm.java | 18 +- .../function/tvf/match/model/MatchState.java | 4 +- .../tvf/match/model/PatternSegment.java | 4 +- .../function/tvf/match/model/Point.java | 2 +- .../tvf/match/model/RegexMatchState.java | 6 +- .../function/tvf/match/model/Section.java | 2 +- .../relational/metadata/ColumnMetadata.java | 2 +- .../relational/metadata/ColumnSchema.java | 4 +- .../metadata/FunctionNullability.java | 2 +- .../relational/metadata/ResolvedFunction.java | 10 +- .../plan/relational/metadata/TableSchema.java | 4 +- .../plan/relational/planner/Assignments.java | 6 +- .../DataOrganizationSpecification.java | 2 +- .../relational/planner/OrderingScheme.java | 2 +- .../plan/relational/planner/SortOrder.java | 2 +- .../plan/relational/planner/Symbol.java | 6 +- .../planner/iterative/GroupReference.java | 12 +- .../planner/node/AggregationNode.java | 28 +- .../relational/planner/node/ApplyNode.java | 18 +- .../planner/node/AssignUniqueId.java | 18 +- .../relational/planner/node/CollectNode.java | 18 +- .../planner/node/CorrelatedJoinNode.java | 22 +- .../planner/node/EnforceSingleRowNode.java | 16 +- .../relational/planner/node/ExceptNode.java | 12 +- .../relational/planner/node/FillNode.java | 16 +- .../relational/planner/node/FilterNode.java | 20 +- .../relational/planner/node/GapFillNode.java | 18 +- .../relational/planner/node/GroupNode.java | 14 +- .../planner/node/IntersectNode.java | 12 +- .../relational/planner/node/JoinNode.java | 28 +- .../relational/planner/node/LimitNode.java | 20 +- .../planner/node/LinearFillNode.java | 16 +- .../planner/node/MarkDistinctNode.java | 18 +- .../plan/relational/planner/node/Measure.java | 6 +- .../planner/node/MergeSortNode.java | 20 +- .../relational/planner/node/OffsetNode.java | 18 +- .../relational/planner/node/OutputNode.java | 18 +- .../planner/node/PatternRecognitionNode.java | 28 +- .../planner/node/PreviousFillNode.java | 16 +- .../relational/planner/node/ProjectNode.java | 22 +- .../planner/node/RowNumberNode.java | 18 +- .../relational/planner/node/RowsPerMatch.java | 2 +- .../relational/planner/node/SemiJoinNode.java | 18 +- .../planner/node/SetOperationNode.java | 12 +- .../planner/node/SkipToPosition.java | 2 +- .../relational/planner/node/SortNode.java | 20 +- .../planner/node/StreamSortNode.java | 16 +- .../planner/node/TableFunctionNode.java | 22 +- .../node/TableFunctionProcessorNode.java | 22 +- .../relational/planner/node/TopKNode.java | 20 +- .../planner/node/TopKRankingNode.java | 20 +- .../relational/planner/node/UnionNode.java | 14 +- .../planner/node/ValueFillNode.java | 18 +- .../relational/planner/node/ValuesNode.java | 20 +- .../relational/planner/node/WindowNode.java | 36 +- .../rowpattern/AggregationLabelSet.java | 2 +- .../rowpattern/AggregationValuePointer.java | 8 +- .../rowpattern/ClassifierValuePointer.java | 2 +- .../ExpressionAndValuePointers.java | 8 +- .../planner/rowpattern/IrAlternation.java | 2 +- .../planner/rowpattern/IrAnchor.java | 4 +- .../planner/rowpattern/IrConcatenation.java | 2 +- .../planner/rowpattern/IrEmpty.java | 2 +- .../planner/rowpattern/IrExclusion.java | 2 +- .../planner/rowpattern/IrLabel.java | 2 +- .../IrPatternAlternationOptimizer.java | 4 +- .../planner/rowpattern/IrPermutation.java | 2 +- .../planner/rowpattern/IrQuantified.java | 2 +- .../planner/rowpattern/IrQuantifier.java | 2 +- .../planner/rowpattern/IrRowPattern.java | 2 +- .../rowpattern/IrRowPatternFlattener.java | 2 +- .../rowpattern/IrRowPatternVisitor.java | 2 +- .../rowpattern/LogicalIndexPointer.java | 2 +- .../rowpattern/MatchNumberValuePointer.java | 2 +- .../planner/rowpattern/Patterns.java | 12 +- .../rowpattern/ScalarValuePointer.java | 4 +- .../planner/rowpattern/ValuePointer.java | 2 +- .../plan/relational/security/Identity.java | 2 +- .../relational/sql/ast/AliasedRelation.java | 2 +- .../plan/relational/sql/ast/AllColumns.java | 2 +- .../plan/relational/sql/ast/AllRows.java | 2 +- .../relational/sql/ast/AnchorPattern.java | 2 +- .../sql/ast/ArithmeticBinaryExpression.java | 2 +- .../sql/ast/ArithmeticUnaryExpression.java | 2 +- .../sql/ast/AstMemoryEstimationHelper.java | 2 +- .../relational/sql/ast/BetweenPredicate.java | 2 +- .../relational/sql/ast/BinaryLiteral.java | 4 +- .../relational/sql/ast/BooleanLiteral.java | 2 +- .../plan/relational/sql/ast/Cast.java | 2 +- .../sql/ast/CoalesceExpression.java | 2 +- .../plan/relational/sql/ast/Columns.java | 2 +- .../sql/ast/CommonQueryAstVisitor.java | 2 +- .../sql/ast/ComparisonExpression.java | 2 +- .../relational/sql/ast/CurrentDatabase.java | 2 +- .../plan/relational/sql/ast/CurrentTime.java | 2 +- .../plan/relational/sql/ast/CurrentUser.java | 2 +- .../plan/relational/sql/ast/DataType.java | 2 +- .../relational/sql/ast/DataTypeParameter.java | 2 +- .../relational/sql/ast/DecimalLiteral.java | 2 +- .../sql/ast/DereferenceExpression.java | 2 +- .../relational/sql/ast/DoubleLiteral.java | 2 +- .../plan/relational/sql/ast/EmptyPattern.java | 2 +- .../plan/relational/sql/ast/Except.java | 2 +- .../relational/sql/ast/ExcludedPattern.java | 2 +- .../relational/sql/ast/ExistsPredicate.java | 2 +- .../plan/relational/sql/ast/Expression.java | 4 +- .../plan/relational/sql/ast/Extract.java | 2 +- .../relational/sql/ast/FieldReference.java | 2 +- .../plan/relational/sql/ast/Fill.java | 4 +- .../plan/relational/sql/ast/FloatLiteral.java | 2 +- .../plan/relational/sql/ast/FrameBound.java | 2 +- .../plan/relational/sql/ast/FunctionCall.java | 2 +- .../relational/sql/ast/GenericDataType.java | 2 +- .../relational/sql/ast/GenericLiteral.java | 4 +- .../plan/relational/sql/ast/GroupBy.java | 2 +- .../relational/sql/ast/GroupingElement.java | 2 +- .../plan/relational/sql/ast/GroupingSets.java | 2 +- .../plan/relational/sql/ast/IAstVisitor.java | 2 +- .../plan/relational/sql/ast/Identifier.java | 2 +- .../plan/relational/sql/ast/IfExpression.java | 2 +- .../relational/sql/ast/InListExpression.java | 2 +- .../plan/relational/sql/ast/InPredicate.java | 2 +- .../plan/relational/sql/ast/Intersect.java | 2 +- .../sql/ast/IsNotNullPredicate.java | 2 +- .../relational/sql/ast/IsNullPredicate.java | 2 +- .../plan/relational/sql/ast/Join.java | 2 +- .../plan/relational/sql/ast/JoinCriteria.java | 2 +- .../plan/relational/sql/ast/JoinOn.java | 2 +- .../plan/relational/sql/ast/JoinUsing.java | 2 +- .../relational/sql/ast/LikePredicate.java | 2 +- .../plan/relational/sql/ast/Limit.java | 2 +- .../plan/relational/sql/ast/Literal.java | 2 +- .../relational/sql/ast/LogicalExpression.java | 2 +- .../plan/relational/sql/ast/LongLiteral.java | 4 +- .../relational/sql/ast/MeasureDefinition.java | 2 +- .../plan/relational/sql/ast/NaturalJoin.java | 2 +- .../plan/relational/sql/ast/Node.java | 2 +- .../plan/relational/sql/ast/NodeLocation.java | 2 +- .../relational/sql/ast/NotExpression.java | 2 +- .../relational/sql/ast/NullIfExpression.java | 2 +- .../plan/relational/sql/ast/NullLiteral.java | 2 +- .../relational/sql/ast/NumericParameter.java | 2 +- .../plan/relational/sql/ast/Offset.java | 2 +- .../sql/ast/OneOrMoreQuantifier.java | 2 +- .../plan/relational/sql/ast/OrderBy.java | 2 +- .../plan/relational/sql/ast/Parameter.java | 2 +- .../sql/ast/PatternAlternation.java | 2 +- .../sql/ast/PatternConcatenation.java | 2 +- .../sql/ast/PatternPermutation.java | 2 +- .../relational/sql/ast/PatternQuantifier.java | 2 +- .../sql/ast/PatternRecognitionRelation.java | 2 +- .../relational/sql/ast/PatternVariable.java | 2 +- .../relational/sql/ast/ProcessingMode.java | 2 +- .../relational/sql/ast/QualifiedName.java | 2 +- .../ast/QuantifiedComparisonExpression.java | 2 +- .../relational/sql/ast/QuantifiedPattern.java | 2 +- .../plan/relational/sql/ast/Query.java | 4 +- .../plan/relational/sql/ast/QueryBody.java | 2 +- .../sql/ast/QuerySpecification.java | 2 +- .../relational/sql/ast/RangeQuantifier.java | 2 +- .../plan/relational/sql/ast/Relation.java | 2 +- .../plan/relational/sql/ast/Row.java | 2 +- .../plan/relational/sql/ast/RowPattern.java | 2 +- .../sql/ast/SearchedCaseExpression.java | 2 +- .../plan/relational/sql/ast/Select.java | 2 +- .../plan/relational/sql/ast/SelectItem.java | 2 +- .../plan/relational/sql/ast/SetOperation.java | 2 +- .../sql/ast/SimpleCaseExpression.java | 2 +- .../relational/sql/ast/SimpleGroupBy.java | 2 +- .../plan/relational/sql/ast/SingleColumn.java | 2 +- .../plan/relational/sql/ast/SkipTo.java | 10 +- .../plan/relational/sql/ast/SortItem.java | 2 +- .../plan/relational/sql/ast/Statement.java | 2 +- .../relational/sql/ast/StringLiteral.java | 2 +- .../sql/ast/SubqueryExpression.java | 2 +- .../relational/sql/ast/SubsetDefinition.java | 2 +- .../relational/sql/ast/SymbolReference.java | 2 +- .../plan/relational/sql/ast/Table.java | 2 +- .../sql/ast/TableExpressionType.java | 2 +- .../sql/ast/TableFunctionArgument.java | 2 +- .../sql/ast/TableFunctionInvocation.java | 2 +- .../sql/ast/TableFunctionTableArgument.java | 4 +- .../relational/sql/ast/TableSubquery.java | 2 +- .../plan/relational/sql/ast/Trim.java | 2 +- .../relational/sql/ast/TypeParameter.java | 2 +- .../plan/relational/sql/ast/Union.java | 2 +- .../plan/relational/sql/ast/Values.java | 2 +- .../sql/ast/VariableDefinition.java | 2 +- .../plan/relational/sql/ast/WhenClause.java | 2 +- .../plan/relational/sql/ast/Window.java | 2 +- .../relational/sql/ast/WindowDefinition.java | 2 +- .../plan/relational/sql/ast/WindowFrame.java | 2 +- .../relational/sql/ast/WindowReference.java | 2 +- .../sql/ast/WindowSpecification.java | 2 +- .../plan/relational/sql/ast/With.java | 2 +- .../plan/relational/sql/ast/WithQuery.java | 2 +- .../sql/ast/ZeroOrMoreQuantifier.java | 2 +- .../sql/ast/ZeroOrOneQuantifier.java | 2 +- .../sql/parser/CaseInsensitiveStream.java | 2 +- .../sql/parser/ParsingException.java | 4 +- .../sql/util/CommonQuerySqlFormatter.java | 86 ++-- .../sql/util/ExpressionFormatter.java | 134 +++---- .../sql/util/ReservedIdentifiers.java | 6 +- .../sql/util/RowPatternFormatter.java | 34 +- .../relational/type/InternalTypeManager.java | 2 +- .../relational/type/NamedTypeSignature.java | 2 +- .../plan/relational/type/ParameterKind.java | 2 +- .../plan/relational/type/RowFieldName.java | 2 +- .../plan/relational/type/StandardTypes.java | 2 +- .../plan/relational/type/TypeId.java | 2 +- .../plan/relational/type/TypeManager.java | 4 +- .../type/TypeNotFoundException.java | 2 +- .../plan/relational/type/TypeSignature.java | 6 +- .../type/TypeSignatureParameter.java | 2 +- .../type/TypeSignatureTranslator.java | 20 +- .../utils/ResultColumnAppender.java | 2 +- .../plan/relational/utils/TypeUtil.java | 12 +- .../plan/statement/component/FillPolicy.java | 2 +- .../plan/udf/BuiltinAggregationFunction.java | 2 +- .../plan/udf/BuiltinScalarFunction.java | 2 +- .../BuiltinTimeSeriesGeneratingFunction.java | 2 +- .../plan/udf/TableUDFUtils.java | 6 +- .../plan/udf/UDFManagementService.java | 4 +- .../plan/udf/UDTFForecast.java | 2 +- .../utils/DateTimeUtils.java | 2 +- .../utils/TimestampPrecisionUtils.java | 2 +- .../utils/cte/CteDataStore.java | 4 +- 2090 files changed, 8963 insertions(+), 8961 deletions(-) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/exception/MemoryNotEnoughException.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/exception/QueryProcessException.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/aggregation/Accumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/aggregation/VarianceAccumulator.java (99%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/AbstractOperator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/CommonOperatorContext.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/GroupedTopNBuilder.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/GroupedTopNRowNumberAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/GroupedTopNRowNumberBuilder.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/IdRegistry.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/Operator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/RowIdComparisonStrategy.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/RowIdHashStrategy.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/RowReference.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/RowReferenceTsBlockManager.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/SimpleTsBlockWithPositionComparator.java (82%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/TsBlockWithPositionComparator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/AbstractConsumeAllOperator.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/AbstractFillOperator.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/AbstractLinearFillOperator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/AbstractSortOperator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/AggregationMergeSortOperator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/AssignUniqueIdOperator.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/CollectOperator.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/EnforceSingleRowOperator.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/FilterAndProjectOperator.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/LimitOperator.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/MappingCollectOperator.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/MergeSortOperator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/OffsetOperator.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/PatternRecognitionOperator.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/PreviousFillWithGroupOperator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/ProcessOperator.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/SortOperator.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/TableFillOperator.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/TableLinearFillOperator.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/TableLinearFillWithGroupOperator.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/TableMergeSortOperator.java (84%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/TableSortOperator.java (82%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/TableStreamSortOperator.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/TableTopKOperator.java (84%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/TopKOperator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/ValuesOperator.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/fill/IFill.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/fill/IFillFilter.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/fill/ILinearFill.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/fill/filter/FixedIntervalFillFilter.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/fill/identity/IdentityFill.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/fill/identity/IdentityLinearFill.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/fill/linear/LinearFill.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/function/PartitionRecognizer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/function/TableFunctionLeafOperator.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/function/TableFunctionOperator.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/function/partition/PartitionCache.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/function/partition/PartitionState.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/function/partition/Slice.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/gapfill/AbstractGapFillOperator.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java (83%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java (82%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java (82%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java (83%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java (82%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/MergeSortComparator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/SortKeyComparator.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/JoinKeyComparator.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/LogicalIndexNavigation.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/PatternAggregationTracker.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/PatternAggregator.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/PatternAggregators.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/PatternPartitionExecutor.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/PatternVariableRecognizer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/PhysicalAggregationPointer.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/PhysicalValueAccessor.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/PhysicalValuePointer.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/expression/ArithmeticOperator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/expression/BinaryComputation.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/expression/BinaryOperator.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/expression/CastComputation.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/expression/ComparisonOperator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/expression/Computation.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/expression/ConstantComputation.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/expression/LogicalOperator.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/expression/NaryComputation.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/expression/NaryOperator.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/expression/ReferenceComputation.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/ArrayView.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/Done.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/Instruction.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/IntList.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/IntMultimap.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/IntStack.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/Jump.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/MatchEnd.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/MatchLabel.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/MatchResult.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/MatchStart.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/Matcher.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/PatternCaptures.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/Program.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/Save.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/rowpattern/matcher/Split.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/RowNumberOperator.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/TableWindowOperator.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/TopKRankingOperator.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/WindowFunction.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/WindowFunctionFactory.java (62%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/aggregate/WindowAggregator.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/rank/CumeDistFunction.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/rank/DenseRankFunction.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/rank/NTileFunction.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/rank/PercentRankFunction.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/rank/RankFunction.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/rank/RankWindowFunction.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/rank/RowNumberFunction.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/value/FirstValueFunction.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/value/LagFunction.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/value/LastValueFunction.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/value/LeadFunction.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/value/NthValueFunction.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/function/value/ValueWindowFunction.java (84%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/partition/Partition.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/partition/PartitionExecutor.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/partition/frame/Frame.java (84%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/partition/frame/FrameInfo.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/partition/frame/GroupsFrame.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/partition/frame/RangeFrame.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/partition/frame/RowsFrame.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/utils/ColumnList.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/utils/Range.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/process/window/utils/RowComparator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/AbstractMergeSortJoinOperator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/MarkDistinctOperator.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/MergeSortInnerJoinOperator.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/MergeSortLeftJoinOperator.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/MergeSortSemiJoinOperator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/AccumulatorFactory.java (85%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/AggregationMask.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/AggregationOperator.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/AvgAccumulator.java (99%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/CountAccumulator.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/CountAllAccumulator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/CountIfAccumulator.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/ExtremeAccumulator.java (99%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/FirstAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/FirstByAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/FirstDescAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/LastAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/LastByAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/LastByDescAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/LastDescAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/MaskedRecordIterator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/MaxAccumulator.java (99%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/MinAccumulator.java (99%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/RecordIterator.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/SumAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/TableAccumulator.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/TableAggregator.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/TableMinByAccumulator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/TableModeAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/Utils.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/Counter.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/ITopK.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/ListNode2.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/Pair.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/StreamSummary.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/approximate/TDigest.java (99%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java (85%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java (80%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/execution/relational/ColumnTransformerBuilder.java (81%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/metric/QueryExecutionMetricSet.java (99%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/planner/CommonOperatorUtils.java (67%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/planner/ITableOperatorGeneratorContext.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/planner/TableOperatorGenerator.java (84%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/planner/memory/MemoryReservationManager.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/metadata/CommonMetadataUtils.java (99%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/metadata/ITypeMetadata.java (80%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/planner/CastToBlobLiteralVisitor.java (71%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/planner/CastToBooleanLiteralVisitor.java (71%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/planner/CastToDateLiteralVisitor.java (71%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/planner/CastToDoubleLiteralVisitor.java (71%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/planner/CastToFloatLiteralVisitor.java (70%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/planner/CastToInt32LiteralVisitor.java (71%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/planner/CastToInt64LiteralVisitor.java (70%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/planner/CastToStringLiteralVisitor.java (74%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/planner/CastToTimestampLiteralVisitor.java (71%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java (83%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/utils/matching/Capture.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/utils/matching/Captures.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/utils/matching/DefaultPrinter.java (80%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/utils/matching/Match.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/utils/matching/Pattern.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/utils/matching/PatternVisitor.java (71%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/utils/matching/Property.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/utils/matching/PropertyPattern.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/utils/matching/pattern/CapturePattern.java (76%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/utils/matching/pattern/EqualsPattern.java (80%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/utils/matching/pattern/FilterPattern.java (81%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/utils/matching/pattern/TypeOfPattern.java (81%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/plan/relational/utils/matching/pattern/WithPattern.java (78%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/service/AbstractTemporaryQueryDataFileService.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/service/ITemporaryQueryDataFileServiceProvider.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/adapter/PointCollectorAdaptor.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java (99%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/ColumnCache.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/ColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/FailFunctionColumnTransformer.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/TableCaseWhenThenColumnTransformer.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/BinaryColumnTransformer.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/CompareBinaryColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/CompareEqualToColumnTransformer.java (85%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/CompareLessThanColumnTransformer.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java (85%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/HmacColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/Like2ColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/LogicAndColumnTransformer.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/LogicBinaryColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/LogicOrColumnTransformer.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/factory/HmacStrategiesFactory.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/binary/strategies/HmacStrategy.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/leaf/ConstantColumnTransformer.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/leaf/IdentityColumnTransformer.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/leaf/LeafColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/leaf/NullColumnTransformer.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/leaf/TimeColumnTransformer.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/BinaryLeastColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/BooleanLeastColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/CoalesceColumnTransformer.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/DoubleLeastColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/FloatGreatestColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/FloatLeastColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/InFloatMultiColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/InInt32MultiColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/InInt64MultiColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/InMultiColumnTransformer.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/Int32GreatestColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/Int32LeastColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/Int64GreatestColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/Int64LeastColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/LogicalMultiColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/MappableUDFColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/multi/MultiColumnTransformer.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/ternary/BetweenColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/ternary/Like3ColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/ternary/LpadColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/ternary/RpadColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/ternary/TernaryColumnTransformer.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/ternary/utils/BytePaddingUtils.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/InColumnTransformer.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/IsNullColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/LikeColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/LogicNotColumnTransformer.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/RegularColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/UnaryColumnTransformer.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/AbsColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/AcosColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/AsinColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/AtanColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java (84%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java (84%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java (85%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java (84%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/CRC32Transformer.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/CeilColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/CosColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/CoshColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/DiffColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java (85%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java (85%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/ExpColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/ExtractTransformer.java (83%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java (85%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/FloorColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/FormatColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java (85%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/LengthColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/LnColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java (85%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/LowerColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java (85%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java (87%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/RoundColumnTransformer.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/SignColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/SinColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/SinhColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/StrposColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/TanColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/TanhColumnTransformer.java (90%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java (86%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/TrimColumnTransformer.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/UpperColumnTransformer.java (89%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java (91%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/util/HexUtils.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java (99%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java (88%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/udf/UDFParametersFactory.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/udf/UDTFExecutor.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/util/BitwiseUtils.java (99%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/util/CastFunctionUtils.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/util/CommonTransformUtils.java (85%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/dag/util/InputRowUtils.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/datastructure/Cache.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/datastructure/SerializableList.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/datastructure/iterator/ListForwardIterator.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/datastructure/iterator/RowListForwardIterator.java (92%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/datastructure/iterator/TVListForwardIterator.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/datastructure/row/ElasticSerializableRowList.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/datastructure/row/SerializableRowList.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/datastructure/tv/ElasticSerializableTVList.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/datastructure/tv/SerializableTVList.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/transformation/datastructure/util/BinaryUtils.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/HeapTraversal.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/IObjectFileService.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/IObjectFileServiceProvider.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/IObjectPath.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/ObjectTypeUtils.java (99%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/constant/SqlConstant.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/datastructure/MergeSortHeap.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/datastructure/MergeSortKey.java (96%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/datastructure/SortKey.java (94%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/sort/DiskSpiller.java (98%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/sort/FileSpillerReader.java (97%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/sort/MemoryReader.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/sort/SortBufferManager.java (95%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/sort/SortReader.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/sort/TableDiskSpiller.java (93%) rename iotdb-core/calc-commons/src/main/java/org/apache/iotdb/{calc_commons => calc}/utils/sort/TreeDiskSpiller.java (96%) rename iotdb-core/datanode/src/main/resources/META-INF/services/{org.apache.iotdb.calc_commons.service.ITemporaryQueryDataFileServiceProvider => org.apache.iotdb.calc.service.ITemporaryQueryDataFileServiceProvider} (100%) rename iotdb-core/datanode/src/main/resources/META-INF/services/{org.apache.iotdb.calc_commons.utils.IObjectFileServiceProvider => org.apache.iotdb.calc.utils.IObjectFileServiceProvider} (100%) rename iotdb-core/datanode/src/main/resources/META-INF/services/{org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider => org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanNodeDeserializerProvider} (100%) rename iotdb-core/datanode/src/main/resources/META-INF/services/{org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider => org.apache.iotdb.commons.queryengine.plan.relational.function.ITableFunctionAINodeServiceProvider} (100%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/common/ConnectionInfo.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/common/NodeRef.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/common/SessionInfo.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/common/SqlDialect.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/execution/MemoryEstimationHelper.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java (91%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java (92%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java (94%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java (94%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java (89%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java (86%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java (92%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/analyze/ITableTypeProvider.java (88%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/expression/multi/FunctionType.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/node/CommonPlanNodeDeserializer.java (54%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/node/ICoreQueryPlanVisitor.java (61%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/node/IPartitionRelatedNode.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/node/IPlanNodeDeserializer.java (92%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/node/IPlanNodeDeserializerProvider.java (90%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/node/IPlanVisitor.java (91%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/node/PlanNode.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/node/PlanNodeId.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/node/PlanNodeType.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/node/process/MultiChildProcessNode.java (89%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/node/process/ProcessNode.java (79%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/node/process/SingleChildProcessNode.java (90%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/node/process/TwoChildProcessNode.java (91%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/node/source/SourceNode.java (78%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/planner/plan/parameter/InputLocation.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/analyzer/NodeRef.java (91%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/BoundSignature.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/FunctionId.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/FunctionKind.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/ITableFunctionAINodeService.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/ITableFunctionAINodeServiceProvider.java (92%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/ITableFunctionFactory.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/InterpretedFunctionInvoker.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/LongVariableConstraint.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/OperatorType.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/ResolvedFunctionCallBuilder.java (85%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/Signature.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/TableBuiltinTableFunction.java (89%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/TableFunctionFactory.java (91%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/TypeVariableConstraint.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/arithmetic/AdditionResolver.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/arithmetic/DivisionResolver.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/arithmetic/ModulusResolver.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/arithmetic/MultiplicationResolver.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/arithmetic/SubtractionResolver.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/tvf/ClassifyTableFunction.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/tvf/ForecastTableFunction.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/tvf/PatternMatchTableFunction.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/tvf/TableFunctionUtils.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/tvf/match/MatchConfig.java (94%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/tvf/match/QetchAlgorithm.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/tvf/match/model/MatchState.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/tvf/match/model/PatternSegment.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/tvf/match/model/Point.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/tvf/match/model/RegexMatchState.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/function/tvf/match/model/Section.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/metadata/ColumnMetadata.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/metadata/ColumnSchema.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/metadata/FunctionNullability.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/metadata/ResolvedFunction.java (92%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/metadata/TableSchema.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/Assignments.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/DataOrganizationSpecification.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/OrderingScheme.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/SortOrder.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/Symbol.java (91%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/iterative/GroupReference.java (82%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/AggregationNode.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/ApplyNode.java (91%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/AssignUniqueId.java (81%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/CollectNode.java (85%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/CorrelatedJoinNode.java (85%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/EnforceSingleRowNode.java (78%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/ExceptNode.java (85%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/FillNode.java (69%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/FilterNode.java (80%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/GapFillNode.java (90%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/GroupNode.java (85%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/IntersectNode.java (85%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/JoinNode.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/LimitNode.java (82%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/LinearFillNode.java (88%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/MarkDistinctNode.java (88%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/Measure.java (92%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/MergeSortNode.java (85%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/OffsetNode.java (81%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/OutputNode.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/PatternRecognitionNode.java (91%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/PreviousFillNode.java (90%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/ProjectNode.java (82%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/RowNumberNode.java (91%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/RowsPerMatch.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/SemiJoinNode.java (89%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/SetOperationNode.java (91%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/SkipToPosition.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/SortNode.java (83%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/StreamSortNode.java (86%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/TableFunctionNode.java (94%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/TableFunctionProcessorNode.java (92%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/TopKNode.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/TopKRankingNode.java (88%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/UnionNode.java (88%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/ValueFillNode.java (81%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/ValuesNode.java (90%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/node/WindowNode.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/AggregationLabelSet.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/AggregationValuePointer.java (94%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/ClassifierValuePointer.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/IrAlternation.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/IrAnchor.java (92%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/IrConcatenation.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/IrEmpty.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/IrExclusion.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/IrLabel.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/IrPermutation.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/IrQuantified.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/IrQuantifier.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/IrRowPattern.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/IrRowPatternFlattener.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/IrRowPatternVisitor.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/LogicalIndexPointer.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/MatchNumberValuePointer.java (94%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/Patterns.java (78%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/ScalarValuePointer.java (94%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/planner/rowpattern/ValuePointer.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/security/Identity.java (94%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/AliasedRelation.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/AllColumns.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/AllRows.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/AnchorPattern.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/ArithmeticBinaryExpression.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/ArithmeticUnaryExpression.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/AstMemoryEstimationHelper.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/BetweenPredicate.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/BinaryLiteral.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/BooleanLiteral.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Cast.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/CoalesceExpression.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Columns.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/CommonQueryAstVisitor.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/ComparisonExpression.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/CurrentDatabase.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/CurrentTime.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/CurrentUser.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/DataType.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/DataTypeParameter.java (94%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/DecimalLiteral.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/DereferenceExpression.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/DoubleLiteral.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/EmptyPattern.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Except.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/ExcludedPattern.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/ExistsPredicate.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Expression.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Extract.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/FieldReference.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Fill.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/FloatLiteral.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/FrameBound.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/FunctionCall.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/GenericDataType.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/GenericLiteral.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/GroupBy.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/GroupingElement.java (94%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/GroupingSets.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/IAstVisitor.java (89%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Identifier.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/IfExpression.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/InListExpression.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/InPredicate.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Intersect.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/IsNotNullPredicate.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/IsNullPredicate.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Join.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/JoinCriteria.java (94%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/JoinOn.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/JoinUsing.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/LikePredicate.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Limit.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Literal.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/LogicalExpression.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/LongLiteral.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/MeasureDefinition.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/NaturalJoin.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Node.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/NodeLocation.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/NotExpression.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/NullIfExpression.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/NullLiteral.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/NumericParameter.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Offset.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/OneOrMoreQuantifier.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/OrderBy.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Parameter.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/PatternAlternation.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/PatternConcatenation.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/PatternPermutation.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/PatternQuantifier.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/PatternRecognitionRelation.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/PatternVariable.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/ProcessingMode.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/QualifiedName.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/QuantifiedComparisonExpression.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/QuantifiedPattern.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Query.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/QueryBody.java (94%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/QuerySpecification.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/RangeQuantifier.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Relation.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Row.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/RowPattern.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/SearchedCaseExpression.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Select.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/SelectItem.java (92%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/SetOperation.java (94%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/SimpleCaseExpression.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/SimpleGroupBy.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/SingleColumn.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/SkipTo.java (90%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/SortItem.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Statement.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/StringLiteral.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/SubqueryExpression.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/SubsetDefinition.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/SymbolReference.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Table.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/TableExpressionType.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/TableFunctionArgument.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/TableFunctionInvocation.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/TableFunctionTableArgument.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/TableSubquery.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Trim.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/TypeParameter.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Union.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Values.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/VariableDefinition.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/WhenClause.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/Window.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/WindowDefinition.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/WindowFrame.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/WindowReference.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/WindowSpecification.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/With.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/WithQuery.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/ZeroOrMoreQuantifier.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/ast/ZeroOrOneQuantifier.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/parser/CaseInsensitiveStream.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/parser/ParsingException.java (92%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/util/CommonQuerySqlFormatter.java (85%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/util/ExpressionFormatter.java (81%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/util/ReservedIdentifiers.java (91%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/sql/util/RowPatternFormatter.java (75%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/type/InternalTypeManager.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/type/NamedTypeSignature.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/type/ParameterKind.java (92%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/type/RowFieldName.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/type/StandardTypes.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/type/TypeId.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/type/TypeManager.java (87%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/type/TypeNotFoundException.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/type/TypeSignature.java (95%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/type/TypeSignatureParameter.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/type/TypeSignatureTranslator.java (81%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/utils/ResultColumnAppender.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/relational/utils/TypeUtil.java (96%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/statement/component/FillPolicy.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/udf/BuiltinAggregationFunction.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/udf/BuiltinScalarFunction.java (97%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/udf/BuiltinTimeSeriesGeneratingFunction.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/udf/TableUDFUtils.java (93%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/udf/UDFManagementService.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/plan/udf/UDTFForecast.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/utils/DateTimeUtils.java (99%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/utils/TimestampPrecisionUtils.java (98%) rename iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/{node_commons => queryengine}/utils/cte/CteDataStore.java (95%) diff --git a/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java b/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java index eca0a4e70062a..6e8ce1fd7cbae 100644 --- a/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java +++ b/external-service-impl/mqtt/src/main/java/org/apache/iotdb/mqtt/MPPPublishHandler.java @@ -20,9 +20,9 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBConfig; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java index 055882e60b87b..57d78a527dc75 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExceptionHandler.java @@ -17,14 +17,14 @@ package org.apache.iotdb.rest.protocol.table.v1.handler; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.auth.AuthException; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.DatabaseNotSetException; import org.apache.iotdb.db.exception.sql.StatementAnalyzeException; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExecuteStatementHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExecuteStatementHandler.java index 3bc5bcf5373d2..5ec75c0d4cef1 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExecuteStatementHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/ExecuteStatementHandler.java @@ -17,8 +17,8 @@ package org.apache.iotdb.rest.protocol.table.v1.handler; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CountDevice; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DescribeTable; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Explain; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/QueryDataSetHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/QueryDataSetHandler.java index 8e1a60cb421e7..6aa4d028cec35 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/QueryDataSetHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/QueryDataSetHandler.java @@ -18,8 +18,8 @@ package org.apache.iotdb.rest.protocol.table.v1.handler; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution; import org.apache.iotdb.rest.protocol.model.ExecutionStatus; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/StatementConstructionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/StatementConstructionHandler.java index 15c8f21224ef7..e4f9c23c69a7b 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/StatementConstructionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/handler/StatementConstructionHandler.java @@ -18,8 +18,8 @@ package org.apache.iotdb.rest.protocol.table.v1.handler; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.WriteProcessRejectException; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java index 5b6c2094b9b75..cfc71323be0d3 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/table/v1/impl/RestApiServiceImpl.java @@ -18,8 +18,8 @@ package org.apache.iotdb.rest.protocol.table.v1.impl; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/ExceptionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/ExceptionHandler.java index 551fbf8cd9955..761b01d7c6d4e 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/ExceptionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/ExceptionHandler.java @@ -17,7 +17,7 @@ package org.apache.iotdb.rest.protocol.v1.handler; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.auth.AuthException; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/StatementConstructionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/StatementConstructionHandler.java index 25647fdfb324e..74f679ec611d3 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/StatementConstructionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v1/handler/StatementConstructionHandler.java @@ -18,7 +18,7 @@ package org.apache.iotdb.rest.protocol.v1.handler; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.db.exception.WriteProcessRejectException; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/ExceptionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/ExceptionHandler.java index 6dc1bbe3cbabf..2a5d1d4416a8b 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/ExceptionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/ExceptionHandler.java @@ -17,7 +17,7 @@ package org.apache.iotdb.rest.protocol.v2.handler; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.auth.AuthException; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/StatementConstructionHandler.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/StatementConstructionHandler.java index 6175bd9111731..729517bf50031 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/StatementConstructionHandler.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/handler/StatementConstructionHandler.java @@ -18,7 +18,7 @@ package org.apache.iotdb.rest.protocol.v2.handler; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.db.exception.WriteProcessRejectException; import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException; diff --git a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/impl/RestApiServiceImpl.java b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/impl/RestApiServiceImpl.java index 5b206179c5033..e66d35617e1a9 100644 --- a/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/impl/RestApiServiceImpl.java +++ b/external-service-impl/rest/src/main/java/org/apache/iotdb/rest/protocol/v2/impl/RestApiServiceImpl.java @@ -18,8 +18,8 @@ package org.apache.iotdb.rest.protocol.v2.impl; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor; diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 072bc905caac0..c61509ed2c84c 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -129,6 +129,11 @@ node-commons 2.0.7-SNAPSHOT + + org.apache.iotdb + calc-commons + 2.0.7-SNAPSHOT + org.apache.iotdb iotdb-thrift-commons diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java index 74e5228b98937..51fd05d8eaf5d 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/EnvUtils.java @@ -31,11 +31,11 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import static org.apache.iotdb.commons.queryengine.utils.DateTimeUtils.convertLongToDate; import static org.apache.iotdb.consensus.ConsensusFactory.IOT_CONSENSUS; import static org.apache.iotdb.consensus.ConsensusFactory.IOT_CONSENSUS_V2; import static org.apache.iotdb.consensus.ConsensusFactory.RATIS_CONSENSUS; import static org.apache.iotdb.consensus.ConsensusFactory.SIMPLE_CONSENSUS; -import static org.apache.iotdb.commons.node_commons.utils.DateTimeUtils.convertLongToDate; import static org.apache.iotdb.it.env.cluster.ClusterConstant.CLUSTER_CONFIGURATIONS; import static org.apache.iotdb.it.env.cluster.ClusterConstant.DEFAULT_CONFIG_NODE_NUM; import static org.apache.iotdb.it.env.cluster.ClusterConstant.DEFAULT_DATA_NODE_NUM; diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java b/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java index 673b7bd81bf61..15c8a532b2b41 100644 --- a/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinAggregationFunctionEnum.java @@ -19,7 +19,7 @@ package org.apache.iotdb.itbase.constant; -import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.commons.queryengine.plan.udf.BuiltinAggregationFunction; import java.util.Arrays; import java.util.HashSet; @@ -58,11 +58,8 @@ public String getFunctionName() { private static final Set NATIVE_FUNCTION_NAMES = new HashSet<>( - Arrays.stream( - BuiltinAggregationFunction.values()) - .map( - BuiltinAggregationFunction - ::getFunctionName) + Arrays.stream(BuiltinAggregationFunction.values()) + .map(BuiltinAggregationFunction::getFunctionName) .collect(Collectors.toList())); public static Set getNativeFunctionNames() { 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 951582bbcc2a5..470e68de65153 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 @@ -19,6 +19,7 @@ package org.apache.iotdb.confignode.it.partition; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; @@ -28,7 +29,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowDatabaseStatement; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; 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/confignode/it/procedure/IoTDBProcedureIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/procedure/IoTDBProcedureIT.java index 39d27ff2ea245..b86067eddcd92 100644 --- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/procedure/IoTDBProcedureIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/procedure/IoTDBProcedureIT.java @@ -19,6 +19,7 @@ package org.apache.iotdb.confignode.it.procedure; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.SchemaConstant; @@ -28,7 +29,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp; import org.apache.iotdb.confignode.rpc.thrift.TTestOperation; import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowDatabaseStatement; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; 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/relational/it/db/it/IoTDBMultiTAGsWithAttributesTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBMultiTAGsWithAttributesTableIT.java index 7b9596960681f..5e18a8468c75e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBMultiTAGsWithAttributesTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBMultiTAGsWithAttributesTableIT.java @@ -35,12 +35,12 @@ import java.sql.Statement; import java.util.Arrays; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.FULL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.RIGHT; import static org.apache.iotdb.db.it.utils.TestUtils.tableAssertTestFail; import static org.apache.iotdb.db.it.utils.TestUtils.tableResultSetEqualTest; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.FULL; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode.JoinType.RIGHT; import static org.junit.Assert.fail; /** In this IT, table has more than one TAGs and Attributes. */ diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/udf/IoTDBSQLFunctionManagementIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/udf/IoTDBSQLFunctionManagementIT.java index 769567860e152..f414171cf469d 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/udf/IoTDBSQLFunctionManagementIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/udf/IoTDBSQLFunctionManagementIT.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.relational.it.db.it.udf; +import org.apache.iotdb.commons.queryengine.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; -import org.apache.iotdb.db.queryengine.plan.relational.function.TableBuiltinTableFunction; 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/builtinfunction/scalar/IoTDBCastFunctionTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java index 132b8a0343929..94a4157deb2b9 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBCastFunctionTableIT.java @@ -19,7 +19,7 @@ package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; 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/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java index d3ef2fb8d7845..bd7aeded17f9c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/builtinfunction/scalar/IoTDBFormatFunctionTableIT.java @@ -14,7 +14,7 @@ package org.apache.iotdb.relational.it.query.old.builtinfunction.scalar; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; 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/IoTDBArithmeticTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBArithmeticTableIT.java index e9d985d733c70..c4961da82221e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBArithmeticTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBArithmeticTableIT.java @@ -19,7 +19,7 @@ package org.apache.iotdb.relational.it.query.old.query; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; 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/view/old/query/IoTDBArithmeticTableViewIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/view/old/query/IoTDBArithmeticTableViewIT.java index d6a3817c44a9b..296a63cc678d0 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/view/old/query/IoTDBArithmeticTableViewIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/view/old/query/IoTDBArithmeticTableViewIT.java @@ -19,7 +19,7 @@ package org.apache.iotdb.relational.it.query.view.old.query; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.TableClusterIT; 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 e5e2301d64065..11695d786b871 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 @@ -19,13 +19,13 @@ package org.apache.iotdb.tool.data; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.cli.type.ExitType; import org.apache.iotdb.cli.utils.CliContext; import org.apache.iotdb.cli.utils.IoTPrinter; import org.apache.iotdb.cli.utils.JlineUtils; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.exception.ArgsErrorException; diff --git a/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl index a6c20aa6b9351..48beb26fedb86 100644 --- a/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticBinaryColumnTransformer.ftl @@ -25,14 +25,14 @@ <#--Main Part--> <#if (first.instance == "DATE" || first.instance == "TIMESTAMP") && (second.instance == "INT" || second.instance == "LONG")><#if operator.name == "Addition" || operator.name == "Subtraction"> -<@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/transformation/dag/column/binary/${className}.java" /> +<@pp.changeOutputFile name="/org/apache/iotdb/calc/transformation/dag/column/binary/${className}.java" /> <#--Date + int || Date + long || Timestamp + int || Timestamp + long--> <#--Date - int || Date - long || Timestamp - int || Timestamp - long--> -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -171,12 +171,12 @@ public class ${className} extends BinaryColumnTransformer { <#elseif (second.instance == "DATE" || second.instance =="TIMESTAMP") && (first.instance == "INT" || first.instance == "LONG")> <#if operator.name == "Addition"> <#--int + Date || long + Date || int + Timestamp || long + Timestamp--> -<@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/transformation/dag/column/binary/${className}.java" /> -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +<@pp.changeOutputFile name="/org/apache/iotdb/calc/transformation/dag/column/binary/${className}.java" /> +package org.apache.iotdb.calc.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -276,7 +276,7 @@ public class ${className} extends BinaryColumnTransformer { } <#elseif first.instance != "DATE" && first.instance != "TIMESTAMP" && second.instance != "DATE" && second.instance != "TIMESTAMP"> -<@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/transformation/dag/column/binary/${className}.java" /> +<@pp.changeOutputFile name="/org/apache/iotdb/calc/transformation/dag/column/binary/${className}.java" /> <#--int、long、float、double with + - * / %--> <#--assign resultType--> <#if first.dataType == "double" || second.dataType == "double"> @@ -289,11 +289,11 @@ public class ${className} extends BinaryColumnTransformer { <#assign resultType = "int" /> <#--Parting line--> -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl index 8bd04ede4d02b..f4aac11f133b7 100644 --- a/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticColumnTransformerApi.ftl @@ -18,22 +18,22 @@ */ <@pp.dropOutputFile /> -<@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticColumnTransformerApi.java" /> -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +<@pp.changeOutputFile name="/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticColumnTransformerApi.java" /> +package org.apache.iotdb.calc.transformation.dag.column.binary; import org.apache.tsfile.read.common.type.Type; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.AdditionResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.DivisionResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.ModulusResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.SubtractionResolver; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.DoubleNegationColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.FloatNegationColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.IntNegationColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LongNegationColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.TimestampNegationColumnTransformer; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.AdditionResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.DivisionResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.ModulusResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.MultiplicationResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.DoubleNegationColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.FloatNegationColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.IntNegationColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.LongNegationColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.TimestampNegationColumnTransformer; import java.time.ZoneId; import java.util.Arrays; diff --git a/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl index 2254378026727..1c71ecb76906e 100644 --- a/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/ArithmeticUnaryColumnTransformer.ftl @@ -22,11 +22,11 @@ <#assign newType = type.type?replace("Type","")> <#assign className = "${newType}NegationColumnTransformer"> <#if newType != "Date"> - <@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/transformation/dag/column/unary/${className}.java" /> -package org.apache.iotdb.calc_commons.transformation.dag.column.unary; + <@pp.changeOutputFile name="/org/apache/iotdb/calc/transformation/dag/column/unary/${className}.java" /> +package org.apache.iotdb.calc.transformation.dag.column.unary; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/codegen/templates/ModeAccumulator.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/ModeAccumulator.ftl index cdd2381331db3..c881219a97cf1 100644 --- a/iotdb-core/calc-commons/src/main/codegen/templates/ModeAccumulator.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/ModeAccumulator.ftl @@ -21,9 +21,9 @@ <#list allDataTypes.types as type> <#assign className = "${type.dataType?cap_first}ModeAccumulator"> - <@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/execution/aggregation/${className}.java" /> + <@pp.changeOutputFile name="/org/apache/iotdb/calc/execution/aggregation/${className}.java" /> -package org.apache.iotdb.calc_commons.execution.aggregation; +package org.apache.iotdb.calc.execution.aggregation; import com.google.common.collect.ImmutableList; import org.apache.iotdb.commons.conf.CommonDescriptor; diff --git a/iotdb-core/calc-commons/src/main/codegen/templates/constantFill.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/constantFill.ftl index 67083df12742d..88d01849ba95f 100644 --- a/iotdb-core/calc-commons/src/main/codegen/templates/constantFill.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/constantFill.ftl @@ -20,10 +20,10 @@ <#list allDataTypes.types as type> <#assign className = "${type.dataType?cap_first}ConstantFill"> - <@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/execution/operator/process/fill/constant/${className}.java" /> -package org.apache.iotdb.calc_commons.execution.operator.process.fill.constant; + <@pp.changeOutputFile name="/org/apache/iotdb/calc/execution/operator/process/fill/constant/${className}.java" /> +package org.apache.iotdb.calc.execution.operator.process.fill.constant; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc.execution.operator.process.fill.IFill; import org.apache.tsfile.read.common.block.column.${type.column}; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; diff --git a/iotdb-core/calc-commons/src/main/codegen/templates/linearFill.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/linearFill.ftl index 9d2bad3412db9..301708018b6ac 100644 --- a/iotdb-core/calc-commons/src/main/codegen/templates/linearFill.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/linearFill.ftl @@ -21,8 +21,8 @@ <#list decimalDataTypes.types as type> <#assign className = "${type.dataType?cap_first}LinearFill"> - <@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/execution/operator/process/fill/linear/${className}.java" /> -package org.apache.iotdb.calc_commons.execution.operator.process.fill.linear; + <@pp.changeOutputFile name="/org/apache/iotdb/calc/execution/operator/process/fill/linear/${className}.java" /> +package org.apache.iotdb.calc.execution.operator.process.fill.linear; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.${type.column}; diff --git a/iotdb-core/calc-commons/src/main/codegen/templates/previousFill.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/previousFill.ftl index 93a2c2cf9602b..e15f08935402d 100644 --- a/iotdb-core/calc-commons/src/main/codegen/templates/previousFill.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/previousFill.ftl @@ -21,10 +21,10 @@ <#list allDataTypes.types as type> <#assign className = "${type.dataType?cap_first}PreviousFill"> - <@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/execution/operator/process/fill/previous/${className}.java" /> -package org.apache.iotdb.calc_commons.execution.operator.process.fill.previous; + <@pp.changeOutputFile name="/org/apache/iotdb/calc/execution/operator/process/fill/previous/${className}.java" /> +package org.apache.iotdb.calc.execution.operator.process.fill.previous; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc.execution.operator.process.fill.IFill; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.${type.column}; import org.apache.tsfile.read.common.block.column.${type.column}Builder; diff --git a/iotdb-core/calc-commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl b/iotdb-core/calc-commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl index 149443bba02fe..22b0ff91efaf5 100644 --- a/iotdb-core/calc-commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl +++ b/iotdb-core/calc-commons/src/main/codegen/templates/previousFillWithTimeDuration.ftl @@ -21,11 +21,11 @@ <#list allDataTypes.types as type> <#assign className = "${type.dataType?cap_first}PreviousFillWithTimeDuration"> - <@pp.changeOutputFile name="/org/apache/iotdb/calc_commons/execution/operator/process/fill/previous/${className}.java" /> -package org.apache.iotdb.calc_commons.execution.operator.process.fill.previous; + <@pp.changeOutputFile name="/org/apache/iotdb/calc/execution/operator/process/fill/previous/${className}.java" /> +package org.apache.iotdb.calc.execution.operator.process.fill.previous; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFillFilter; +import org.apache.iotdb.calc.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc.execution.operator.process.fill.IFillFilter; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.${type.column}; import org.apache.tsfile.read.common.block.column.${type.column}Builder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/exception/MemoryNotEnoughException.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/exception/MemoryNotEnoughException.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/exception/MemoryNotEnoughException.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/exception/MemoryNotEnoughException.java index c7ec19d1df38a..1a2924916dec9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/exception/MemoryNotEnoughException.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/exception/MemoryNotEnoughException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.exception; +package org.apache.iotdb.calc.exception; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/exception/QueryProcessException.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/exception/QueryProcessException.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/exception/QueryProcessException.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/exception/QueryProcessException.java index ee6964ca1c39b..3d9753c4275d1 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/exception/QueryProcessException.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/exception/QueryProcessException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.exception; +package org.apache.iotdb.calc.exception; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/Accumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/aggregation/Accumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/Accumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/aggregation/Accumulator.java index 40557d36cac43..38b0c5353936d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/Accumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/aggregation/Accumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.aggregation; +package org.apache.iotdb.calc.execution.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/VarianceAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/aggregation/VarianceAccumulator.java similarity index 99% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/VarianceAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/aggregation/VarianceAccumulator.java index 027bf64ae999b..48972749c3a27 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/aggregation/VarianceAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/aggregation/VarianceAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.aggregation; +package org.apache.iotdb.calc.execution.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/AbstractOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/AbstractOperator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/AbstractOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/AbstractOperator.java index 76788f44f7706..cc09d7fe971f6 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/AbstractOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/AbstractOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator; +package org.apache.iotdb.calc.execution.operator; import org.apache.tsfile.common.conf.TSFileDescriptor; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/CommonOperatorContext.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/CommonOperatorContext.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/CommonOperatorContext.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/CommonOperatorContext.java index dfa9d87a0763b..2c99fa5d77777 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/CommonOperatorContext.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/CommonOperatorContext.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator; +package org.apache.iotdb.calc.execution.operator; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.TestOnly; import io.airlift.units.Duration; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNBuilder.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/GroupedTopNBuilder.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNBuilder.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/GroupedTopNBuilder.java index 38dc7e1f4d5fb..7911865076661 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNBuilder.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/GroupedTopNBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator; +package org.apache.iotdb.calc.execution.operator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/GroupedTopNRowNumberAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/GroupedTopNRowNumberAccumulator.java index f0cb42baf0b91..284e325ff5aed 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/GroupedTopNRowNumberAccumulator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator; +package org.apache.iotdb.calc.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; -import org.apache.iotdb.calc_commons.utils.HeapTraversal; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; +import org.apache.iotdb.calc.utils.HeapTraversal; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/GroupedTopNRowNumberBuilder.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/GroupedTopNRowNumberBuilder.java index 2ba5ee749a864..78c01ef14c071 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/GroupedTopNRowNumberBuilder.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/GroupedTopNRowNumberBuilder.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator; +package org.apache.iotdb.calc.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableList; @@ -35,7 +35,7 @@ import java.util.Iterator; import java.util.List; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class GroupedTopNRowNumberBuilder implements GroupedTopNBuilder { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/IdRegistry.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/IdRegistry.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/IdRegistry.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/IdRegistry.java index c1cee59b8a4a9..bb5abd17dddc9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/IdRegistry.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/IdRegistry.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator; +package org.apache.iotdb.calc.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntArrayFIFOQueue; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.IntArrayFIFOQueue; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/Operator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/Operator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/Operator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/Operator.java index 5fbff1dfbab55..a2c937e0bb7c3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/Operator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/Operator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator; +package org.apache.iotdb.calc.execution.operator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdComparisonStrategy.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/RowIdComparisonStrategy.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdComparisonStrategy.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/RowIdComparisonStrategy.java index 5167422c4b9bd..02b28466efa7b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdComparisonStrategy.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/RowIdComparisonStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator; +package org.apache.iotdb.calc.execution.operator; public interface RowIdComparisonStrategy { int compare(long leftRowId, long rightRowId); diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdHashStrategy.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/RowIdHashStrategy.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdHashStrategy.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/RowIdHashStrategy.java index fb7023bcf27ce..984efa9a96cf1 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowIdHashStrategy.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/RowIdHashStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator; +package org.apache.iotdb.calc.execution.operator; /** Hash strategy that evaluates over row IDs */ public interface RowIdHashStrategy { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReference.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/RowReference.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReference.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/RowReference.java index e45349793d367..b56c9f8983fa8 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReference.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/RowReference.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator; +package org.apache.iotdb.calc.execution.operator; /** * Reference to a row. diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReferenceTsBlockManager.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/RowReferenceTsBlockManager.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReferenceTsBlockManager.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/RowReferenceTsBlockManager.java index f62f438a1ceef..dd81ab2f55f7b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/RowReferenceTsBlockManager.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/RowReferenceTsBlockManager.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator; +package org.apache.iotdb.calc.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArrayFIFOQueue; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/SimpleTsBlockWithPositionComparator.java similarity index 82% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/SimpleTsBlockWithPositionComparator.java index 4189768e7c06e..8cab1352032a2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/SimpleTsBlockWithPositionComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/SimpleTsBlockWithPositionComparator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator; +package org.apache.iotdb.calc.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.calc.execution.operator.process.join.merge.MergeSortComparator; +import org.apache.iotdb.calc.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/TsBlockWithPositionComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/TsBlockWithPositionComparator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/TsBlockWithPositionComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/TsBlockWithPositionComparator.java index 8fab4fb2fe6fc..e8b50d7ab739c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/TsBlockWithPositionComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/TsBlockWithPositionComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator; +package org.apache.iotdb.calc.execution.operator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AbstractConsumeAllOperator.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AbstractConsumeAllOperator.java index 61e12c65ec9bf..c774023ca90dd 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractConsumeAllOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AbstractConsumeAllOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.AbstractOperator; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractFillOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AbstractFillOperator.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractFillOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AbstractFillOperator.java index 66ebf7113c88c..e354c6e9e628a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractFillOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AbstractFillOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.fill.IFill; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractLinearFillOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AbstractLinearFillOperator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractLinearFillOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AbstractLinearFillOperator.java index ae5e3069ff326..2e523d1bf4c4e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractLinearFillOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AbstractLinearFillOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractSortOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AbstractSortOperator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractSortOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AbstractSortOperator.java index 3f76f55f3c0a1..82d0b94b33476 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AbstractSortOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AbstractSortOperator.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; - -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortHeap; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.calc_commons.utils.sort.DiskSpiller; -import org.apache.iotdb.calc_commons.utils.sort.MemoryReader; -import org.apache.iotdb.calc_commons.utils.sort.SortBufferManager; -import org.apache.iotdb.calc_commons.utils.sort.SortReader; +package org.apache.iotdb.calc.execution.operator.process; + +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.calc.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.calc.utils.sort.DiskSpiller; +import org.apache.iotdb.calc.utils.sort.MemoryReader; +import org.apache.iotdb.calc.utils.sort.SortBufferManager; +import org.apache.iotdb.calc.utils.sort.SortReader; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IoTDBException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AggregationMergeSortOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AggregationMergeSortOperator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AggregationMergeSortOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AggregationMergeSortOperator.java index e78facd55d29b..6f106d680df4e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AggregationMergeSortOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AggregationMergeSortOperator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; - -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortHeap; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +package org.apache.iotdb.calc.execution.operator.process; + +import org.apache.iotdb.calc.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.calc.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AssignUniqueIdOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AssignUniqueIdOperator.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AssignUniqueIdOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AssignUniqueIdOperator.java index 11ad55dd82f7e..f7faaadc0a519 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/AssignUniqueIdOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/AssignUniqueIdOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/CollectOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/CollectOperator.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/CollectOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/CollectOperator.java index 4dcbe97a1c3a9..921d273d04e8a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/CollectOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/CollectOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.utils.TestOnly; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/EnforceSingleRowOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/EnforceSingleRowOperator.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/EnforceSingleRowOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/EnforceSingleRowOperator.java index 87feea1e18555..6a300c2cdfe64 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/EnforceSingleRowOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/EnforceSingleRowOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/FilterAndProjectOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/FilterAndProjectOperator.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/FilterAndProjectOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/FilterAndProjectOperator.java index 1e26c4858d4ef..16e0cd7b33069 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/FilterAndProjectOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/FilterAndProjectOperator.java @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; - -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.transformation.dag.column.AbstractCaseWhenThenColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.MappableUDFColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +package org.apache.iotdb.calc.execution.operator.process; + +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.transformation.dag.column.AbstractCaseWhenThenColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.FailFunctionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.MappableUDFColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/LimitOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/LimitOperator.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/LimitOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/LimitOperator.java index c3622fac859c2..9f21dcf86a66b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/LimitOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/LimitOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MappingCollectOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/MappingCollectOperator.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MappingCollectOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/MappingCollectOperator.java index 81062dbfff6f2..8bc1c18e9e66a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MappingCollectOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/MappingCollectOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MergeSortOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/MergeSortOperator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MergeSortOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/MergeSortOperator.java index 9f11194da8c61..613d3f549d722 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/MergeSortOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/MergeSortOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortHeap; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.calc.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/OffsetOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/OffsetOperator.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/OffsetOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/OffsetOperator.java index 377a71a448152..376f3d9d2215a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/OffsetOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/OffsetOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PatternRecognitionOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/PatternRecognitionOperator.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PatternRecognitionOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/PatternRecognitionOperator.java index 8ab540850d24b..d0ee968c0e569 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PatternRecognitionOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/PatternRecognitionOperator.java @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; - -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregator; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternPartitionExecutor; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition; +package org.apache.iotdb.calc.execution.operator.process; + +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.LogicalIndexNavigation; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PatternPartitionExecutor; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PatternVariableRecognizer; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.expression.PatternExpressionComputation; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.Matcher; +import org.apache.iotdb.calc.execution.operator.process.window.utils.RowComparator; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SkipToPosition; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -50,8 +50,8 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class PatternRecognitionOperator implements ProcessOperator { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/PreviousFillWithGroupOperator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/PreviousFillWithGroupOperator.java index 9ab1ff1a03e61..06f1d63547001 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/PreviousFillWithGroupOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/PreviousFillWithGroupOperator.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ProcessOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/ProcessOperator.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ProcessOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/ProcessOperator.java index 48efd400ae87f..22462a5544644 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ProcessOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/ProcessOperator.java @@ -17,8 +17,8 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; public interface ProcessOperator extends Operator {} diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/SortOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/SortOperator.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/SortOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/SortOperator.java index fae2c5eebf5d7..0b546eee70216 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/SortOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/SortOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.calc_commons.utils.sort.DiskSpiller; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.calc.utils.sort.DiskSpiller; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableFillOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableFillOperator.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableFillOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableFillOperator.java index 8634b27f31617..5b41bb657de18 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableFillOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableFillOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.fill.IFill; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableLinearFillOperator.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableLinearFillOperator.java index 3d5d59c139bc5..b0f75ef4b29ee 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableLinearFillOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.fill.ILinearFill; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableLinearFillWithGroupOperator.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableLinearFillWithGroupOperator.java index 77922812418f7..883ee156edccd 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableLinearFillWithGroupOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableLinearFillWithGroupOperator.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableMergeSortOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableMergeSortOperator.java similarity index 84% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableMergeSortOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableMergeSortOperator.java index 2c1bc996dcb6f..136747151a718 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableMergeSortOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableMergeSortOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableSortOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableSortOperator.java similarity index 82% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableSortOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableSortOperator.java index b3ab294256c1c..b09b3cb5b56ec 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableSortOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableSortOperator.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.calc_commons.utils.sort.TableDiskSpiller; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.calc.utils.sort.TableDiskSpiller; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableStreamSortOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableStreamSortOperator.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableStreamSortOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableStreamSortOperator.java index 2e7f6a30bd6fa..a1cb2c7321692 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableStreamSortOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableStreamSortOperator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.calc_commons.utils.sort.TableDiskSpiller; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.calc.utils.sort.TableDiskSpiller; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableTopKOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableTopKOperator.java similarity index 84% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableTopKOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableTopKOperator.java index 7d161d54a1aa7..2a7d11657b7de 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TableTopKOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TableTopKOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TopKOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TopKOperator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TopKOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TopKOperator.java index 29a01beb36ecf..bdb424e15b812 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/TopKOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/TopKOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; - -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortHeap; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +package org.apache.iotdb.calc.execution.operator.process; + +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.calc.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ValuesOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/ValuesOperator.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ValuesOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/ValuesOperator.java index bb4a21bf7dffe..35ca8a4252f66 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/ValuesOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/ValuesOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process; +package org.apache.iotdb.calc.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFill.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/IFill.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFill.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/IFill.java index 34e000a47c9f3..1059a80799e54 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFill.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/IFill.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.fill; +package org.apache.iotdb.calc.execution.operator.process.fill; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFillFilter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/IFillFilter.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFillFilter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/IFillFilter.java index 4d0b111cb76ef..77e7436bb5849 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/IFillFilter.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/IFillFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.fill; +package org.apache.iotdb.calc.execution.operator.process.fill; public interface IFillFilter { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/ILinearFill.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/ILinearFill.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/ILinearFill.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/ILinearFill.java index 297c2679996c3..0a39604d8a045 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/ILinearFill.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/ILinearFill.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.fill; +package org.apache.iotdb.calc.execution.operator.process.fill; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java index 5e464e7ddc239..c3805e121b502 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/AbstractMonthIntervalFillFilter.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.fill.filter; +package org.apache.iotdb.calc.execution.operator.process.fill.filter; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFillFilter; +import org.apache.iotdb.calc.execution.operator.process.fill.IFillFilter; import java.time.ZoneId; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/FixedIntervalFillFilter.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/FixedIntervalFillFilter.java index 79148eda56eb0..8fbd4ce379d78 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/FixedIntervalFillFilter.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/FixedIntervalFillFilter.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.fill.filter; +package org.apache.iotdb.calc.execution.operator.process.fill.filter; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFillFilter; +import org.apache.iotdb.calc.execution.operator.process.fill.IFillFilter; public class FixedIntervalFillFilter implements IFillFilter { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java index 48bf75c638ef6..4ff2a56f4a3fd 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/MonthIntervalMSFillFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.fill.filter; +package org.apache.iotdb.calc.execution.operator.process.fill.filter; import java.time.Instant; import java.time.LocalDateTime; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java index be94145a2da0f..a19f70365f1c9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/MonthIntervalNSFillFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.fill.filter; +package org.apache.iotdb.calc.execution.operator.process.fill.filter; import java.time.Instant; import java.time.LocalDateTime; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java index 02b8b8eca1a76..91674776010fb 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/filter/MonthIntervalUSFillFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.fill.filter; +package org.apache.iotdb.calc.execution.operator.process.fill.filter; import java.time.Instant; import java.time.LocalDateTime; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityFill.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/identity/IdentityFill.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityFill.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/identity/IdentityFill.java index 807fae6153f73..f504eec6d9c05 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityFill.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/identity/IdentityFill.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.fill.identity; +package org.apache.iotdb.calc.execution.operator.process.fill.identity; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc.execution.operator.process.fill.IFill; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/identity/IdentityLinearFill.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/identity/IdentityLinearFill.java index 756215c05863e..d6650f273ea03 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/identity/IdentityLinearFill.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/identity/IdentityLinearFill.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.fill.identity; +package org.apache.iotdb.calc.execution.operator.process.fill.identity; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc.execution.operator.process.fill.ILinearFill; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/linear/LinearFill.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/linear/LinearFill.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/linear/LinearFill.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/linear/LinearFill.java index 037613c03b789..2231b4f029b0c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/fill/linear/LinearFill.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/fill/linear/LinearFill.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.fill.linear; +package org.apache.iotdb.calc.execution.operator.process.fill.linear; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc.execution.operator.process.fill.ILinearFill; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/PartitionRecognizer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/PartitionRecognizer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/PartitionRecognizer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/PartitionRecognizer.java index 68e201cd1173c..deb225f219853 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/PartitionRecognizer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/PartitionRecognizer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.function; +package org.apache.iotdb.calc.execution.operator.process.function; -import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionState; -import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.Slice; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.process.function.partition.PartitionState; +import org.apache.iotdb.calc.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.type.Type; @@ -32,8 +32,8 @@ import java.util.List; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; +import static org.apache.iotdb.calc.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; public class PartitionRecognizer { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/TableFunctionLeafOperator.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/TableFunctionLeafOperator.java index 13deffd8b5ab7..0a7f92b249ff8 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionLeafOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/TableFunctionLeafOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.function; +package org.apache.iotdb.calc.execution.operator.process.function; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/TableFunctionOperator.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/TableFunctionOperator.java index 0e27651bf357a..e4f11d7cd49fa 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/TableFunctionOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/TableFunctionOperator.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.function; +package org.apache.iotdb.calc.execution.operator.process.function; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.AggregationMergeSortOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionCache; -import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionState; -import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.Slice; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.AggregationMergeSortOperator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.execution.operator.process.function.partition.PartitionCache; +import org.apache.iotdb.calc.execution.operator.process.function.partition.PartitionState; +import org.apache.iotdb.calc.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; import org.apache.iotdb.udf.api.relational.table.processor.TableFunctionDataProcessor; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionCache.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/partition/PartitionCache.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionCache.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/partition/PartitionCache.java index 3b29e3da0266c..a33113d8f4849 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionCache.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/partition/PartitionCache.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.function.partition; +package org.apache.iotdb.calc.execution.operator.process.function.partition; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionState.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/partition/PartitionState.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionState.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/partition/PartitionState.java index 5dd0159082b17..4f78ec82d387b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/PartitionState.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/partition/PartitionState.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.function.partition; +package org.apache.iotdb.calc.execution.operator.process.function.partition; public class PartitionState { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/Slice.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/partition/Slice.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/Slice.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/partition/Slice.java index 90b2c0c8c1d05..aec1722a1baad 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/function/partition/Slice.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/function/partition/Slice.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.function.partition; +package org.apache.iotdb.calc.execution.operator.process.function.partition; -import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.calc.utils.ObjectTypeUtils; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.type.Type; @@ -39,7 +39,7 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.RecordIterator.OBJECT_ERR_MSG; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.RecordIterator.OBJECT_ERR_MSG; import static org.apache.iotdb.udf.api.type.Type.OBJECT; /** Parts of partition. */ diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/AbstractGapFillOperator.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/AbstractGapFillOperator.java index d1d268232fdcf..52fb6b59bace7 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/AbstractGapFillOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; - -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +package org.apache.iotdb.calc.execution.operator.process.gapfill; + +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java index 4cfd205761fdc..693091e73ae76 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/AbstractGapFillWGroupOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; +package org.apache.iotdb.calc.execution.operator.process.gapfill; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java similarity index 83% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java index 0f0c76a716dc5..0bb942a1e883b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/AbstractGapFillWoGroupOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; +package org.apache.iotdb.calc.execution.operator.process.gapfill; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java similarity index 82% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java index 731a3435235cd..8fee5f74150e2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/GapFillWGroupWMoOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; +package org.apache.iotdb.calc.execution.operator.process.gapfill; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; @@ -30,7 +30,7 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; // with month interval public class GapFillWGroupWMoOperator extends AbstractGapFillWGroupOperator { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java similarity index 82% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java index 44599c4ffc3eb..dc392cc6fc76e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/GapFillWGroupWoMoOperator.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; +package org.apache.iotdb.calc.execution.operator.process.gapfill; // without month interval -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.tsfile.enums.TSDataType; @@ -31,7 +31,7 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWGroupWoMoOperator extends AbstractGapFillWGroupOperator { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java similarity index 83% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java index 5f9e6feecfff3..a0c0689ab64da 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/GapFillWoGroupWMoOperator.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; +package org.apache.iotdb.calc.execution.operator.process.gapfill; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.tsfile.enums.TSDataType; import java.time.ZoneId; import java.util.List; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWoGroupWMoOperator extends AbstractGapFillWoGroupOperator { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java similarity index 82% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java index fcf73c46ce463..8b9cac1bdd9d2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/gapfill/GapFillWoGroupWoMoOperator.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.gapfill; +package org.apache.iotdb.calc.execution.operator.process.gapfill; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.tsfile.enums.TSDataType; import java.util.List; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.nextDateBin; public class GapFillWoGroupWoMoOperator extends AbstractGapFillWoGroupOperator { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java index 56b79d668c4c3..8e005fbc97d0b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/SimpleNestedLoopCrossJoinOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join; - -import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +package org.apache.iotdb.calc.execution.operator.process.join; + +import org.apache.iotdb.calc.execution.operator.AbstractOperator; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/MergeSortComparator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/MergeSortComparator.java index b8ca267ec729a..a18784e6eecc9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/MergeSortComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/MergeSortComparator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge; +package org.apache.iotdb.calc.execution.operator.process.join.merge; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.external.commons.collections4.comparators.ComparatorChain; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/SortKeyComparator.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/SortKeyComparator.java index 5a5b479704950..fac0f077eeeba 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/SortKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/SortKeyComparator.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge; +package org.apache.iotdb.calc.execution.operator.process.join.merge; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import java.util.Comparator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java index e040340237065..877e02e445ff2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscBinaryTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java index 6528a3248415f..fb5404103d162 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscBooleanTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java index da857846c0701..589ddfa0b15bb 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscDoubleTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java index 7b271a6cba360..75cc370f9d786 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscFloatTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java index 41ce8b0192db8..e3dd6b5ab6e17 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscIntTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java index d5d45d1b90a51..60134c28ae7b9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscLongTypeIgnoreEqualJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java index 0b3f214e56a4e..23a1c5dde2968 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/AscLongTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java index 66568c34041a5..0f6654fadd4b2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescBinaryTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java index 11a4d94cb8fcb..a716e7ac94519 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescBooleanTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java index 3ddd161a9f735..228b42ba46cd3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescDoubleTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java index eb345672218bf..e99dd6f85674f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescFloatTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java index 92c7d7b8ea529..96f1cd6f28a64 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescIntTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java index 8c2ce4d9e3971..b2899fbfc722c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescLongTypeIgnoreEqualJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java index dff8ae79aef29..9ecc482807e07 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/DescLongTypeJoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/JoinKeyComparator.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/JoinKeyComparator.java index 5314432381a6f..ab9802050485a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/JoinKeyComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java index 9560ed860fb11..af59f42e92b49 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/join/merge/comparator/JoinKeyComparatorFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator; +package org.apache.iotdb.calc.execution.operator.process.join.merge.comparator; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/LogicalIndexNavigation.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/LogicalIndexNavigation.java index c425cb40893c0..fbf7e709e1f92 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/LogicalIndexNavigation.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/LogicalIndexNavigation.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc.execution.operator.process.rowpattern; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.LogicalIndexPointer; import java.util.Collections; import java.util.Map; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternAggregationTracker.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternAggregationTracker.java index 1871d3d91ed72..7678e38f22a41 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregationTracker.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternAggregationTracker.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc.execution.operator.process.rowpattern; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.IntList; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.IntList; import java.util.Set; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternAggregator.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternAggregator.java index 8b06eacd7a49a..d8ac5f5052138 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternAggregator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc.execution.operator.process.rowpattern; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.TableAccumulator; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.function.BoundSignature; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -33,7 +33,7 @@ import java.util.List; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; /** * This class computes an aggregate function result in row pattern recognition context. diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternAggregators.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternAggregators.java index 9372711c34e4c..7d0667760f9ea 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternAggregators.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternAggregators.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc.execution.operator.process.rowpattern; import java.util.Arrays; import java.util.List; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternPartitionExecutor.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternPartitionExecutor.java index c585b4883e5b1..8f59701b2fdb5 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternPartitionExecutor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternPartitionExecutor.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; - -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer.PatternVariableComputation; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.MatchResult; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; +package org.apache.iotdb.calc.execution.operator.process.rowpattern; + +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PatternVariableRecognizer.PatternVariableComputation; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.expression.PatternExpressionComputation; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.MatchResult; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.Matcher; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.calc.execution.operator.process.window.utils.RowComparator; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SkipToPosition; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternVariableRecognizer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternVariableRecognizer.java index 22b0934a72356..e9a40006ce272 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PatternVariableRecognizer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PatternVariableRecognizer.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc.execution.operator.process.rowpattern; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.Computation; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.expression.Computation; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.expression.PatternExpressionComputation; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import java.util.List; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PhysicalAggregationPointer.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PhysicalAggregationPointer.java index 851fbaff78a93..5bb36aa702855 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalAggregationPointer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PhysicalAggregationPointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc.execution.operator.process.rowpattern; public class PhysicalAggregationPointer implements PhysicalValueAccessor { private final int index; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PhysicalValueAccessor.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PhysicalValueAccessor.java index b5bd56d31c770..cf9abfb210de0 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValueAccessor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PhysicalValueAccessor.java @@ -17,6 +17,6 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc.execution.operator.process.rowpattern; public interface PhysicalValueAccessor {} diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PhysicalValuePointer.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PhysicalValuePointer.java index 0ba9588b1136b..d10039d49a3f1 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/PhysicalValuePointer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/PhysicalValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern; +package org.apache.iotdb.calc.execution.operator.process.rowpattern; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/ArithmeticOperator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/ArithmeticOperator.java index ba0f3838a7ea0..de2196356285a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ArithmeticOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/ArithmeticOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.expression; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/BinaryComputation.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/BinaryComputation.java index f9d245157347a..8732c07a9c42e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryComputation.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/BinaryComputation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.expression; import java.util.List; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/BinaryOperator.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/BinaryOperator.java index 31779220c8995..d63c0d0ef4f48 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/BinaryOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/BinaryOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.expression; public interface BinaryOperator { /** diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/CastComputation.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/CastComputation.java index 1455467ed062d..1b50f37bc76e8 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/CastComputation.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/CastComputation.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericDataType; import java.util.List; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/ComparisonOperator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/ComparisonOperator.java index d6d7677f34fdb..0a3c0c1105bbb 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ComparisonOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/ComparisonOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.expression; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/Computation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/Computation.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/Computation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/Computation.java index 1d4dede019ef4..187002f7e201c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/Computation.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/Computation.java @@ -17,25 +17,25 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.expression; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers.Assignment; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers.Assignment; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import java.util.ArrayList; import java.util.HashMap; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/ConstantComputation.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/ConstantComputation.java index 7589cbbe08647..068a47074858a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ConstantComputation.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/ConstantComputation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.expression; import java.util.List; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/LogicalOperator.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/LogicalOperator.java index 55b90c66cdfe0..1f7fcc99bb1b3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/LogicalOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/LogicalOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.expression; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/NaryComputation.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/NaryComputation.java index ab78043bdfb6a..b077ccd1b3593 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryComputation.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/NaryComputation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.expression; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/NaryOperator.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/NaryOperator.java index 5e05773859fd3..6bbc102aa986d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/NaryOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/NaryOperator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.expression; import java.util.List; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java index 69e76be366c43..d27d028b361e6 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/PatternExpressionComputation.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; - -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregator; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalAggregationPointer; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValueAccessor; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.expression; + +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PhysicalAggregationPointer; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PhysicalValueAccessor; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PhysicalValuePointer; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.enums.TSDataType; @@ -41,8 +41,8 @@ import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; -import static org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; +import static org.apache.iotdb.calc.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; +import static org.apache.iotdb.calc.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; import static org.apache.tsfile.enums.TSDataType.STRING; public class PatternExpressionComputation { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/ReferenceComputation.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/ReferenceComputation.java index fb96771917864..b659103f5cdf5 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/expression/ReferenceComputation.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/expression/ReferenceComputation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.expression; import java.util.List; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/ArrayView.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/ArrayView.java index c01bf3cb29c7b..718f1aafe48a4 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/ArrayView.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/ArrayView.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; import com.google.common.annotations.VisibleForTesting; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Done.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Done.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Done.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Done.java index ccf999a18512b..5599f223fc429 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Done.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Done.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; class Done implements Instruction { @Override diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Instruction.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Instruction.java index e14629263f654..6f24533011145 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Instruction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Instruction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; interface Instruction { enum Type { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/IntList.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/IntList.java index 1d6f26ae1a962..423f0281b81aa 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntList.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/IntList.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/IntMultimap.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/IntMultimap.java index 66200a73d6a15..df701f9e9d425 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntMultimap.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/IntMultimap.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/IntStack.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/IntStack.java index 6d0569731ad80..d558e8af7f8ff 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IntStack.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/IntStack.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java index 63b46e773a727..fccf755bcaba5 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/IrRowPatternToProgramRewriter.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; - -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAlternation; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAnchor; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrConcatenation; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrEmpty; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrExclusion; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrPermutation; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantified; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPatternVisitor; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; + +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrAlternation; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrAnchor; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrConcatenation; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrEmpty; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrExclusion; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrPermutation; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrQuantified; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrRowPatternVisitor; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Jump.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Jump.java index c56b6153cb743..2d47f70221ab7 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Jump.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Jump.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; import java.util.Objects; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/MatchEnd.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/MatchEnd.java index d631b47b6bfb5..54e1686e4d267 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchEnd.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/MatchEnd.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; class MatchEnd implements Instruction { @Override diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/MatchLabel.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/MatchLabel.java index e5d37e7dff0a4..d4596fff32107 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchLabel.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/MatchLabel.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; import java.util.Objects; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/MatchResult.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/MatchResult.java index b9c1e7b086f3a..0e3511c0a526f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchResult.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/MatchResult.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/MatchStart.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/MatchStart.java index 8c519de7fed5b..764cb9ad8e16f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/MatchStart.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/MatchStart.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; class MatchStart implements Instruction { @Override diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Matcher.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Matcher.java index cce19c04a8841..0d3f6889dbc42 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Matcher.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Matcher.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregator; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregators; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PatternAggregators; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PatternVariableRecognizer; import org.apache.tsfile.utils.RamUsageEstimator; import java.util.List; -import static org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.MatchResult.NO_MATCH; +import static org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.MatchResult.NO_MATCH; public class Matcher { private final Program program; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/PatternCaptures.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/PatternCaptures.java index b903407dd28f9..26bf682d11cb2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/PatternCaptures.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/PatternCaptures.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Program.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Program.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Program.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Program.java index 2a508b06a88e3..f43e5f876d565 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Program.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Program.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Save.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Save.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Save.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Save.java index 8c4c1f8c1a93a..f20e300d3e704 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Save.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Save.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; class Save implements Instruction { @Override diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Split.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Split.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Split.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Split.java index c58d4d9d80d0b..bb9d64fb6e807 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/rowpattern/matcher/Split.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/rowpattern/matcher/Split.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher; +package org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher; import java.util.Objects; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/RowNumberOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/RowNumberOperator.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/RowNumberOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/RowNumberOperator.java index c05fc0481b0ac..e676c3a7da419 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/RowNumberOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/RowNumberOperator.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window; +package org.apache.iotdb.calc.execution.operator.process.window; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -44,8 +44,8 @@ import java.util.Map; import java.util.Optional; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; public class RowNumberOperator implements ProcessOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TableWindowOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/TableWindowOperator.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TableWindowOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/TableWindowOperator.java index 451e012dca072..8dde114569641 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TableWindowOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/TableWindowOperator.java @@ -17,22 +17,22 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window; - -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.function.PartitionRecognizer; -import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionCache; -import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionState; -import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.Slice; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +package org.apache.iotdb.calc.execution.operator.process.window; + +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.execution.operator.process.function.PartitionRecognizer; +import org.apache.iotdb.calc.execution.operator.process.function.partition.PartitionCache; +import org.apache.iotdb.calc.execution.operator.process.function.partition.PartitionState; +import org.apache.iotdb.calc.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.calc.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -49,7 +49,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; public class TableWindowOperator implements ProcessOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TopKRankingOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/TopKRankingOperator.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TopKRankingOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/TopKRankingOperator.java index 33da80a749187..e42a935d4e0a8 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/TopKRankingOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/TopKRankingOperator.java @@ -17,22 +17,22 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window; - -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.GroupedTopNBuilder; -import org.apache.iotdb.calc_commons.execution.operator.GroupedTopNRowNumberBuilder; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.SimpleTsBlockWithPositionComparator; -import org.apache.iotdb.calc_commons.execution.operator.TsBlockWithPositionComparator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.NoChannelGroupByHash; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +package org.apache.iotdb.calc.execution.operator.process.window; + +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.GroupedTopNBuilder; +import org.apache.iotdb.calc.execution.operator.GroupedTopNRowNumberBuilder; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.SimpleTsBlockWithPositionComparator; +import org.apache.iotdb.calc.execution.operator.TsBlockWithPositionComparator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.NoChannelGroupByHash; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/WindowFunction.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/WindowFunction.java index 3d2b9a4c396e7..6ce00df0d7edb 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/WindowFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function; +package org.apache.iotdb.calc.execution.operator.process.window.function; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/WindowFunctionFactory.java similarity index 62% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/WindowFunctionFactory.java index 8151498f3a5a8..5a88fbf786d18 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/WindowFunctionFactory.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/WindowFunctionFactory.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function; +package org.apache.iotdb.calc.execution.operator.process.window.function; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.CumeDistFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.DenseRankFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.NTileFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.PercentRankFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.RankFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.RowNumberFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.FirstValueFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.LagFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.LastValueFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.LeadFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.NthValueFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.rank.CumeDistFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.rank.DenseRankFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.rank.NTileFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.rank.PercentRankFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.rank.RankFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.rank.RowNumberFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.value.FirstValueFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.value.LagFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.value.LastValueFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.value.LeadFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.value.NthValueFunction; import java.util.List; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java index f7340df434c09..2b1ec10343901 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/aggregate/AggregationWindowFunction.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate; +package org.apache.iotdb.calc.execution.operator.process.window.function.aggregate; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/aggregate/WindowAggregator.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/aggregate/WindowAggregator.java index 5e4e0d164f3c5..874d365d61a7a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/aggregate/WindowAggregator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/aggregate/WindowAggregator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate; +package org.apache.iotdb.calc.execution.operator.process.window.function.aggregate; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/CumeDistFunction.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/CumeDistFunction.java index 33c328c220a1a..7e8c9535f0c41 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/CumeDistFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/CumeDistFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank; +package org.apache.iotdb.calc.execution.operator.process.window.function.rank; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/DenseRankFunction.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/DenseRankFunction.java index 9f1b518543563..f116847007da3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/DenseRankFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/DenseRankFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank; +package org.apache.iotdb.calc.execution.operator.process.window.function.rank; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/NTileFunction.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/NTileFunction.java index 91a8c029699a5..c89b43124d67a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/NTileFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/NTileFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank; +package org.apache.iotdb.calc.execution.operator.process.window.function.rank; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/PercentRankFunction.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/PercentRankFunction.java index 722aef5d034a1..ea29c2a95ccfd 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/PercentRankFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/PercentRankFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank; +package org.apache.iotdb.calc.execution.operator.process.window.function.rank; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/RankFunction.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/RankFunction.java index 5ec6ed9e78a70..2612312724289 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/RankFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank; +package org.apache.iotdb.calc.execution.operator.process.window.function.rank; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/RankWindowFunction.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/RankWindowFunction.java index 7e918a1c989b3..ad6b64f6e9e89 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RankWindowFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/RankWindowFunction.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank; +package org.apache.iotdb.calc.execution.operator.process.window.function.rank; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/RowNumberFunction.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/RowNumberFunction.java index 024d32531cbda..b9343c702ee86 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/rank/RowNumberFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/rank/RowNumberFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank; +package org.apache.iotdb.calc.execution.operator.process.window.function.rank; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/FirstValueFunction.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/FirstValueFunction.java index 6407dd0ff06a0..efd9f0309b5b3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/FirstValueFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/FirstValueFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.value; +package org.apache.iotdb.calc.execution.operator.process.window.function.value; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LagFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/LagFunction.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LagFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/LagFunction.java index 415824a961ebc..9ac4708c33c3e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LagFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/LagFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.value; +package org.apache.iotdb.calc.execution.operator.process.window.function.value; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/LastValueFunction.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/LastValueFunction.java index 3739aabac6573..d9c918dda32b5 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LastValueFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/LastValueFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.value; +package org.apache.iotdb.calc.execution.operator.process.window.function.value; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LeadFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/LeadFunction.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LeadFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/LeadFunction.java index 72ba21f97f143..37b71595f0f65 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/LeadFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/LeadFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.value; +package org.apache.iotdb.calc.execution.operator.process.window.function.value; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/NthValueFunction.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/NthValueFunction.java index 43380e8f103ea..f6b8ced1921c6 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/NthValueFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/NthValueFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.value; +package org.apache.iotdb.calc.execution.operator.process.window.function.value; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/ValueWindowFunction.java similarity index 84% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/ValueWindowFunction.java index e0313d3861f10..daf30551e49c9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/function/value/ValueWindowFunction.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/function/value/ValueWindowFunction.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.function.value; +package org.apache.iotdb.calc.execution.operator.process.window.function.value; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/Partition.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/Partition.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/Partition.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/Partition.java index 629a8fb23e190..eebbee937d05e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/Partition.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/Partition.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.partition; +package org.apache.iotdb.calc.execution.operator.process.window.partition; -import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.Slice; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.calc.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.calc.execution.operator.process.window.utils.ColumnList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/PartitionExecutor.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/PartitionExecutor.java index 6bae5110038fb..bdf55cae5b18d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/PartitionExecutor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/PartitionExecutor.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.partition; - -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.Frame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.GroupsFrame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.RangeFrame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.RowsFrame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; +package org.apache.iotdb.calc.execution.operator.process.window.partition; + +import org.apache.iotdb.calc.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.Frame; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.GroupsFrame; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.RangeFrame; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.RowsFrame; +import org.apache.iotdb.calc.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.calc.execution.operator.process.window.utils.Range; +import org.apache.iotdb.calc.execution.operator.process.window.utils.RowComparator; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/Frame.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/Frame.java similarity index 84% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/Frame.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/Frame.java index 3d00d69a05f7a..b207f51399258 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/Frame.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/Frame.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame; +package org.apache.iotdb.calc.execution.operator.process.window.partition.frame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; +import org.apache.iotdb.calc.execution.operator.process.window.utils.Range; public interface Frame { Range getRange(int currentPosition, int currentGroup, int peerGroupStart, int peerGroupEnd); diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/FrameInfo.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/FrameInfo.java index 00a081c8e1e98..5b9965b141afc 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/FrameInfo.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/FrameInfo.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame; +package org.apache.iotdb.calc.execution.operator.process.window.partition.frame; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame; import java.util.Optional; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/GroupsFrame.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/GroupsFrame.java index cc29160da1fcf..c89de0d0403e5 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/GroupsFrame.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/GroupsFrame.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame; +package org.apache.iotdb.calc.execution.operator.process.window.partition.frame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.calc.execution.operator.process.window.utils.Range; +import org.apache.iotdb.calc.execution.operator.process.window.utils.RowComparator; import org.apache.iotdb.commons.exception.SemanticException; import java.util.List; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/RangeFrame.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/RangeFrame.java index 3d72128f8fb5f..60fa6619bd818 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RangeFrame.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/RangeFrame.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame; +package org.apache.iotdb.calc.execution.operator.process.window.partition.frame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.calc.execution.operator.process.window.utils.Range; +import org.apache.iotdb.calc.execution.operator.process.window.utils.RowComparator; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.enums.TSDataType; @@ -31,9 +31,9 @@ import java.util.List; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.CURRENT_ROW; -import static org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.UNBOUNDED_FOLLOWING; -import static org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.UNBOUNDED_PRECEDING; +import static org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.CURRENT_ROW; +import static org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.UNBOUNDED_FOLLOWING; +import static org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo.FrameBoundType.UNBOUNDED_PRECEDING; public class RangeFrame implements Frame { private final Partition partition; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/RowsFrame.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/RowsFrame.java index c565895695232..6b87a5de9db07 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/partition/frame/RowsFrame.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/partition/frame/RowsFrame.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame; +package org.apache.iotdb.calc.execution.operator.process.window.partition.frame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.utils.Range; import org.apache.iotdb.commons.exception.SemanticException; import static com.google.common.base.Preconditions.checkArgument; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/ColumnList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/utils/ColumnList.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/ColumnList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/utils/ColumnList.java index b12478b150055..8a6da136464cd 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/ColumnList.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/utils/ColumnList.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.utils; +package org.apache.iotdb.calc.execution.operator.process.window.utils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnEncoding; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/Range.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/utils/Range.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/Range.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/utils/Range.java index 4340a700a2063..e7d462d109916 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/Range.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/utils/Range.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.utils; +package org.apache.iotdb.calc.execution.operator.process.window.utils; public class Range { private final int start; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/RowComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/utils/RowComparator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/RowComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/utils/RowComparator.java index efacfab6098e1..6f01fb96d94ec 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/process/window/utils/RowComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/process/window/utils/RowComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.process.window.utils; +package org.apache.iotdb.calc.execution.operator.process.window.utils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java index 269aec5386a01..23e1a9c69c3b7 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/AbstractAsofMergeSortJoinOperator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.join.merge.comparator.JoinKeyComparator; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/AbstractMergeSortJoinOperator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/AbstractMergeSortJoinOperator.java index f391f0cd01dd6..bd12e7fc71ed5 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AbstractMergeSortJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/AbstractMergeSortJoinOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc.execution.operator.AbstractOperator; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.ColumnBuilder; @@ -38,7 +38,7 @@ import java.util.concurrent.TimeUnit; import static com.google.common.util.concurrent.Futures.successfulAsList; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.MAX_RESERVED_MEMORY; public abstract class AbstractMergeSortJoinOperator extends AbstractOperator { protected boolean leftFinished; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java index 50f0d2f082d5e..2090fdf055f03 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/AsofMergeSortInnerJoinOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java index 1f62ef69b775a..7658aa2f5a373 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/AsofMergeSortLeftJoinOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MarkDistinctOperator.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MarkDistinctOperator.java index df4f5021ff0b5..c37015ee1f5f4 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MarkDistinctOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MarkDistinctOperator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; @@ -40,7 +40,7 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; public class MarkDistinctOperator implements ProcessOperator { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java index e6329d0e74d67..278d87ea02155 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MergeSortFullOuterJoinOperator.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MergeSortInnerJoinOperator.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MergeSortInnerJoinOperator.java index b833de1d1ede0..03611237960b8 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortInnerJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MergeSortInnerJoinOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MergeSortLeftJoinOperator.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MergeSortLeftJoinOperator.java index 63bb9c48bf7c7..6461606095afb 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortLeftJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MergeSortLeftJoinOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MergeSortSemiJoinOperator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MergeSortSemiJoinOperator.java index 027796720af6a..35d9c061b38b9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/MergeSortSemiJoinOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/MergeSortSemiJoinOperator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational; +package org.apache.iotdb.calc.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.join.merge.comparator.JoinKeyComparator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java index c23d300afc42c..07c640f95caad 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AbstractApproxMostFrequentAccumulator.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import com.google.gson.Gson; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java index 11d6b6b22d2d0..cec628de50a70 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AbstractApproxPercentileAccumulator.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.TDigest; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AccumulatorFactory.java similarity index 85% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AccumulatorFactory.java index b5768a412de42..48a1abc83f38e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AccumulatorFactory.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AccumulatorFactory.java @@ -17,43 +17,43 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; - -import org.apache.iotdb.calc_commons.execution.aggregation.VarianceAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.BinaryGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.BlobGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.BooleanGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.DoubleGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.FloatGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedApproxCountDistinctAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedApproxPercentileAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedApproxPercentileWithWeightAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAvgAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedCountAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedCountAllAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedCountIfAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedExtremeAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedFirstAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedFirstByAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedLastAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedLastByAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMaxAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMaxByAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMinAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedMinByAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedModeAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedSumAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedUserDefinedAggregateAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedVarianceAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.IntGroupedApproxMostFrequentAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; + +import org.apache.iotdb.calc.execution.aggregation.VarianceAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.BinaryGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.BlobGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.BooleanGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.DoubleGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.FloatGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedApproxCountDistinctAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedApproxPercentileAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedApproxPercentileWithWeightAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedAvgAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedCountAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedCountAllAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedCountIfAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedExtremeAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedFirstAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedFirstByAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedLastAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedLastByAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedMaxAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedMaxByAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedMinAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedMinByAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedModeAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedSumAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedUserDefinedAggregateAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedVarianceAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.IntGroupedApproxMostFrequentAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.LongGroupedApproxMostFrequentAccumulator; import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.MarkDistinctHash; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.customizer.parameter.FunctionArguments; import org.apache.iotdb.udf.api.relational.AggregateFunction; @@ -78,8 +78,8 @@ import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isMeasurementColumn; -import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; +import static org.apache.iotdb.calc.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isMeasurementColumn; +import static org.apache.iotdb.calc.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.FIRST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.FIRST_BY; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AggregationMask.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AggregationMask.java index 53504ad9e230a..fd8e6db4e7d2f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationMask.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AggregationMask.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AggregationOperator.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AggregationOperator.java index 602c5dbf6c299..e65ee82517d4c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AggregationOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AggregationOperator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; - -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; + +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import com.google.common.util.concurrent.ListenableFuture; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java index 65b1940760a02..5c2dfcf62d72c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/ApproxCountDistinctAccumulator.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLogStateFactory; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.HyperLogLog; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.HyperLogLogStateFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -27,7 +27,7 @@ import org.apache.tsfile.write.UnSupportedDataTypeException; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog.DEFAULT_STANDARD_ERROR; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.HyperLogLog.DEFAULT_STANDARD_ERROR; public class ApproxCountDistinctAccumulator implements TableAccumulator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java index 778b0b740bcfc..3fb28f95d54c4 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/ApproxPercentileAccumulator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java index 9a818b0f4f0a3..604971b0d6b0a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/ApproxPercentileWithWeightAccumulator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AvgAccumulator.java similarity index 99% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AvgAccumulator.java index e6e9eeb4227f9..9d142151a1053 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/AvgAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AvgAccumulator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java index 4552eae81fde1..43be7d759f516 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/BinaryApproxMostFrequentAccumulator.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java index 1ba49c939f026..f0c8a768f4306 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/BlobApproxMostFrequentAccumulator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import com.google.gson.Gson; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java index 55bd57fb02174..94c01c33abdb6 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/BooleanApproxMostFrequentAccumulator.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/CountAccumulator.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/CountAccumulator.java index 10cc5bafc1ec4..68918a1e68ab8 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/CountAccumulator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/CountAllAccumulator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/CountAllAccumulator.java index 70961399f61b1..f7bae4c3bba55 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountAllAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/CountAllAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/CountIfAccumulator.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/CountIfAccumulator.java index 60208f548eca8..db7e958ddc799 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/CountIfAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/CountIfAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java index e5e77fac2a113..acde2e22314c1 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/DoubleApproxMostFrequentAccumulator.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/ExtremeAccumulator.java similarity index 99% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/ExtremeAccumulator.java index c2f4a2a7aa6c4..85fbee4bd5ea9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/ExtremeAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/ExtremeAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FirstAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FirstAccumulator.java index b020491c918d7..778b6b9253137 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FirstAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -36,7 +36,7 @@ import java.nio.charset.StandardCharsets; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; public class FirstAccumulator implements TableAccumulator { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FirstByAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FirstByAccumulator.java index 2a91587697423..81482c897b41a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FirstByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -35,7 +35,7 @@ import java.nio.charset.StandardCharsets; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; public class FirstByAccumulator implements TableAccumulator { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java index b7342876693bb..c45a9255dc2dc 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FirstByDescAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FirstDescAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FirstDescAccumulator.java index 636ec0370fb83..1066c91614562 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FirstDescAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FirstDescAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java index 2cd8eebc5b536..7c3d581e597f9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/FloatApproxMostFrequentAccumulator.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java index 0654a81a20d03..76ab725dd1034 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/IntApproxMostFrequentAccumulator.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LastAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LastAccumulator.java index d920c1742a00e..0899f38993d6d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LastAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -36,7 +36,7 @@ import java.nio.charset.StandardCharsets; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; public class LastAccumulator implements TableAccumulator { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LastByAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LastByAccumulator.java index 1aa2433a89512..580bebcc59160 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LastByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -33,7 +33,7 @@ import org.apache.tsfile.write.UnSupportedDataTypeException; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; public class LastByAccumulator implements TableAccumulator { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LastByDescAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LastByDescAccumulator.java index 99498e4b2e5a9..edb7165f9c41c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastByDescAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LastByDescAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LastDescAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LastDescAccumulator.java index 5ae072230abec..de1d6dfd18ef5 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LastDescAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LastDescAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java index 57ea7f9c8e3b5..bbb11f213e7c2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/LongApproxMostFrequentAccumulator.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.Counter; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.Counter; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/MaskedRecordIterator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/MaskedRecordIterator.java index 5d1fea18497a3..2534b995a2883 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaskedRecordIterator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/MaskedRecordIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/MaxAccumulator.java similarity index 99% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/MaxAccumulator.java index bb7f57aaa3446..26b599fbb730f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MaxAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/MaxAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/MinAccumulator.java similarity index 99% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/MinAccumulator.java index 95da7a46dbeb8..00a922c4eac47 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/MinAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/MinAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/RecordIterator.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/RecordIterator.java index a2a3ca4d5ebc1..e0e27aa763cac 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/RecordIterator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/RecordIterator.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; -import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.calc.utils.ObjectTypeUtils; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/SumAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/SumAccumulator.java index 59c049aa463f4..0c392ebaa2b68 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/SumAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/SumAccumulator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableAccumulator.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableAccumulator.java index c258fc92da569..9699ba1782933 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableAggregator.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableAggregator.java index 556410c1f7047..1df3f6fb159b4 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableAggregator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.calc.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; @@ -36,7 +36,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.AGGREGATION_FROM_RAW_DATA; +import static org.apache.iotdb.calc.metric.QueryExecutionMetricSet.AGGREGATION_FROM_RAW_DATA; public class TableAggregator { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java index a525afe3dc261..6fb43a11b67a6 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableMaxByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java index db3df64b6c404..d6df22858df4b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableMaxMinByBaseAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -35,8 +35,8 @@ import java.util.Collections; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.calcTypeSize; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeValue; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.Utils.calcTypeSize; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.Utils.serializeValue; /** max(x,y) returns the value of x associated with the maximum value of y over all input values. */ public abstract class TableMaxMinByBaseAccumulator implements TableAccumulator { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableMinByAccumulator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableMinByAccumulator.java index cebe39e8e8f7e..4de2b2e66b834 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableMinByAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableMinByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableModeAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableModeAccumulator.java index 684baaa965493..c7d1a13039110 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableModeAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableModeAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.iotdb.commons.conf.CommonDescriptor; @@ -36,8 +36,8 @@ import java.util.Map; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.UNSUPPORTED_TYPE_MESSAGE; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeBinaryValue; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.Utils.UNSUPPORTED_TYPE_MESSAGE; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.Utils.serializeBinaryValue; import static org.apache.tsfile.utils.BytesUtils.bytesToBool; import static org.apache.tsfile.utils.BytesUtils.bytesToLongFromOffset; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java index 3ef5db78dfccc..ef186d8d3fbcb 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/TableVarianceAccumulator.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.VarianceAccumulator; +import org.apache.iotdb.calc.execution.aggregation.VarianceAccumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java index 71f6a42f35ad3..234b1bae2580e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/UserDefinedAggregateFunctionAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.iotdb.udf.api.State; import org.apache.iotdb.udf.api.customizer.analysis.AggregateFunctionAnalysis; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/Utils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/Utils.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/Utils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/Utils.java index f52aa951799fd..a74d402f54088 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/Utils.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/Utils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java index fb7b29b447769..cdcb48938d6b0 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketDeserializer.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; import java.nio.ByteBuffer; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java index 90dfbc7e7b4f3..3aa721b24f24f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ApproxMostFrequentBucketSerializer.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; import java.nio.ByteBuffer; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/Counter.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/Counter.java index 4bed977c7288d..93d1c9514478e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Counter.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/Counter.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; import java.io.Externalizable; import java.io.IOException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java index 158b31871b31b..ef4bf76496b1e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/DoublyLinkedList.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; import java.util.ConcurrentModificationException; import java.util.Iterator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java index 0336043077b34..0f8bbd56a9379 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ExternalizableUtil.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; import java.io.ByteArrayOutputStream; import java.io.Externalizable; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java index ac60ade5b8d4e..588f8fdb9baab 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/HyperLogLog.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java index c83ef5ab98b1a..77cf63096e31a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/HyperLogLogStateFactory.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.HyperLogLogBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.HyperLogLogBigArray; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ITopK.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ITopK.java index f0604f702d7f3..560ae76511989 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ITopK.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ITopK.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; import java.util.List; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ListNode2.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ListNode2.java index 0a3007d4dd256..57683f9ebceab 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/ListNode2.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/ListNode2.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; public class ListNode2 { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/Pair.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/Pair.java index 6b6fd4c42e8b9..efa9ec8386da6 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/Pair.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/Pair.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; public class Pair { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java index 1ac5af1ee9442..640c81d7908d3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/SpaceSaving.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; import com.google.common.collect.ImmutableMap; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java index 5797b7a535ace..617250a17d15c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/SpaceSavingByteCalculator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; import java.util.List; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java index 7bd98b309442e..82ad8411b5cf8 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/SpaceSavingStateFactory.java @@ -12,14 +12,14 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.tsfile.utils.RamUsageEstimator; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving.getDefaultEstimatedSize; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSaving.getDefaultEstimatedSize; public class SpaceSavingStateFactory { public static SingleSpaceSavingState createSingleState() { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/StreamSummary.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/StreamSummary.java index ee739feb6aca9..e91d8c4bd51e6 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/StreamSummary.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/StreamSummary.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; import java.io.ByteArrayInputStream; import java.io.Externalizable; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/TDigest.java similarity index 99% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/TDigest.java index 711cd8258867d..7578238a84a5f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/approximate/TDigest.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/approximate/TDigest.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java similarity index 85% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java index a22300b9d075d..6a8a33079f296 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxMostFrequentAccumulator.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSavingStateFactory; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import com.google.gson.Gson; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java index 08b1b8426dbbd..dd02ccda123e5 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/AbstractGroupedApproxPercentileAccumulator.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.TDigestBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.TDigestBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java index f128143cde71f..e70614133edd7 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/BinaryGroupedApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.BinaryApproxMostFrequentAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.BinaryApproxMostFrequentAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java index 2d8ee10e07c98..0fd2de97e24ae 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/BlobGroupedApproxMostFrequentAccumulator.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; import com.google.gson.Gson; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java index c1ad26d8bb47f..2678bc4d7d841 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/BooleanGroupedApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.BooleanApproxMostFrequentAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.BooleanApproxMostFrequentAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java index 6ea41d822b9c0..fd8b19d2ed0ae 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/DoubleGroupedApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.DoubleApproxMostFrequentAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.DoubleApproxMostFrequentAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java index c7255a56805a0..2df414c1dc623 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/FloatGroupedApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.FloatApproxMostFrequentAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.FloatApproxMostFrequentAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java index b964b0cdb5921..0ec85621ac97b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedAccumulator.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java index 7200e87d59b2e..927d0249682fc 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedAggregator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; import com.google.common.primitives.Ints; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java index 72122a06d6482..c2422fbd3e3ab 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedApproxCountDistinctAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLogStateFactory; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.HyperLogLogBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.HyperLogLog; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.HyperLogLogStateFactory; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.HyperLogLogBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -26,7 +26,7 @@ import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.write.UnSupportedDataTypeException; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog.DEFAULT_STANDARD_ERROR; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.HyperLogLog.DEFAULT_STANDARD_ERROR; public class GroupedApproxCountDistinctAccumulator implements GroupedAccumulator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java index a9dbe8383eeaf..7899b963ea3c3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileAccumulator.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.TDigest; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java index eafa91dbe72c2..d44b8a7d06710 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedApproxPercentileWithWeightAccumulator.java @@ -12,10 +12,10 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.TDigest; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java index 8bc7209265c6c..0f23f7c913bc9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedAvgAccumulator.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java index 272dc15762626..5420dbd06054c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedCountAccumulator.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java index 2846cc9cdef62..abd093ad22d2e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedCountAllAccumulator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java index 45ff245a8f1f8..c6a87c7c4d880 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedCountIfAccumulator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java index a36b3520b7c84..bd5aca876b7af 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedExtremeAccumulator.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java index 3a1dbe6b7166c..b0c52d525018c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedFirstAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java index 3b6decc8a2ce2..8364971fcea13 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedFirstByAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java index 3f2c68168cfa4..c5696464da464 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedLastAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java index e35c9986dc85b..ab6ddae16cc72 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedLastByAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java index 1b55199032173..119501e421391 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMaxAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java index ca4946e37f7cd..47c7297d54e58 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMaxByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java index 1e6859b531dc0..0f59a575f45c6 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMaxMinByBaseAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java index 2ceff8bc5cc31..1993e2142fc76 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMinAccumulator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BinaryBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.FloatBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.IntBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java index 031efc8f140a5..46f14dac9bf50 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedMinByAccumulator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java index 92039624271fe..4e6511ffff843 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedModeAccumulator.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.MapBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.MapBigArray; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.tsfile.block.column.Column; @@ -39,8 +39,8 @@ import java.util.Map; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.UNSUPPORTED_TYPE_MESSAGE; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeBinaryValue; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.Utils.UNSUPPORTED_TYPE_MESSAGE; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.Utils.serializeBinaryValue; import static org.apache.tsfile.utils.BytesUtils.bytesToBool; import static org.apache.tsfile.utils.BytesUtils.bytesToLongFromOffset; import static org.apache.tsfile.utils.TsPrimitiveType.getByType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java index f7220bf01bd84..5c7673d7c7502 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedSumAccumulator.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BooleanBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java index 09b37e5cda753..4b2d13b4adcc3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedUserDefinedAggregateAccumulator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.MaskedRecordIterator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.RecordIterator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.ObjectBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.MaskedRecordIterator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.RecordIterator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.ObjectBigArray; import org.apache.iotdb.udf.api.State; import org.apache.iotdb.udf.api.relational.AggregateFunction; import org.apache.iotdb.udf.api.utils.ResultValue; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java index 07ee48babd3cd..75446b2cfab11 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/GroupedVarianceAccumulator.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.aggregation.VarianceAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; +import org.apache.iotdb.calc.execution.aggregation.VarianceAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.DoubleBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.LongBigArray; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java index 3e02a72ce7833..997afd10f707d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/HashAggregationOperator.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.calc.execution.operator.AbstractOperator; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -38,8 +38,8 @@ import java.util.Optional; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; public class HashAggregationOperator extends AbstractOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java index af002a335b20d..243c9704a08b8 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/IntGroupedApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.IntApproxMostFrequentAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.IntApproxMostFrequentAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java index 2291dbd859d8c..50899d0d25172 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/LongGroupedApproxMostFrequentAccumulator.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationMask; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LongApproxMostFrequentAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationMask; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.LongApproxMostFrequentAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.SpaceSavingBigArray; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java index 3e3c9b00c42e8..7609ac32926a4 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/StreamingAggregationOperator.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc.execution.operator.AbstractOperator; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java index bd6c98688fbbc..49c41bf7fa30f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/StreamingHashAggregationOperator.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped; - -import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped; + +import org.apache.iotdb.calc.execution.operator.AbstractOperator; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.builder.HashAggregationBuilder; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.builder.InMemoryHashAggregationBuilder; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.ListenableFuture; @@ -45,9 +45,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.MAX_USED_MEMORY; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.CURRENT_USED_MEMORY; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.MAX_USED_MEMORY; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory.NOOP; public class StreamingHashAggregationOperator extends AbstractOperator { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java index 4fd3f80f5039d..b86a8dae1840f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/BigArrays.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; // Note: this code was forked from fastutil (http://fastutil.di.unimi.it/) // Copyright (C) 2010-2013 Sebastiano Vigna diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java index 803368ca6b394..3996b19725431 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/BinaryBigArray.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java index af6005175d985..267b918fad5e9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/BooleanBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java index 01cd14dfd8aa2..321bca3c4b5ee 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/ByteBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfByteArray; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java index 4140d3c5130e4..492774879a8b7 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/DoubleBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfDoubleArray; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java index 3ae2550c1bb4e..d8597140c179e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/FloatBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfFloatArray; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java index e2ba7ee1f9024..7d6b3e4c6ec94 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/HyperLogLogBigArray.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.HyperLogLog; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.HyperLogLog; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java index c156b769e8e35..94eca74cbdc22 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/IntArrayFIFOQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java index 29adbedfa498d..236bd7d55a02f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/IntBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfIntArray; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java index 1d22b36ea5969..c68341c8c77a1 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/IntBigArrays.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SHIFT; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SHIFT; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; // Note: this code was forked from fastutil (http://fastutil.di.unimi.it/) // Copyright (C) 2010-2013 Sebastiano Vigna diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java index 885ef7fd627d7..d45b5e2c8098a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/IntComparator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; // Note: this code was forked from fastutil (http://fastutil.di.unimi.it/) // Copyright (C) 2010-2013 Sebastiano Vigna diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java index 0ef948de81f19..7a65b49218b3d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/LongBigArray.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfLongArray; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java index 917b723b3b7e7..a9232024ef55c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/LongBigArrayFIFOQueue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; import java.util.NoSuchElementException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java index fe7098d4b4c64..f6e4c8d750bc4 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/MapBigArray.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; import org.apache.tsfile.utils.TsPrimitiveType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java index f6e36a89ec891..0c5330b5a614b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/ObjectBigArray.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; import java.util.Arrays; import java.util.function.Consumer; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfObjectArray; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java index 4a8f50b23f0d3..ce4b5bb69b8b9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/ShortBigArray.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; import com.google.common.primitives.Shorts; import java.util.Arrays; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.INITIAL_SEGMENTS; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.SEGMENT_SIZE; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.offset; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array.BigArrays.segment; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfShortArray; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java similarity index 80% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java index a08ba91fa41c1..959398873e6b4 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/SpaceSavingBigArray.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.ApproxMostFrequentBucketDeserializer; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.ApproxMostFrequentBucketSerializer; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSaving; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.SpaceSavingByteCalculator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.ApproxMostFrequentBucketDeserializer; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.ApproxMostFrequentBucketSerializer; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSaving; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.SpaceSavingByteCalculator; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java index 262de0ac1807b..06eab4e57e1d8 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/array/TDigestBigArray.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.array; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.array; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.approximate.TDigest; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.approximate.TDigest; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.shallowSizeOfInstance; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java index 5753c274e6f17..660ed74adb685 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/builder/HashAggregationBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.builder; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java index a92bd556ea768..f372717a92fab 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/grouped/builder/InMemoryHashAggregationBuilder.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.builder; +package org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.builder; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; @@ -47,7 +47,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; public class InMemoryHashAggregationBuilder implements HashAggregationBuilder { private final int[] groupByChannels; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/relational/ColumnTransformerBuilder.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/relational/ColumnTransformerBuilder.java similarity index 81% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/relational/ColumnTransformerBuilder.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/relational/ColumnTransformerBuilder.java index d1b3328c97495..42f8f8bed59dc 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/execution/relational/ColumnTransformerBuilder.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/relational/ColumnTransformerBuilder.java @@ -17,183 +17,183 @@ * under the License. */ -package org.apache.iotdb.calc_commons.execution.relational; - -import org.apache.iotdb.calc_commons.plan.relational.metadata.ITypeMetadata; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.FailFunctionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.TableCaseWhenThenColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticColumnTransformerApi; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareLessThanColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.Like2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.NullColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.AbstractGreatestLeastColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.CoalesceColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.InBinaryMultiColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.InBooleanMultiColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.InDoubleMultiColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.InFloatMultiColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.InInt32MultiColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.InInt64MultiColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.InMultiColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.LogicalAndMultiColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.LogicalOrMultiColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.BetweenColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.Like3ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.LpadColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.RpadColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.udf.UserDefineScalarFunctionTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LikeColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.AbsColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.AcosColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.AsinColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.AtanColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitCount2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitCountColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseAnd2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseAndColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseLeftShift2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseLeftShiftColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseNotColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseOr2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseOrColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShift2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmetic2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmeticColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseRightShiftColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseXor2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BitwiseXorColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BlobLengthColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CRC32Transformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CeilColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.Concat2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ConcatColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ConcatMultiColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CosColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CoshColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DegreesColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DiffColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.EndsWith2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.EndsWithColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ExpColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ExtractTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.FloorColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.FormatColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LTrim2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LTrimColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LengthColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LnColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.Log10ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LowerColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ObjectLengthColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RTrim2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RTrimColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RadiansColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RegexpLike2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RegexpLikeColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.Replace2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.Replace3ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RoundColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SignColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SinColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SinhColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SqrtColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.StartsWith2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.Strcmp2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.StrcmpColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.Strpos2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.StrposColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SubString2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SubString3ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SubStringColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.TanColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.TanhColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.Trim2ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.TryCastFunctionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.UpperColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +package org.apache.iotdb.calc.execution.relational; + +import org.apache.iotdb.calc.plan.relational.metadata.ITypeMetadata; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.FailFunctionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.TableCaseWhenThenColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.ArithmeticColumnTransformerApi; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareLessThanColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.Like2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.NullColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.AbstractGreatestLeastColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.CoalesceColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.InBinaryMultiColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.InBooleanMultiColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.InDoubleMultiColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.InFloatMultiColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.InInt32MultiColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.InInt64MultiColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.InMultiColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.LogicalAndMultiColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.LogicalOrMultiColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ternary.BetweenColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ternary.Like3ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ternary.LpadColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ternary.RpadColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.udf.UserDefineScalarFunctionTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.LikeColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.AbsColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.AcosColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.AsinColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.AtanColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitCount2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitCountColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitwiseAnd2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitwiseAndColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitwiseLeftShift2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitwiseLeftShiftColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitwiseNotColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitwiseOr2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitwiseOrColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitwiseRightShift2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmetic2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitwiseRightShiftArithmeticColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitwiseRightShiftColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitwiseXor2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BitwiseXorColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BlobLengthColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.CRC32Transformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.CeilColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.Concat2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.ConcatColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.ConcatMultiColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.CosColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.CoshColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DegreesColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DiffColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.EndsWith2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.EndsWithColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.ExpColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.ExtractTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.FloorColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.FormatColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.LTrim2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.LTrimColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.LengthColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.LnColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.Log10ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.LowerColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.ObjectLengthColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.RTrim2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.RTrimColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.RadiansColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.RegexpLike2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.RegexpLikeColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.Replace2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.Replace3ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.RoundColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.SignColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.SinColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.SinhColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.SqrtColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.StartsWith2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.StartsWithColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.Strcmp2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.StrcmpColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.Strpos2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.StrposColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.SubString2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.SubString3ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.SubStringColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.TanColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.TanhColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.Trim2ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.TrimColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.TryCastFunctionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.UpperColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.AdditionResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.DivisionResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.ModulusResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.SubtractionResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DecimalLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.analyze.ITableTypeProvider; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.AdditionResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.DivisionResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.ModulusResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.MultiplicationResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.commons.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.customizer.analysis.ScalarFunctionAnalysis; @@ -227,17 +227,17 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; -import static org.apache.iotdb.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; -import static org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy; -import static org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy; -import static org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; -import static org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; -import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; -import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.isStringLiteral; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.calc.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacMd5Strategy; +import static org.apache.iotdb.calc.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha1Strategy; +import static org.apache.iotdb.calc.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha256Strategy; +import static org.apache.iotdb.calc.transformation.dag.column.binary.factory.HmacStrategiesFactory.createConstantKeyHmacSha512Strategy; +import static org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; +import static org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils.isStringLiteral; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/metric/QueryExecutionMetricSet.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/metric/QueryExecutionMetricSet.java similarity index 99% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/metric/QueryExecutionMetricSet.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/metric/QueryExecutionMetricSet.java index f46ee830a7e31..636b11b4cc02d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/metric/QueryExecutionMetricSet.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/metric/QueryExecutionMetricSet.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.metric; +package org.apache.iotdb.calc.metric; import org.apache.iotdb.commons.service.metric.enums.Metric; import org.apache.iotdb.commons.service.metric.enums.Tag; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/CommonOperatorUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/CommonOperatorUtils.java similarity index 67% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/CommonOperatorUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/CommonOperatorUtils.java index a921a0ccf2965..ac29fef3ebe98 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/CommonOperatorUtils.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/CommonOperatorUtils.java @@ -12,33 +12,33 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.plan.planner; +package org.apache.iotdb.calc.plan.planner; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFillFilter; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.FixedIntervalFillFilter; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.MonthIntervalMSFillFilter; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.MonthIntervalNSFillFilter; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.MonthIntervalUSFillFilter; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.identity.IdentityFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.DoubleLinearFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.IntLinearFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.LongLinearFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.BinaryPreviousFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.BinaryPreviousFillWithTimeDuration; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.BooleanPreviousFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.BooleanPreviousFillWithTimeDuration; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.DoublePreviousFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.DoublePreviousFillWithTimeDuration; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.FloatPreviousFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.FloatPreviousFillWithTimeDuration; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.IntPreviousFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.LongPreviousFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.LongPreviousFillWithTimeDuration; +import org.apache.iotdb.calc.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc.execution.operator.process.fill.IFillFilter; +import org.apache.iotdb.calc.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc.execution.operator.process.fill.filter.FixedIntervalFillFilter; +import org.apache.iotdb.calc.execution.operator.process.fill.filter.MonthIntervalMSFillFilter; +import org.apache.iotdb.calc.execution.operator.process.fill.filter.MonthIntervalNSFillFilter; +import org.apache.iotdb.calc.execution.operator.process.fill.filter.MonthIntervalUSFillFilter; +import org.apache.iotdb.calc.execution.operator.process.fill.identity.IdentityFill; +import org.apache.iotdb.calc.execution.operator.process.fill.identity.IdentityLinearFill; +import org.apache.iotdb.calc.execution.operator.process.fill.linear.DoubleLinearFill; +import org.apache.iotdb.calc.execution.operator.process.fill.linear.FloatLinearFill; +import org.apache.iotdb.calc.execution.operator.process.fill.linear.IntLinearFill; +import org.apache.iotdb.calc.execution.operator.process.fill.linear.LongLinearFill; +import org.apache.iotdb.calc.execution.operator.process.fill.previous.BinaryPreviousFill; +import org.apache.iotdb.calc.execution.operator.process.fill.previous.BinaryPreviousFillWithTimeDuration; +import org.apache.iotdb.calc.execution.operator.process.fill.previous.BooleanPreviousFill; +import org.apache.iotdb.calc.execution.operator.process.fill.previous.BooleanPreviousFillWithTimeDuration; +import org.apache.iotdb.calc.execution.operator.process.fill.previous.DoublePreviousFill; +import org.apache.iotdb.calc.execution.operator.process.fill.previous.DoublePreviousFillWithTimeDuration; +import org.apache.iotdb.calc.execution.operator.process.fill.previous.FloatPreviousFill; +import org.apache.iotdb.calc.execution.operator.process.fill.previous.FloatPreviousFillWithTimeDuration; +import org.apache.iotdb.calc.execution.operator.process.fill.previous.IntPreviousFill; +import org.apache.iotdb.calc.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; +import org.apache.iotdb.calc.execution.operator.process.fill.previous.LongPreviousFill; +import org.apache.iotdb.calc.execution.operator.process.fill.previous.LongPreviousFillWithTimeDuration; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.block.column.LongColumn; @@ -48,7 +48,7 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; +import static org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; public class CommonOperatorUtils { public static final IdentityLinearFill IDENTITY_LINEAR_FILL = new IdentityLinearFill(); diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/ITableOperatorGeneratorContext.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/ITableOperatorGeneratorContext.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/ITableOperatorGeneratorContext.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/ITableOperatorGeneratorContext.java index 8bd47ca1bc3c2..ffee1d2e8dace 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/ITableOperatorGeneratorContext.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/ITableOperatorGeneratorContext.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.plan.planner; +package org.apache.iotdb.calc.plan.planner; -import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; +import org.apache.iotdb.commons.queryengine.plan.analyze.ITableTypeProvider; import java.time.ZoneId; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/TableOperatorGenerator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/TableOperatorGenerator.java similarity index 84% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/TableOperatorGenerator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/TableOperatorGenerator.java index 5a812273a2c9c..aebce95bdb9e3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/TableOperatorGenerator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/TableOperatorGenerator.java @@ -17,153 +17,153 @@ * under the License. */ -package org.apache.iotdb.calc_commons.plan.planner; - -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.AssignUniqueIdOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.CollectOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.EnforceSingleRowOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.MappingCollectOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.PatternRecognitionOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.PreviousFillWithGroupOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.TableFillOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.TableLinearFillOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.TableLinearFillWithGroupOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.TableMergeSortOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.TableSortOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.TableStreamSortOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.TableTopKOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.ValuesOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.BinaryConstantFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.BooleanConstantFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.FloatConstantFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.IntConstantFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.LongConstantFill; -import org.apache.iotdb.calc_commons.execution.operator.process.function.TableFunctionLeafOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.function.TableFunctionOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWGroupWMoOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.LogicalIndexNavigation; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregationTracker; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregator; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalAggregationPointer; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValueAccessor; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.Computation; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.PatternExpressionComputation; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.IrRowPatternToProgramRewriter; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Program; -import org.apache.iotdb.calc_commons.execution.operator.process.window.RowNumberOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.window.TableWindowOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.window.TopKRankingOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunctionFactory; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate.WindowAggregator; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.AsofMergeSortLeftJoinOperator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.MarkDistinctOperator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.MergeSortFullOuterJoinOperator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.MergeSortInnerJoinOperator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.MergeSortLeftJoinOperator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.MergeSortSemiJoinOperator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AggregationOperator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingAggregationOperator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; -import org.apache.iotdb.calc_commons.execution.relational.ColumnTransformerBuilder; -import org.apache.iotdb.calc_commons.plan.relational.metadata.ITypeMetadata; -import org.apache.iotdb.calc_commons.plan.relational.planner.CastToBlobLiteralVisitor; -import org.apache.iotdb.calc_commons.plan.relational.planner.CastToBooleanLiteralVisitor; -import org.apache.iotdb.calc_commons.plan.relational.planner.CastToDateLiteralVisitor; -import org.apache.iotdb.calc_commons.plan.relational.planner.CastToDoubleLiteralVisitor; -import org.apache.iotdb.calc_commons.plan.relational.planner.CastToFloatLiteralVisitor; -import org.apache.iotdb.calc_commons.plan.relational.planner.CastToInt32LiteralVisitor; -import org.apache.iotdb.calc_commons.plan.relational.planner.CastToInt64LiteralVisitor; -import org.apache.iotdb.calc_commons.plan.relational.planner.CastToStringLiteralVisitor; -import org.apache.iotdb.calc_commons.plan.relational.planner.CastToTimestampLiteralVisitor; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +package org.apache.iotdb.calc.plan.planner; + +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.AssignUniqueIdOperator; +import org.apache.iotdb.calc.execution.operator.process.CollectOperator; +import org.apache.iotdb.calc.execution.operator.process.EnforceSingleRowOperator; +import org.apache.iotdb.calc.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.calc.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc.execution.operator.process.MappingCollectOperator; +import org.apache.iotdb.calc.execution.operator.process.OffsetOperator; +import org.apache.iotdb.calc.execution.operator.process.PatternRecognitionOperator; +import org.apache.iotdb.calc.execution.operator.process.PreviousFillWithGroupOperator; +import org.apache.iotdb.calc.execution.operator.process.TableFillOperator; +import org.apache.iotdb.calc.execution.operator.process.TableLinearFillOperator; +import org.apache.iotdb.calc.execution.operator.process.TableLinearFillWithGroupOperator; +import org.apache.iotdb.calc.execution.operator.process.TableMergeSortOperator; +import org.apache.iotdb.calc.execution.operator.process.TableSortOperator; +import org.apache.iotdb.calc.execution.operator.process.TableStreamSortOperator; +import org.apache.iotdb.calc.execution.operator.process.TableTopKOperator; +import org.apache.iotdb.calc.execution.operator.process.ValuesOperator; +import org.apache.iotdb.calc.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc.execution.operator.process.fill.constant.BinaryConstantFill; +import org.apache.iotdb.calc.execution.operator.process.fill.constant.BooleanConstantFill; +import org.apache.iotdb.calc.execution.operator.process.fill.constant.DoubleConstantFill; +import org.apache.iotdb.calc.execution.operator.process.fill.constant.FloatConstantFill; +import org.apache.iotdb.calc.execution.operator.process.fill.constant.IntConstantFill; +import org.apache.iotdb.calc.execution.operator.process.fill.constant.LongConstantFill; +import org.apache.iotdb.calc.execution.operator.process.function.TableFunctionLeafOperator; +import org.apache.iotdb.calc.execution.operator.process.function.TableFunctionOperator; +import org.apache.iotdb.calc.execution.operator.process.gapfill.GapFillWGroupWMoOperator; +import org.apache.iotdb.calc.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; +import org.apache.iotdb.calc.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; +import org.apache.iotdb.calc.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.calc.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; +import org.apache.iotdb.calc.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.LogicalIndexNavigation; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PatternAggregationTracker; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PatternVariableRecognizer; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PhysicalAggregationPointer; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PhysicalValueAccessor; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PhysicalValuePointer; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.expression.Computation; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.expression.PatternExpressionComputation; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.IrRowPatternToProgramRewriter; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.Matcher; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.Program; +import org.apache.iotdb.calc.execution.operator.process.window.RowNumberOperator; +import org.apache.iotdb.calc.execution.operator.process.window.TableWindowOperator; +import org.apache.iotdb.calc.execution.operator.process.window.TopKRankingOperator; +import org.apache.iotdb.calc.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.WindowFunctionFactory; +import org.apache.iotdb.calc.execution.operator.process.window.function.aggregate.AggregationWindowFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.aggregate.WindowAggregator; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; +import org.apache.iotdb.calc.execution.operator.source.relational.AsofMergeSortLeftJoinOperator; +import org.apache.iotdb.calc.execution.operator.source.relational.MarkDistinctOperator; +import org.apache.iotdb.calc.execution.operator.source.relational.MergeSortFullOuterJoinOperator; +import org.apache.iotdb.calc.execution.operator.source.relational.MergeSortInnerJoinOperator; +import org.apache.iotdb.calc.execution.operator.source.relational.MergeSortLeftJoinOperator; +import org.apache.iotdb.calc.execution.operator.source.relational.MergeSortSemiJoinOperator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AggregationOperator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.LastByDescAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.LastDescAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.StreamingAggregationOperator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; +import org.apache.iotdb.calc.execution.relational.ColumnTransformerBuilder; +import org.apache.iotdb.calc.plan.relational.metadata.ITypeMetadata; +import org.apache.iotdb.calc.plan.relational.planner.CastToBlobLiteralVisitor; +import org.apache.iotdb.calc.plan.relational.planner.CastToBooleanLiteralVisitor; +import org.apache.iotdb.calc.plan.relational.planner.CastToDateLiteralVisitor; +import org.apache.iotdb.calc.plan.relational.planner.CastToDoubleLiteralVisitor; +import org.apache.iotdb.calc.plan.relational.planner.CastToFloatLiteralVisitor; +import org.apache.iotdb.calc.plan.relational.planner.CastToInt32LiteralVisitor; +import org.apache.iotdb.calc.plan.relational.planner.CastToInt64LiteralVisitor; +import org.apache.iotdb.calc.plan.relational.planner.CastToStringLiteralVisitor; +import org.apache.iotdb.calc.plan.relational.planner.CastToTimestampLiteralVisitor; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind; -import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionFactory; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.AggregationLabelSet; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.AggregationValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ClassifierValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.MatchNumberValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.analyze.ITableTypeProvider; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionKind; +import org.apache.iotdb.commons.queryengine.plan.relational.function.ITableFunctionFactory; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.Measure; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.AggregationLabelSet; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.AggregationValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ClassifierValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.LogicalIndexPointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.MatchNumberValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ScalarValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.table.TableFunctionProcessorProvider; @@ -205,29 +205,29 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; -import static org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; -import static org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createAccumulator; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createBuiltinAccumulator; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.IDENTITY_FILL; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.UNKNOWN_DATATYPE; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.getLinearFill; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.getPreviousFill; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_AGGREGATION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch.ONE; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition.LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.calc.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; +import static org.apache.iotdb.calc.execution.operator.process.rowpattern.PhysicalValuePointer.CLASSIFIER; +import static org.apache.iotdb.calc.execution.operator.process.rowpattern.PhysicalValuePointer.MATCH_NUMBER; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AccumulatorFactory.createAccumulator; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AccumulatorFactory.createBuiltinAccumulator; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.IDENTITY_FILL; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.UNKNOWN_DATATYPE; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.getLinearFill; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.getPreviousFill; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.FIRST_AGGREGATION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.LAST_AGGREGATION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.LAST_BY_AGGREGATION; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder.DESC_NULLS_LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowsPerMatch.ONE; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SkipToPosition.LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName; import static org.apache.tsfile.read.common.type.LongType.INT64; import static org.apache.tsfile.read.common.type.StringType.STRING; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/memory/MemoryReservationManager.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/memory/MemoryReservationManager.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/memory/MemoryReservationManager.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/memory/MemoryReservationManager.java index 3d0cbdf65fc30..9df8d52131bb0 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/planner/memory/MemoryReservationManager.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/planner/memory/MemoryReservationManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.plan.planner.memory; +package org.apache.iotdb.calc.plan.planner.memory; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/CommonMetadataUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/metadata/CommonMetadataUtils.java similarity index 99% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/CommonMetadataUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/metadata/CommonMetadataUtils.java index 468c518a28898..89a09cb7dcc2d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/CommonMetadataUtils.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/metadata/CommonMetadataUtils.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.metadata; +package org.apache.iotdb.calc.plan.relational.metadata; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/ITypeMetadata.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/metadata/ITypeMetadata.java similarity index 80% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/ITypeMetadata.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/metadata/ITypeMetadata.java index f1e4af6130fdc..b7f9405ad0c23 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/metadata/ITypeMetadata.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/metadata/ITypeMetadata.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.metadata; +package org.apache.iotdb.calc.plan.relational.metadata; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignature; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToBlobLiteralVisitor.java similarity index 71% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToBlobLiteralVisitor.java index 61d3aa2f4f234..e8c94bb0ecfe4 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBlobLiteralVisitor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToBlobLiteralVisitor.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToBooleanLiteralVisitor.java similarity index 71% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToBooleanLiteralVisitor.java index 598f8a51a9fe6..0bd198954bd6c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToBooleanLiteralVisitor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToBooleanLiteralVisitor.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to boolean type public class CastToBooleanLiteralVisitor implements CommonQueryAstVisitor { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToDateLiteralVisitor.java similarity index 71% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToDateLiteralVisitor.java index 5f21d7385f05c..8ad658e7118bc 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDateLiteralVisitor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToDateLiteralVisitor.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.tsfile.utils.DateUtils; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToDoubleLiteralVisitor.java similarity index 71% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToDoubleLiteralVisitor.java index 06b92fa47c518..f3b0e26512c7c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToDoubleLiteralVisitor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToDoubleLiteralVisitor.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to double type public class CastToDoubleLiteralVisitor implements CommonQueryAstVisitor { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToFloatLiteralVisitor.java similarity index 70% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToFloatLiteralVisitor.java index c7321740215e5..406aad21fa31e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToFloatLiteralVisitor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToFloatLiteralVisitor.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to float type public class CastToFloatLiteralVisitor implements CommonQueryAstVisitor { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToInt32LiteralVisitor.java similarity index 71% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToInt32LiteralVisitor.java index ee5ef73c403a6..2accba40d3447 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt32LiteralVisitor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToInt32LiteralVisitor.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to INT32 type public class CastToInt32LiteralVisitor implements CommonQueryAstVisitor { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToInt64LiteralVisitor.java similarity index 70% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToInt64LiteralVisitor.java index 23969df62c386..cfe7219f52f23 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToInt64LiteralVisitor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToInt64LiteralVisitor.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; // return NULL, if we cannot parse literal to INT64 type public class CastToInt64LiteralVisitor implements CommonQueryAstVisitor { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToStringLiteralVisitor.java similarity index 74% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToStringLiteralVisitor.java index 90f6669bda3e7..8ab893e3416be 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToStringLiteralVisitor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToStringLiteralVisitor.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.planner; - -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +package org.apache.iotdb.calc.plan.relational.planner; + +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.BytesUtils; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToTimestampLiteralVisitor.java similarity index 71% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToTimestampLiteralVisitor.java index ab80bdbca5ef2..554e8c9af4b83 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/CastToTimestampLiteralVisitor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/CastToTimestampLiteralVisitor.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.planner; +package org.apache.iotdb.calc.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import java.time.ZoneId; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java similarity index 83% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java index 2a09f1a79821c..6026813a07ca2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java @@ -17,27 +17,27 @@ * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.planner.ir; - -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +package org.apache.iotdb.calc.plan.relational.planner.ir; + +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.utils.Pair; @@ -46,9 +46,9 @@ import java.util.List; import java.util.Set; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.OR; public class GlobalTimePredicateExtractVisitor implements CommonQueryAstVisitor< diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Capture.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Capture.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Capture.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Capture.java index bd0a5d32db031..f3bbf498d1c7b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Capture.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Capture.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc.plan.relational.utils.matching; import java.util.concurrent.atomic.AtomicInteger; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Captures.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Captures.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Captures.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Captures.java index b0816126ca378..ae8762c7a91b2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Captures.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Captures.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc.plan.relational.utils.matching; import java.util.NoSuchElementException; import java.util.Objects; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/DefaultPrinter.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/DefaultPrinter.java similarity index 80% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/DefaultPrinter.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/DefaultPrinter.java index 92089a77a712e..38bcf96719995 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/DefaultPrinter.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/DefaultPrinter.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc.plan.relational.utils.matching; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.CapturePattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.EqualsPattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.WithPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.CapturePattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.EqualsPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.FilterPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.TypeOfPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.WithPattern; import java.util.Collections; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Match.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Match.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Match.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Match.java index 28ab8c788d3b8..a2d90d860a475 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Match.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Match.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc.plan.relational.utils.matching; import java.util.Objects; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Pattern.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Pattern.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Pattern.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Pattern.java index 758d1daf05f5b..4fc225b7773d9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Pattern.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Pattern.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc.plan.relational.utils.matching; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.CapturePattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.WithPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.CapturePattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.FilterPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.TypeOfPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.WithPattern; import com.google.common.collect.Iterables; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PatternVisitor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/PatternVisitor.java similarity index 71% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PatternVisitor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/PatternVisitor.java index 6698314f92171..9ea807ce79ff3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PatternVisitor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/PatternVisitor.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc.plan.relational.utils.matching; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.CapturePattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.EqualsPattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.WithPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.CapturePattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.EqualsPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.FilterPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.TypeOfPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.WithPattern; import java.util.Optional; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Property.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Property.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Property.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Property.java index 26f080ad0c5a1..7cf028299b9d0 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/Property.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/Property.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc.plan.relational.utils.matching; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.EqualsPattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.FilterPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.EqualsPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.FilterPattern; import java.util.Optional; import java.util.function.BiFunction; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PropertyPattern.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/PropertyPattern.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PropertyPattern.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/PropertyPattern.java index 1be7bf7c82c6a..9c2b9cb658692 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/PropertyPattern.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/PropertyPattern.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.utils.matching; +package org.apache.iotdb.calc.plan.relational.utils.matching; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/CapturePattern.java similarity index 76% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/CapturePattern.java index a8ca4cb17dcd3..a425cb82ede46 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/CapturePattern.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/CapturePattern.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern; +package org.apache.iotdb.calc.plan.relational.utils.matching.pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Match; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Match; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.PatternVisitor; import java.util.stream.Stream; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/EqualsPattern.java similarity index 80% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/EqualsPattern.java index 65d6cfb56d255..b08db4d14026d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/EqualsPattern.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/EqualsPattern.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern; +package org.apache.iotdb.calc.plan.relational.utils.matching.pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Match; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Match; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.PatternVisitor; import java.util.Optional; import java.util.stream.Stream; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/FilterPattern.java similarity index 81% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/FilterPattern.java index 4c90db256b84b..8c882f1ae8e42 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/FilterPattern.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/FilterPattern.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern; +package org.apache.iotdb.calc.plan.relational.utils.matching.pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Match; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Match; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.PatternVisitor; import java.util.Optional; import java.util.function.BiPredicate; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/TypeOfPattern.java similarity index 81% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/TypeOfPattern.java index 5ff2343d27e65..a60bcb0355b6b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/TypeOfPattern.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/TypeOfPattern.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern; +package org.apache.iotdb.calc.plan.relational.utils.matching.pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Match; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Match; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.PatternVisitor; import java.util.Optional; import java.util.stream.Stream; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/WithPattern.java similarity index 78% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/WithPattern.java index abbf7ebaa4ef4..9daf7b8725a72 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/plan/relational/utils/matching/pattern/WithPattern.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/plan/relational/utils/matching/pattern/WithPattern.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern; +package org.apache.iotdb.calc.plan.relational.utils.matching.pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Match; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PatternVisitor; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Property; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PropertyPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Match; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.PatternVisitor; +import org.apache.iotdb.calc.plan.relational.utils.matching.Property; +import org.apache.iotdb.calc.plan.relational.utils.matching.PropertyPattern; import java.util.Optional; import java.util.function.BiFunction; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/service/AbstractTemporaryQueryDataFileService.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/service/AbstractTemporaryQueryDataFileService.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/service/AbstractTemporaryQueryDataFileService.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/service/AbstractTemporaryQueryDataFileService.java index 71dc3cdb9ee72..146f42e63b8df 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/service/AbstractTemporaryQueryDataFileService.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/service/AbstractTemporaryQueryDataFileService.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.service; +package org.apache.iotdb.calc.service; -import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList.SerializationRecorder; +import org.apache.iotdb.calc.transformation.datastructure.SerializableList.SerializationRecorder; import org.apache.iotdb.commons.exception.StartupException; import org.apache.iotdb.commons.file.SystemFileFactory; import org.apache.iotdb.commons.service.IService; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/service/ITemporaryQueryDataFileServiceProvider.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/service/ITemporaryQueryDataFileServiceProvider.java index 9be2fcf89d34a..ccf69d005220d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/service/ITemporaryQueryDataFileServiceProvider.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/service/ITemporaryQueryDataFileServiceProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.service; +package org.apache.iotdb.calc.service; public interface ITemporaryQueryDataFileServiceProvider { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/adapter/PointCollectorAdaptor.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/adapter/PointCollectorAdaptor.java index 2066e0b8fd8e6..20528d6a9828a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/adapter/PointCollectorAdaptor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/adapter/PointCollectorAdaptor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.adapter; +package org.apache.iotdb.calc.transformation.dag.adapter; import org.apache.iotdb.commons.udf.utils.UDFBinaryTransformer; import org.apache.iotdb.udf.api.collector.PointCollector; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java similarity index 99% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java index 6c30e83953c5b..f92175671305e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/AbstractCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column; +package org.apache.iotdb.calc.transformation.dag.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnCache.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ColumnCache.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnCache.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ColumnCache.java index 57cefa893e346..24d537e2e5d92 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnCache.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ColumnCache.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column; +package org.apache.iotdb.calc.transformation.dag.column; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ColumnTransformer.java index bb1022516894e..d10d728cd2db5 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ColumnTransformer.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column; +package org.apache.iotdb.calc.transformation.dag.column; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.NullColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.NullColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isNumericType; public abstract class ColumnTransformer { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/FailFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/FailFunctionColumnTransformer.java index d8c8ee55057cc..351c4396c0fc3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/FailFunctionColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/FailFunctionColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column; +package org.apache.iotdb.calc.transformation.dag.column; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/TableCaseWhenThenColumnTransformer.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/TableCaseWhenThenColumnTransformer.java index cacb028130084..9ec8e0e130bf8 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TableCaseWhenThenColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/TableCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column; +package org.apache.iotdb.calc.transformation.dag.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java index 7ede250931101..6e3e6d1563f44 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/TreeCaseWhenThenColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column; +package org.apache.iotdb.calc.transformation.dag.column; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java index 65c0182c7c04d..5b3abd572b84f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticAdditionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java index ab9b455ad8791..5f40d1fbb2fa1 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java index 5f6e62273f03d..014dda8db34e7 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticDivisionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java index 5b736fbe9f2f7..55d84062fd6c2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticModuloColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java index 8a917a8411145..d58a8068fe62b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticMultiplicationColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java index 06d57836a520c..9aaa50f427804 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/ArithmeticSubtractionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/BinaryColumnTransformer.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/BinaryColumnTransformer.java index c69497e4c89b7..a8f9427f8d602 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/BinaryColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/BinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareBinaryColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareBinaryColumnTransformer.java index 5e0e3b592de47..192280ce05da0 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareBinaryColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareBinaryColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -28,9 +28,9 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBool; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isBool; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isCharType; public abstract class CompareBinaryColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareEqualToColumnTransformer.java similarity index 85% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareEqualToColumnTransformer.java index 2edf313cb1f72..1d199d23072ab 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareEqualToColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareEqualToColumnTransformer.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import java.util.Arrays; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; public class CompareEqualToColumnTransformer extends CompareBinaryColumnTransformer { public CompareEqualToColumnTransformer( diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java index 763d8f6cd6188..c50b3bd36ed9e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareGreaterEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java index ca4a67e8c9327..d3c43e9ac6bde 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareGreaterThanColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java index 1628413c674b1..0cccc3177dc1e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareLessEqualColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareLessThanColumnTransformer.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareLessThanColumnTransformer.java index a6d7f55d0e034..9d9bf13163fc2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareLessThanColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareLessThanColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java similarity index 85% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java index 188a750c71d78..1b2ec1e145999 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/CompareNonEqualColumnTransformer.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import java.util.Arrays; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; public class CompareNonEqualColumnTransformer extends CompareBinaryColumnTransformer { public CompareNonEqualColumnTransformer( diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/HmacColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/HmacColumnTransformer.java index bbdcdb110bc2c..2dd734c2bc992 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/HmacColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/HmacColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; @@ -28,7 +28,7 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class HmacColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/Like2ColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/Like2ColumnTransformer.java index db1cc1bb38e3e..508d9b9dc6f97 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/Like2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/Like2ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -29,7 +29,7 @@ import java.util.Optional; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isCharType; public class Like2ColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/LogicAndColumnTransformer.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/LogicAndColumnTransformer.java index b5cf21eab84a2..5e7197eaab893 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicAndColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/LogicAndColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/LogicBinaryColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/LogicBinaryColumnTransformer.java index a32ea43ef1950..634a4a77e4f8e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicBinaryColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/LogicBinaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/LogicOrColumnTransformer.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/LogicOrColumnTransformer.java index 42595a45055fe..5f2437238b7f6 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/LogicOrColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/LogicOrColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary; +package org.apache.iotdb.calc.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/factory/HmacStrategiesFactory.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/factory/HmacStrategiesFactory.java index 4e907a0beac5d..25e7c5a5f9d92 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/factory/HmacStrategiesFactory.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/factory/HmacStrategiesFactory.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory; +package org.apache.iotdb.calc.transformation.dag.column.binary.factory; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.calc.transformation.dag.column.binary.strategies.HmacStrategy; import org.apache.iotdb.commons.exception.SemanticException; import com.google.common.hash.HashFunction; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/strategies/HmacStrategy.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/strategies/HmacStrategy.java index e90322e9ec814..93bfbaa759cbd 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/binary/strategies/HmacStrategy.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/binary/strategies/HmacStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies; +package org.apache.iotdb.calc.transformation.dag.column.binary.strategies; @FunctionalInterface public interface HmacStrategy { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/ConstantColumnTransformer.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/ConstantColumnTransformer.java index f9e9f733ea889..d16072d729838 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/ConstantColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/ConstantColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.leaf; +package org.apache.iotdb.calc.transformation.dag.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/IdentityColumnTransformer.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/IdentityColumnTransformer.java index 4187597ccb586..38dfd063ac19c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/IdentityColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/IdentityColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.leaf; +package org.apache.iotdb.calc.transformation.dag.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/LeafColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/LeafColumnTransformer.java index 77916511cdc30..e9f69657a5405 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/LeafColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/LeafColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.leaf; +package org.apache.iotdb.calc.transformation.dag.column.leaf; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/NullColumnTransformer.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/NullColumnTransformer.java index 3719d7d93203c..31a01f67f3047 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/NullColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/NullColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.leaf; +package org.apache.iotdb.calc.transformation.dag.column.leaf; import org.apache.tsfile.read.common.block.column.NullColumn; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/TimeColumnTransformer.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/TimeColumnTransformer.java index 00ac77bc5def1..8d359a0904a6e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/leaf/TimeColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/leaf/TimeColumnTransformer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.leaf; +package org.apache.iotdb.calc.transformation.dag.column.leaf; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java index 05399cc0f8a84..ebe76ea84bf74 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/AbstractGreatestLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java index 194706f575790..a2d86ba00f01e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/BinaryGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/BinaryLeastColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/BinaryLeastColumnTransformer.java index 7bb5d9634d4d0..4ba373d91eb03 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BinaryLeastColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/BinaryLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java index 3086ff286f7ba..56baf89bc7d36 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/BooleanGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/BooleanLeastColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/BooleanLeastColumnTransformer.java index 822e826801fb7..176cf2e578c7b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/BooleanLeastColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/BooleanLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/CoalesceColumnTransformer.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/CoalesceColumnTransformer.java index a4c8e2788026d..5961b6792147a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/CoalesceColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/CoalesceColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java index 45dac152825b2..fa15a1098a7d9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/DoubleGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/DoubleLeastColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/DoubleLeastColumnTransformer.java index 277cc41733752..52e5ffdc6d51f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/DoubleLeastColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/DoubleLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/FloatGreatestColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/FloatGreatestColumnTransformer.java index 3f25cb22f9b9c..a52912d2bfca3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatGreatestColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/FloatGreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/FloatLeastColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/FloatLeastColumnTransformer.java index 73970cda2268e..64be3106f5796 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/FloatLeastColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/FloatLeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java index 2ae76f9445ef7..d2e5e75c4f0e8 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InBinaryMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java index cfcbb82030152..d9f4ab3e866b0 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InBooleanMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java index a71153d9c9836..2b6563346b532 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InDoubleMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InFloatMultiColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InFloatMultiColumnTransformer.java index 554313c52d4b5..beb16f3dd5a40 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InFloatMultiColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InFloatMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InInt32MultiColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InInt32MultiColumnTransformer.java index 72d2999db5f42..e00845a227f84 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt32MultiColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InInt32MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InInt64MultiColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InInt64MultiColumnTransformer.java index 7e112b1de622d..4ebb14e14d04c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InInt64MultiColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InInt64MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InMultiColumnTransformer.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InMultiColumnTransformer.java index 575de0b9dc065..62ee96c36ebc0 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/InMultiColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/InMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/Int32GreatestColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/Int32GreatestColumnTransformer.java index bf96672cd8116..247cf2f463bfd 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32GreatestColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/Int32GreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/Int32LeastColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/Int32LeastColumnTransformer.java index 41776d1dc6c91..9c382de8ec0aa 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int32LeastColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/Int32LeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/Int64GreatestColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/Int64GreatestColumnTransformer.java index ddd8a085a4b7c..328442056afdb 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64GreatestColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/Int64GreatestColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/Int64LeastColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/Int64LeastColumnTransformer.java index 6d8842102c206..0fa520d3fb9aa 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/Int64LeastColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/Int64LeastColumnTransformer.java @@ -12,9 +12,9 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java index d3c50860c3b44..2011f0ccc57c1 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/LogicalAndMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/LogicalMultiColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/LogicalMultiColumnTransformer.java index 8310312c7de18..248a16482a544 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalMultiColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/LogicalMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.read.common.type.TypeEnum; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java index f77665a9c62ea..a7ae49f2b7f7e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/LogicalOrMultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/MappableUDFColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/MappableUDFColumnTransformer.java index 578711acad3db..fab8d8c632ba2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MappableUDFColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/MappableUDFColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/MultiColumnTransformer.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/MultiColumnTransformer.java index d6bcd488b88f0..fe760a1759833 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/multi/MultiColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/multi/MultiColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.multi; +package org.apache.iotdb.calc.transformation.dag.column.multi; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/BetweenColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/BetweenColumnTransformer.java index 054c523b9cf2d..d5bb26ca77e65 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/BetweenColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/BetweenColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.ternary; +package org.apache.iotdb.calc.transformation.dag.column.ternary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBool; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isBool; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isCharType; public class BetweenColumnTransformer extends CompareTernaryColumnTransformer { private final boolean isNotBetween; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java index 63df2b6c026e9..56fa25f1d4882 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/CompareTernaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.ternary; +package org.apache.iotdb.calc.transformation.dag.column.ternary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/Like3ColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/Like3ColumnTransformer.java index b34d0e9de838c..5cbdb29f9e101 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/Like3ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/Like3ColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.ternary; +package org.apache.iotdb.calc.transformation.dag.column.ternary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -27,8 +27,8 @@ import org.apache.tsfile.common.regexp.LikePattern; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; -import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; public class Like3ColumnTransformer extends TernaryColumnTransformer { public Like3ColumnTransformer( diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/LpadColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/LpadColumnTransformer.java index b387ba3677391..8c2e01b74a27c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/LpadColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/LpadColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.ternary; +package org.apache.iotdb.calc.transformation.dag.column.ternary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.utils.BytePaddingUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ternary.utils.BytePaddingUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/RpadColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/RpadColumnTransformer.java index db7aeb71d0d71..1a0fcd9e5202f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/RpadColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/RpadColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.ternary; +package org.apache.iotdb.calc.transformation.dag.column.ternary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.utils.BytePaddingUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ternary.utils.BytePaddingUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/TernaryColumnTransformer.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/TernaryColumnTransformer.java index d48c8bb277f19..6f8b3d0b11fe3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/TernaryColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/TernaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.ternary; +package org.apache.iotdb.calc.transformation.dag.column.ternary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/utils/BytePaddingUtils.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/utils/BytePaddingUtils.java index e6204991ce176..e944540a2f7b4 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/ternary/utils/BytePaddingUtils.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/ternary/utils/BytePaddingUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.ternary.utils; +package org.apache.iotdb.calc.transformation.dag.column.ternary.utils; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java index 7e7aa95a59a29..4e22315b62868 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/udf/UserDefineScalarFunctionTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.udf; +package org.apache.iotdb.calc.transformation.dag.column.udf; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.RecordIterator; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.RecordIterator; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.iotdb.udf.api.relational.ScalarFunction; import org.apache.iotdb.udf.api.relational.access.Record; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java index d2c02e44af711..2fa77f1970978 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/ArithmeticNegationColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary; +package org.apache.iotdb.calc.transformation.dag.column.unary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/InColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/InColumnTransformer.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/InColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/InColumnTransformer.java index 2de258997151f..93455c0a856cf 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/InColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/InColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary; +package org.apache.iotdb.calc.transformation.dag.column.unary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/IsNullColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/IsNullColumnTransformer.java index e0989a83b1707..210fcf354d515 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/IsNullColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/IsNullColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary; +package org.apache.iotdb.calc.transformation.dag.column.unary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/LikeColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/LikeColumnTransformer.java index 3392e4c86abaf..26821874e2734 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LikeColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/LikeColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary; +package org.apache.iotdb.calc.transformation.dag.column.unary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -27,7 +27,7 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isCharType; public class LikeColumnTransformer extends UnaryColumnTransformer { private final LikePattern pattern; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/LogicNotColumnTransformer.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/LogicNotColumnTransformer.java index 940efc3f043ac..d1ec093087f93 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/LogicNotColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/LogicNotColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary; +package org.apache.iotdb.calc.transformation.dag.column.unary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/RegularColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/RegularColumnTransformer.java index 2a2b0651bfe4d..0f7c08cb0d17b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/RegularColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/RegularColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary; +package org.apache.iotdb.calc.transformation.dag.column.unary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -28,7 +28,7 @@ import java.util.regex.Pattern; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isCharType; public class RegularColumnTransformer extends UnaryColumnTransformer { private final Pattern pattern; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/UnaryColumnTransformer.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/UnaryColumnTransformer.java index 7b9d1a61f0403..1a3548ace3db8 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/UnaryColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/UnaryColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary; +package org.apache.iotdb.calc.transformation.dag.column.unary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbsColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbsColumnTransformer.java index b6feac0867225..a9f5da1447f14 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbsColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbsColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java index b5b2d745fc48f..af0b16a1c8ef2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbstractBitwise2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java index 4174b98faca4e..7d2baa82504dc 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbstractBitwiseColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java index 9f9c104729ca6..d8df707f39c32 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbstractCastFunctionColumnTransformer.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.CastFunctionUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.CastFunctionUtils; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -38,7 +38,7 @@ import java.time.ZoneId; import java.time.format.DateTimeParseException; -import static org.apache.iotdb.calc_commons.transformation.dag.util.CastFunctionUtils.ERROR_MSG; +import static org.apache.iotdb.calc.transformation.dag.util.CastFunctionUtils.ERROR_MSG; import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE; public abstract class AbstractCastFunctionColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java index 0797824865ba4..37937b45330ac 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AbstractLengthColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AcosColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AcosColumnTransformer.java index 1062b015c7b69..8bc9d55a924a0 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AcosColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AcosColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AsinColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AsinColumnTransformer.java index 44b8ad3932451..c4433b10f7326 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AsinColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AsinColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AtanColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AtanColumnTransformer.java index 4ba3e507c2c42..43694f2ff765e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/AtanColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/AtanColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java index 327282d67a856..927ee51b9bca0 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitCount2ColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java index ac5f92260122c..3dd76427aea2e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitCountColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java index 74b52bec177ea..e1a0ad0f8551a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseAnd2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java index ac9641dc916af..82f8bb3d5efbb 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseAndColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java index da9bab1338373..99e2a25fcba0f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseLeftShift2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java index 62ae3bad24728..39ca8f5947c1d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseLeftShiftColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java index e744b275e9bdc..2601f440e0c38 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseNotColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java index 04ee69478801f..2ef495d24fca3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseOr2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java index 013b201b73f8c..a7f15236400d6 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseOrColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java index d27dc0390c596..5795084c838c5 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseRightShift2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java index 567668a08f3ce..968a702f12031 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmetic2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java index 497e9951366df..d9bdcae38f6a2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseRightShiftArithmeticColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java index e4c95c929133a..395a77a3b1b92 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseRightShiftColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java index 06d5b7ec28fe9..46ab62ae8c30a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseXor2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java index da0cf1754c2a9..9cf0b72298615 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BitwiseXorColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java index 70899effe7e65..31d0b5fdc760a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BlobLengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java similarity index 84% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java index da16af6018efd..8272ac7bd6212 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BytesToDoubleColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToDoubleColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java similarity index 84% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java index a3af6b9b341e6..b8e7f5c064b1d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BytesToFloatColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToFloatColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java similarity index 85% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java index 431f614d05c12..0bdaacb4244ab 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BytesToIntColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; public class BytesToIntColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java similarity index 84% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java index 649bb9602cce2..314076c381dcb 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/BytesToLongColumnTransformer.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; /** A transformer that converts byte array representations to long values */ public class BytesToLongColumnTransformer extends UnaryColumnTransformer { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CRC32Transformer.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CRC32Transformer.java index b1016313ce2d8..22d9b58b45ed2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CRC32Transformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CRC32Transformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java index 1a0a20ac3a524..9a86020a183fd 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CastFunctionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CeilColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CeilColumnTransformer.java index 365094f2e9b79..66a2f492653a0 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CeilColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CeilColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java index 551ff80d23d49..92818360019ed 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Concat2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ConcatColumnTransformer.concat; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.ConcatColumnTransformer.concat; public class Concat2ColumnTransformer extends BinaryColumnTransformer { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java index 5b4c3a671542d..eecc2ecca9d1d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ConcatColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java index bd44cd410b0a9..8ae350b8265a1 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ConcatMultiColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CosColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CosColumnTransformer.java index 70e2b2d900f6c..68cdce2a85e76 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CosColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CosColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CoshColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CoshColumnTransformer.java index a3e17a83b67d2..cd83b949273af 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/CoshColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/CoshColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java index ce758038b6d8b..71abdf569fad4 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DateBinFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java index 6e7d33fae6e64..86534a92de332 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DegreesColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DiffColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DiffColumnTransformer.java index 5c9ee9dea8b63..5aa14fb6f245d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DiffColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java index 2afc41a58bd49..04d65c594b9c5 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DiffFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java similarity index 85% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java index 9e3e25655bf6d..3953d51097848 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/DoubleToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java index a8e5c1252c532..51eb9c0a71e05 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/EndsWith2ColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class EndsWith2ColumnTransformer extends BinaryColumnTransformer { public EndsWith2ColumnTransformer( diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java similarity index 85% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java index 6e2fcab61f094..6040376efe973 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/EndsWithColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class EndsWithColumnTransformer extends UnaryColumnTransformer { private final byte[] suffix; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ExpColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ExpColumnTransformer.java index 76a097cb97220..c6488ea8cea49 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExpColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ExpColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ExtractTransformer.java similarity index 83% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ExtractTransformer.java index f64950e01fbb4..424632713f824 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ExtractTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ExtractTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -31,10 +31,10 @@ import java.util.function.Function; import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR; -import static org.apache.iotdb.commons.node_commons.utils.DateTimeUtils.convertToZonedDateTime; -import static org.apache.iotdb.commons.node_commons.utils.DateTimeUtils.getExtractTimestampMsPartFunction; -import static org.apache.iotdb.commons.node_commons.utils.DateTimeUtils.getExtractTimestampNsPartFunction; -import static org.apache.iotdb.commons.node_commons.utils.DateTimeUtils.getExtractTimestampUsPartFunction; +import static org.apache.iotdb.commons.queryengine.utils.DateTimeUtils.convertToZonedDateTime; +import static org.apache.iotdb.commons.queryengine.utils.DateTimeUtils.getExtractTimestampMsPartFunction; +import static org.apache.iotdb.commons.queryengine.utils.DateTimeUtils.getExtractTimestampNsPartFunction; +import static org.apache.iotdb.commons.queryengine.utils.DateTimeUtils.getExtractTimestampUsPartFunction; public class ExtractTransformer extends UnaryColumnTransformer { private final Function evaluateFunction; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java similarity index 85% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java index ac75b4866838f..69b1b10b81ed8 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/FloatToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/FloorColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/FloorColumnTransformer.java index 1299e949d9f11..bbe2be7a2aaed 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FloorColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/FloorColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/FormatColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/FormatColumnTransformer.java index 6f1ba96b729ab..36ee176e3e640 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/FormatColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/FormatColumnTransformer.java @@ -12,12 +12,12 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.MultiColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.MultiColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java index 09b6b82a83772..5871b13d15c76 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/GenericCodecColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.inteface.CodecStrategy; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.inteface.CodecStrategy; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; @@ -29,7 +29,7 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.util.TransformerDebugUtils.generateOriginalValue; /** * A generic, reusable column converter for handling all codec-based encoding/decoding functions. It diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java index 4e96bafef6df7..4b517c551077c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/HmacConstantKeyColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java similarity index 85% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java index 42a0e063a0528..6f857f68fd284 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/IntToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java index 34914b465c5e7..6ac8ac2b74747 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LTrim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LTrimColumnTransformer.ltrim; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.LTrimColumnTransformer.ltrim; public class LTrim2ColumnTransformer extends BinaryColumnTransformer { public LTrim2ColumnTransformer( diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java index 3d3908c5feecc..ea4d060a92754 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LTrimColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; public class LTrimColumnTransformer extends UnaryColumnTransformer { private final byte[] character; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LengthColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LengthColumnTransformer.java index 5cb1d2fc79ce1..44ab06163f19e 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LengthColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LengthColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LnColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LnColumnTransformer.java index 3e245c21f0174..612400fcadbe1 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LnColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LnColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java index 2b88356501992..3e6fd1bc4f7e4 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Log10ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java similarity index 85% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java index ba17a78828963..89e9dcdd3fbfa 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LongToBytesColumnTransformer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LowerColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LowerColumnTransformer.java index dc59a7abf123f..532205f40e0d2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/LowerColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/LowerColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java similarity index 85% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java index 0350bd7c1c8ba..b10cdedaaaa48 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ObjectLengthColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.utils.ObjectTypeUtils; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java index 1d372777af799..273a1a2cd6aee 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RTrim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RTrimColumnTransformer.rtrim; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.RTrimColumnTransformer.rtrim; public class RTrim2ColumnTransformer extends BinaryColumnTransformer { public RTrim2ColumnTransformer( diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java similarity index 87% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java index 04454f1e84ff9..300b61ab0b608 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RTrimColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.TrimColumnTransformer.isContain; public class RTrimColumnTransformer extends UnaryColumnTransformer { private final byte[] character; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java index c52d4ea33db4a..9620931344779 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RadiansColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java index 1c96abdd384b5..f6d1d81dba7c9 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RegexpLike2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java index 17dba89751c9e..4768cf9933e61 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RegexpLikeColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java index 9bf0f555ec7d2..fcf5267d3a703 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Replace2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java index 9695bd56143a4..85609a66b30c6 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Replace3ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ternary.TernaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java index acf7be08ffff8..20a1000e3d7e0 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/ReplaceFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RoundColumnTransformer.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RoundColumnTransformer.java index 1c04706c9e4cb..7f7abcac36e58 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RoundColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java index 9b5c86d477ea3..4a429c1f62ea3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/RoundFunctionColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SignColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SignColumnTransformer.java index 54f451f7d8f8d..079af0195dad5 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SignColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SignColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SinColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SinColumnTransformer.java index 2db2a7e8749b1..28a8785169f26 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SinColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SinhColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SinhColumnTransformer.java index 5bfcff6ce596c..1f775c86e81ac 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SinhColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SinhColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java index 8febb7e246f59..4cc398abf1f7b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SqrtColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java index 4ee39f549e2f1..1fa62d02f1ca4 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/StartsWith2ColumnTransformer.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.StartsWithColumnTransformer.equalCompare; public class StartsWith2ColumnTransformer extends BinaryColumnTransformer { public StartsWith2ColumnTransformer( diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java index a9e89ceedcc73..82b2e72ea076f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/StartsWithColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java index d84991076ce1d..5bc98486190f1 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Strcmp2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java index 4bea8a3eae09a..e40bed5dcfb1a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/StrcmpColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java index 9a8b4b45b5d51..7505969e27233 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Strpos2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/StrposColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/StrposColumnTransformer.java index b4434888e9064..984054277ffea 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/StrposColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/StrposColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java index b002078257874..58bc28bb0a6d5 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SubString2ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java index 5122fd302893d..fc8e9354a2baa 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SubString3ColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.TernaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ternary.TernaryColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; @@ -29,7 +29,7 @@ import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.BytesUtils; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; public class SubString3ColumnTransformer extends TernaryColumnTransformer { public SubString3ColumnTransformer( diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java index b5776bb79421b..566e78c377561 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/SubStringColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/TanColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/TanColumnTransformer.java index d84b1bd6aa710..b44a57a2a3e0a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/TanColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/TanhColumnTransformer.java similarity index 90% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/TanhColumnTransformer.java index e115392e65da9..0698d956772d3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TanhColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/TanhColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java similarity index 86% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java index efc6ccad11f75..90c39f6ac390d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/Trim2ColumnTransformer.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.Binary; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.TrimColumnTransformer.trim; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.TrimColumnTransformer.trim; public class Trim2ColumnTransformer extends BinaryColumnTransformer { public Trim2ColumnTransformer( diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/TrimColumnTransformer.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/TrimColumnTransformer.java index 77726a15c0a10..8d4dae85f314f 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TrimColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/TrimColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java index 1df94dd92b243..9d07564640b43 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/TryCastFunctionColumnTransformer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/UpperColumnTransformer.java similarity index 89% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/UpperColumnTransformer.java index 5bad3b51e8560..743d984a9112c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/UpperColumnTransformer.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/UpperColumnTransformer.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java index 824bda90f5d8f..af6456cb87478 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/factory/CodecStrategiesFactory.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.inteface.CodecStrategy; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.HexUtils; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util.SpookyHashV2Utils; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.inteface.CodecStrategy; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.util.HexUtils; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.util.SpookyHashV2Utils; import org.apache.iotdb.commons.exception.SemanticException; import com.google.common.hash.Hashing; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java index 99a6b8335368e..f0a38b11453b0 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/factory/NumericCodecStrategiesFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java similarity index 91% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java index a4eef93dc4fc0..99e13c0514862 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/inteface/CodecStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.inteface; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar.inteface; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/util/HexUtils.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/util/HexUtils.java index 2a6fd49b089dd..76c4d409c55ef 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/HexUtils.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/util/HexUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar.util; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java similarity index 99% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java index 34f96b004a983..d726f4deff6a7 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/util/SpookyHashV2Utils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar.util; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java similarity index 88% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java index a4bf5c05bf501..35bf7daf08cc2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/column/unary/scalar/util/TransformerDebugUtils.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.util; +package org.apache.iotdb.calc.transformation.dag.column.unary.scalar.util; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.Type; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isCharType; /** * A utility class for generating user-friendly debug information during the execution of diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDFParametersFactory.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/udf/UDFParametersFactory.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDFParametersFactory.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/udf/UDFParametersFactory.java index 7d5ba8440de6e..e701c10eb8894 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDFParametersFactory.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/udf/UDFParametersFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.udf; +package org.apache.iotdb.calc.transformation.dag.udf; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDTFExecutor.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/udf/UDTFExecutor.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDTFExecutor.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/udf/UDTFExecutor.java index 6dd5fb08b1490..9242f722c1ac3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/udf/UDTFExecutor.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/udf/UDTFExecutor.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.udf; +package org.apache.iotdb.calc.transformation.dag.udf; -import org.apache.iotdb.calc_commons.transformation.dag.adapter.PointCollectorAdaptor; -import org.apache.iotdb.calc_commons.transformation.dag.util.InputRowUtils; -import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; -import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.calc.transformation.dag.adapter.PointCollectorAdaptor; +import org.apache.iotdb.calc.transformation.dag.util.InputRowUtils; +import org.apache.iotdb.calc.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.commons.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.UDTF; import org.apache.iotdb.udf.api.access.Row; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/BitwiseUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/util/BitwiseUtils.java similarity index 99% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/BitwiseUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/util/BitwiseUtils.java index df1a1330f26c7..a5758094742cb 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/BitwiseUtils.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/util/BitwiseUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.util; +package org.apache.iotdb.calc.transformation.dag.util; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CastFunctionUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/util/CastFunctionUtils.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CastFunctionUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/util/CastFunctionUtils.java index 91596abf4175a..b4e1ffeb29ce7 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CastFunctionUtils.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/util/CastFunctionUtils.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.util; +package org.apache.iotdb.calc.transformation.dag.util; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CommonTransformUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/util/CommonTransformUtils.java similarity index 85% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CommonTransformUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/util/CommonTransformUtils.java index a7ee0dbc4812b..25f57d2b0bf72 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/CommonTransformUtils.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/util/CommonTransformUtils.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.util; +package org.apache.iotdb.calc.transformation.dag.util; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/InputRowUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/util/InputRowUtils.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/InputRowUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/util/InputRowUtils.java index bec96c63e18e0..f17f11baefb97 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/dag/util/InputRowUtils.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/util/InputRowUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.dag.util; +package org.apache.iotdb.calc.transformation.dag.util; public class InputRowUtils { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/Cache.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/Cache.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/Cache.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/Cache.java index 29f775b335beb..4180fdc60072b 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/Cache.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/Cache.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.datastructure; +package org.apache.iotdb.calc.transformation.datastructure; import java.util.LinkedHashMap; import java.util.Map; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/SerializableList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/SerializableList.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/SerializableList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/SerializableList.java index a7f3f911f63bd..ee70df305ed96 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/SerializableList.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/SerializableList.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.datastructure; +package org.apache.iotdb.calc.transformation.datastructure; -import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; +import org.apache.iotdb.calc.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.file.SystemFileFactory; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/iterator/ListForwardIterator.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/iterator/ListForwardIterator.java index 50c31a893d4a9..6f0aa14fada06 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/ListForwardIterator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/iterator/ListForwardIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.datastructure.iterator; +package org.apache.iotdb.calc.transformation.datastructure.iterator; import java.io.IOException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/iterator/RowListForwardIterator.java similarity index 92% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/iterator/RowListForwardIterator.java index ba7e889f14441..1b91904d4dcb0 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/RowListForwardIterator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/iterator/RowListForwardIterator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.datastructure.iterator; +package org.apache.iotdb.calc.transformation.datastructure.iterator; -import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; -import org.apache.iotdb.calc_commons.transformation.datastructure.row.SerializableRowList; +import org.apache.iotdb.calc.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.calc.transformation.datastructure.row.SerializableRowList; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/iterator/TVListForwardIterator.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/iterator/TVListForwardIterator.java index 1739cf484b846..783416a235881 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/iterator/TVListForwardIterator.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/iterator/TVListForwardIterator.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.datastructure.iterator; +package org.apache.iotdb.calc.transformation.datastructure.iterator; -import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; -import org.apache.iotdb.calc_commons.transformation.datastructure.tv.SerializableTVList; +import org.apache.iotdb.calc.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc.transformation.datastructure.tv.SerializableTVList; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/row/ElasticSerializableRowList.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/row/ElasticSerializableRowList.java index 500d6b5948ef3..22d5f4d0acee3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/ElasticSerializableRowList.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/row/ElasticSerializableRowList.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.datastructure.row; +package org.apache.iotdb.calc.transformation.datastructure.row; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.transformation.datastructure.Cache; -import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; -import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.transformation.datastructure.Cache; +import org.apache.iotdb.calc.transformation.datastructure.SerializableList; +import org.apache.iotdb.calc.transformation.datastructure.iterator.RowListForwardIterator; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/SerializableRowList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/row/SerializableRowList.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/SerializableRowList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/row/SerializableRowList.java index 640e79d01e133..9a20578746e70 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/row/SerializableRowList.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/row/SerializableRowList.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.datastructure.row; +package org.apache.iotdb.calc.transformation.datastructure.row; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.transformation.datastructure.SerializableList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; @@ -35,8 +35,8 @@ import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_ARRAY_HEADER_SIZE; -import static org.apache.iotdb.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_OBJECT_HEADER_SIZE; +import static org.apache.iotdb.calc.transformation.datastructure.util.BinaryUtils.MIN_ARRAY_HEADER_SIZE; +import static org.apache.iotdb.calc.transformation.datastructure.util.BinaryUtils.MIN_OBJECT_HEADER_SIZE; import static org.apache.iotdb.commons.conf.IoTDBConstant.MB; public class SerializableRowList implements SerializableList { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java index 7702120b42ccb..7961aa1a9e21a 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/tv/ElasticSerializableBinaryTVList.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.datastructure.tv; +package org.apache.iotdb.calc.transformation.datastructure.tv; -import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; -import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.calc_commons.transformation.datastructure.util.BinaryUtils; +import org.apache.iotdb.calc.transformation.datastructure.SerializableList; +import org.apache.iotdb.calc.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.calc.transformation.datastructure.util.BinaryUtils; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/tv/ElasticSerializableTVList.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/tv/ElasticSerializableTVList.java index 1af664ac0c1e5..818bc6ae8c882 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/ElasticSerializableTVList.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/tv/ElasticSerializableTVList.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.datastructure.tv; +package org.apache.iotdb.calc.transformation.datastructure.tv; -import org.apache.iotdb.calc_commons.transformation.datastructure.Cache; -import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.calc.transformation.datastructure.Cache; +import org.apache.iotdb.calc.transformation.datastructure.iterator.TVListForwardIterator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/SerializableTVList.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/tv/SerializableTVList.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/SerializableTVList.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/tv/SerializableTVList.java index fe0680151c50a..17da47b477180 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/tv/SerializableTVList.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/tv/SerializableTVList.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.datastructure.tv; +package org.apache.iotdb.calc.transformation.datastructure.tv; -import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; +import org.apache.iotdb.calc.transformation.datastructure.SerializableList; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.tsfile.block.column.Column; @@ -37,8 +37,8 @@ import java.util.List; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_ARRAY_HEADER_SIZE; -import static org.apache.iotdb.calc_commons.transformation.datastructure.util.BinaryUtils.MIN_OBJECT_HEADER_SIZE; +import static org.apache.iotdb.calc.transformation.datastructure.util.BinaryUtils.MIN_ARRAY_HEADER_SIZE; +import static org.apache.iotdb.calc.transformation.datastructure.util.BinaryUtils.MIN_OBJECT_HEADER_SIZE; import static org.apache.iotdb.commons.conf.IoTDBConstant.MB; public class SerializableTVList implements SerializableList { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/util/BinaryUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/util/BinaryUtils.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/util/BinaryUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/util/BinaryUtils.java index 74d915805bcfe..d74a171ffa32d 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/transformation/datastructure/util/BinaryUtils.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/datastructure/util/BinaryUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.transformation.datastructure.util; +package org.apache.iotdb.calc.transformation.datastructure.util; import org.apache.tsfile.common.conf.TSFileConfig; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/HeapTraversal.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/HeapTraversal.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/HeapTraversal.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/HeapTraversal.java index c5da07587ad7d..fdd7be0fb7808 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/HeapTraversal.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/HeapTraversal.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils; +package org.apache.iotdb.calc.utils; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileService.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/IObjectFileService.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileService.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/IObjectFileService.java index df32dfe20bd62..9ab149b26ef72 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileService.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/IObjectFileService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils; +package org.apache.iotdb.calc.utils; import org.apache.tsfile.utils.Binary; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileServiceProvider.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/IObjectFileServiceProvider.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileServiceProvider.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/IObjectFileServiceProvider.java index 8a310e38ce9a9..5e79beade2726 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectFileServiceProvider.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/IObjectFileServiceProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils; +package org.apache.iotdb.calc.utils; public interface IObjectFileServiceProvider { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectPath.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/IObjectPath.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectPath.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/IObjectPath.java index ffefc7aff4027..4be55129da3e4 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/IObjectPath.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/IObjectPath.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils; +package org.apache.iotdb.calc.utils; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/ObjectTypeUtils.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/ObjectTypeUtils.java similarity index 99% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/ObjectTypeUtils.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/ObjectTypeUtils.java index 9b739dc40ec07..51a28f9e72425 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/ObjectTypeUtils.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/ObjectTypeUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils; +package org.apache.iotdb.calc.utils; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/constant/SqlConstant.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/constant/SqlConstant.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/constant/SqlConstant.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/constant/SqlConstant.java index f5fc601df1afd..461ee37e67bcd 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/constant/SqlConstant.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/constant/SqlConstant.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils.constant; +package org.apache.iotdb.calc.utils.constant; import org.apache.iotdb.commons.path.PartialPath; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortHeap.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/datastructure/MergeSortHeap.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortHeap.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/datastructure/MergeSortHeap.java index 41308ab24b479..68c0206134786 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortHeap.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/datastructure/MergeSortHeap.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils.datastructure; +package org.apache.iotdb.calc.utils.datastructure; import java.util.Arrays; import java.util.Comparator; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortKey.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/datastructure/MergeSortKey.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortKey.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/datastructure/MergeSortKey.java index 12a2f3bfe7f78..012a3bc87d054 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/MergeSortKey.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/datastructure/MergeSortKey.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils.datastructure; +package org.apache.iotdb.calc.utils.datastructure; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/SortKey.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/datastructure/SortKey.java similarity index 94% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/SortKey.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/datastructure/SortKey.java index d24863960a7b3..f5390f7ad69f1 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/datastructure/SortKey.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/datastructure/SortKey.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils.datastructure; +package org.apache.iotdb.calc.utils.datastructure; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/DiskSpiller.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/DiskSpiller.java similarity index 98% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/DiskSpiller.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/DiskSpiller.java index 2d5af5ccb7673..43cc574d26bf2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/DiskSpiller.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/DiskSpiller.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils.sort; +package org.apache.iotdb.calc.utils.sort; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/FileSpillerReader.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/FileSpillerReader.java similarity index 97% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/FileSpillerReader.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/FileSpillerReader.java index c1a8aa4a81c7b..af7d726d5fff3 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/FileSpillerReader.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/FileSpillerReader.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils.sort; +package org.apache.iotdb.calc.utils.sort; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc.utils.datastructure.MergeSortKey; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/MemoryReader.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/MemoryReader.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/MemoryReader.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/MemoryReader.java index f1cc616e2179c..c55c2deba8857 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/MemoryReader.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/MemoryReader.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils.sort; +package org.apache.iotdb.calc.utils.sort; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc.utils.datastructure.MergeSortKey; import org.apache.iotdb.commons.exception.IoTDBException; import java.util.List; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortBufferManager.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/SortBufferManager.java similarity index 95% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortBufferManager.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/SortBufferManager.java index c43f75dea7064..f6f84d553b98c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortBufferManager.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/SortBufferManager.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils.sort; +package org.apache.iotdb.calc.utils.sort; -import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc.exception.MemoryNotEnoughException; public class SortBufferManager { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortReader.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/SortReader.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortReader.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/SortReader.java index e5be6abcdfec3..a3806da687915 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/SortReader.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/SortReader.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils.sort; +package org.apache.iotdb.calc.utils.sort; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc.utils.datastructure.MergeSortKey; import org.apache.iotdb.commons.exception.IoTDBException; public interface SortReader { diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TableDiskSpiller.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/TableDiskSpiller.java similarity index 93% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TableDiskSpiller.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/TableDiskSpiller.java index 405b6a33b1485..317d3369f88e2 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TableDiskSpiller.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/TableDiskSpiller.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils.sort; +package org.apache.iotdb.calc.utils.sort; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TreeDiskSpiller.java b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/TreeDiskSpiller.java similarity index 96% rename from iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TreeDiskSpiller.java rename to iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/TreeDiskSpiller.java index da41d1fefe8c9..e0e573bc3278c 100644 --- a/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc_commons/utils/sort/TreeDiskSpiller.java +++ b/iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/utils/sort/TreeDiskSpiller.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.calc_commons.utils.sort; +package org.apache.iotdb.calc.utils.sort; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java index 4c0bd4ad9417c..199dbc75fc6a8 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/ttl/ShowTTLPlan.java @@ -19,7 +19,7 @@ package org.apache.iotdb.confignode.consensus.request.read.ttl; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType; import org.apache.iotdb.confignode.consensus.request.read.ConfigPhysicalReadPlan; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java index 8dc18b9b70115..49f10a79e8ac3 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/pipe/task/PipeTableResp.java @@ -24,7 +24,6 @@ import org.apache.iotdb.commons.auth.entity.PrivilegeType; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeRuntimeMeta; @@ -34,6 +33,7 @@ import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant; import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant; import org.apache.iotdb.commons.pipe.config.constant.SystemConstant; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.confignode.manager.pipe.source.ConfigRegionListeningFilter; import org.apache.iotdb.confignode.rpc.thrift.TGetAllPipeInfoResp; import org.apache.iotdb.confignode.rpc.thrift.TShowPipeInfo; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java index 065cd1ac9841f..904d29f38481c 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java @@ -19,7 +19,7 @@ package org.apache.iotdb.confignode.manager; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.Model; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTreePatternParseVisitor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTreePatternParseVisitor.java index 95ecd0d7890b2..cb332742fde77 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTreePatternParseVisitor.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/source/PipeConfigTreePatternParseVisitor.java @@ -20,12 +20,12 @@ package org.apache.iotdb.confignode.manager.pipe.source; import org.apache.iotdb.commons.auth.entity.PrivilegeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; 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.pipe.datastructure.pattern.IoTDBTreePatternOperations; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan; import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanVisitor; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java index 019c722a216bc..f691292c7079b 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/AddRegionPeerProcedure.java @@ -24,7 +24,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.cluster.RegionStatus; import org.apache.iotdb.commons.exception.runtime.ThriftSerDeException; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java index 8c29105368d6f..0cd1a00c7247f 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/ReconstructRegionProcedure.java @@ -22,7 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.exception.runtime.ThriftSerDeException; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RegionMigrateProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RegionMigrateProcedure.java index 8b8c217f383bb..899d0504767c5 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RegionMigrateProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RegionMigrateProcedure.java @@ -22,7 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.exception.runtime.ThriftSerDeException; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java index 8c3cb95df5c9e..05d57a0c09e15 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/region/RemoveRegionPeerProcedure.java @@ -25,7 +25,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.cluster.RegionStatus; import org.apache.iotdb.commons.exception.runtime.ThriftSerDeException; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv; diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml index fdcc21680fbb2..dca6f72db75cd 100644 --- a/iotdb-core/datanode/pom.xml +++ b/iotdb-core/datanode/pom.xml @@ -408,7 +408,7 @@ ${project.build.directory}/codegen - ${maven.multiModuleProjectDirectory}/iotdb-core/calc_commons/src/main/codegen + ${maven.multiModuleProjectDirectory}/iotdb-core/calc-commons/src/main/codegen false diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java index 39b090b225584..2e517eaf57b0d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.conf; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.binaryallocator.BinaryAllocator; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java index b63c899be6073..73f99f8b269cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/BaseStateMachine.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.consensus.statemachine; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.IStateMachine; import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java index 25ff9408e7901..5de040eeba28a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataExecutionVisitor.java @@ -22,8 +22,8 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.db.exception.BatchProcessException; import org.apache.iotdb.db.exception.WriteProcessException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachine.java index c3e1dc6f9ff38..5225f33971874 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachine.java @@ -23,7 +23,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.consensus.DataRegionId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.common.request.IndexedConsensusRequest; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java index 49a9e0c3b4a37..562c9bbf999de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/dataregion/IoTConsensusDataRegionStateMachine.java @@ -22,8 +22,8 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.index.ComparableConsensusRequest; import org.apache.iotdb.commons.consensus.index.impl.IoTProgressIndex; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.common.request.BatchIndexedConsensusRequest; import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java index fac85531a51f7..f3ddfbab7b292 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaExecutionVisitor.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.utils.MetadataUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java index daeba2f58d38d..edab5862d11e8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/statemachine/schemaregion/SchemaRegionStateMachine.java @@ -22,7 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.ConsensusGroupId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.common.DataSet; import org.apache.iotdb.consensus.ratis.utils.Utils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/BatchProcessException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/BatchProcessException.java index 6db4981cbb36b..1e51440da3be8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/BatchProcessException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/BatchProcessException.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.exception; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TSStatus; import java.util.Arrays; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java index 994ce8743512f..16c058f100e29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/exception/query/OutOfTTLException.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.exception.query; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.rpc.TSStatusCode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java index 33e9465d3f365..031cfd3a62e0e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/PipeDataNodeTaskAgent.java @@ -31,7 +31,6 @@ import org.apache.iotdb.commons.consensus.index.impl.MetaProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.commons.pipe.agent.task.PipeTask; import org.apache.iotdb.commons.pipe.agent.task.PipeTaskAgent; @@ -45,6 +44,7 @@ import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant; import org.apache.iotdb.commons.pipe.config.constant.SystemConstant; import org.apache.iotdb.commons.pipe.resource.log.PipeLogger; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.consensus.exception.ConsensusException; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java index 5db4482c2cd1a..6e26a76d77481 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/task/subtask/sink/PipeSinkSubtask.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.pipe.agent.task.subtask.sink; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.commons.pipe.agent.task.subtask.PipeAbstractSinkSubtask; import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.sink.protocol.IoTDBSink; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.utils.ErrorHandlingCommonUtils; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.UserDefinedEnrichedEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/deletion/PipeDeleteDataNodeEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/deletion/PipeDeleteDataNodeEvent.java index 243dfadbf3ffd..5cfaf506eedec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/deletion/PipeDeleteDataNodeEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/deletion/PipeDeleteDataNodeEvent.java @@ -22,12 +22,12 @@ import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.SerializableEvent; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.AbstractDeleteDataNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java index 9c69e46cc9ce4..33697f6d5ab85 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/heartbeat/PipeHeartbeatEvent.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.db.pipe.metric.overview.PipeDataNodeSinglePipeMetrics; import org.apache.iotdb.db.pipe.metric.overview.PipeHeartbeatEventMetrics; import org.apache.iotdb.db.pipe.source.dataregion.realtime.disruptor.RingBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java index 0e486cc3521b2..14d8c6b69476d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionSnapshotEvent.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.pipe.event.common.schema; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; @@ -27,6 +26,7 @@ import org.apache.iotdb.commons.pipe.event.PipeSnapshotEvent; import org.apache.iotdb.commons.pipe.resource.ref.PipePhantomReferenceManager.PipeEventResource; import org.apache.iotdb.commons.pipe.resource.snapshot.PipeSnapshotResourceManager; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.pipe.event.ReferenceTrackableEvent; import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager; import org.apache.iotdb.db.queryengine.plan.statement.StatementType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java index b4d723480cfe3..52924729d10f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/schema/PipeSchemaRegionWritePlanEvent.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.pipe.event.common.schema; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.PipeWritePlanEvent; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java index 6851493b080cf..63bdbd1daec39 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/AggregateProcessor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.pipe.processor.aggregate; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; +import org.apache.iotdb.calc.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.consensus.index.ProgressIndex; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/window/processor/TumblingWindowingProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/window/processor/TumblingWindowingProcessor.java index 3b27684a5e830..59aae9625f6d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/window/processor/TumblingWindowingProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/aggregate/window/processor/TumblingWindowingProcessor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.processor.aggregate.window.processor; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.pipe.processor.aggregate.window.datastructure.TimeSeriesWindow; import org.apache.iotdb.db.pipe.processor.aggregate.window.datastructure.WindowOutput; import org.apache.iotdb.db.pipe.processor.aggregate.window.datastructure.WindowState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/downsampling/tumbling/TumblingTimeSamplingProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/downsampling/tumbling/TumblingTimeSamplingProcessor.java index 2043d5a53cce4..a9c735414d62c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/downsampling/tumbling/TumblingTimeSamplingProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/processor/downsampling/tumbling/TumblingTimeSamplingProcessor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.pipe.processor.downsampling.tumbling; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.pipe.processor.downsampling.DownSamplingProcessor; import org.apache.iotdb.db.pipe.processor.downsampling.PartialPathLastObjectCache; import org.apache.iotdb.pipe.api.access.Row; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java index fdb4143e6aaf2..073286cab81ae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/IoTDBLegacyPipeReceiverAgent.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/DeletionLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/DeletionLoader.java index 7d48a378bab7c..ccb91ceca964f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/DeletionLoader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/DeletionLoader.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadFileException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/TsFileLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/TsFileLoader.java index cd7e85dfb0c53..1c95b574b54c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/TsFileLoader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/legacy/loader/TsFileLoader.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadFileException; 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 4f4bfba136b28..59f459463a6ae 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 @@ -647,10 +647,10 @@ private TSStatus loadSchemaSnapShot( .flatMap(parsedStatement -> batchVisitor.process(parsedStatement, null)) .ifPresent(statement -> results.add(executeStatementAndClassifyExceptions(statement))); } else if (treeOrTableStatement - instanceof org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement) { - final org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement + instanceof org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement) { + final org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement originalStatement = - (org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement) + (org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement) treeOrTableStatement; if (!executionTypes.contains(StatementType.AUTO_CREATE_DEVICE_MNODE)) { @@ -701,7 +701,7 @@ private TPipeTransferResp handleTransferSchemaPlan(final PipeTransferPlanNodeReq ? new TPipeTransferResp(executeStatementAndClassifyExceptions((Statement) statement)) : new TPipeTransferResp( executeStatementForTableModelWithPermissionCheck( - (org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement) statement, + (org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement) statement, null)); } @@ -1060,7 +1060,7 @@ private TSStatus executeStatementForTreeModel(final Statement statement) { } private TSStatus executeStatementForTableModelWithPermissionCheck( - final org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statement, + final org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement statement, final String databaseName) { try { final TSStatus status = loginIfNecessary(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/converter/ValueConverter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/converter/ValueConverter.java index 3e8f39916859a..2f1f219c8ed22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/converter/ValueConverter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/converter/ValueConverter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.pipe.receiver.transform.converter; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.db.utils.DataNodeDateTimeUtils; import org.apache.iotdb.db.utils.TypeInferenceUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertRowStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertRowStatement.java index 8095d0f4ea06f..c3db7954b40be 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertRowStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertRowStatement.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.pipe.receiver.transform.statement; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.pipe.resource.log.PipeLogger; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java index 695a00834f3f3..dd0ccf373cdb1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipePlanToStatementVisitor.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.pipe.receiver.visitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterTimeSeriesNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java index c3b4950b20a40..22771efcd5900 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/visitor/PipeStatementTablePatternParseVisitor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.receiver.visitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateOrUpdateDevice; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java index e175113737a59..8f7dc24e3e835 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferPlanNodeReq.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.pipe.sink.payload.evolvable.request; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion; import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq; import org.apache.tsfile.utils.BytesUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java index 145a4fe06f5d0..93d79146a018e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/payload/evolvable/request/PipeTransferTabletBinaryReq.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.sink.payload.evolvable.request; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.IoTDBSinkRequestVersion; import org.apache.iotdb.commons.pipe.sink.payload.thrift.request.PipeRequestType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.receiver.protocol.thrift.IoTDBDataNodeReceiver; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2DeleteNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2DeleteNodeReq.java index c963322bece94..a0558417b3960 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2DeleteNodeReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2DeleteNodeReq.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.commons.consensus.index.ProgressIndex; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestType; import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestVersion; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TCommitId; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TIoTConsensusV2TransferReq; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.AbstractDeleteDataNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletBinaryReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletBinaryReq.java index 1ce3f0b2a305d..ae2901c3f039e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletBinaryReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletBinaryReq.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.commons.consensus.index.ProgressIndex; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestType; import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestVersion; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TCommitId; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TIoTConsensusV2TransferReq; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletInsertNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletInsertNodeReq.java index 637560faee9cb..bd89f23a63ddc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletInsertNodeReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/iotconsensusv2/payload/request/IoTConsensusV2TabletInsertNodeReq.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.commons.consensus.index.ProgressIndex; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestType; import org.apache.iotdb.commons.pipe.sink.payload.iotconsensusv2.request.IoTConsensusV2RequestVersion; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TCommitId; import org.apache.iotdb.consensus.iotconsensusv2.thrift.TIoTConsensusV2TransferReq; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java index 6133f33b94eea..8d33c7ff9f40c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/server/OpcUaNameSpace.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.exception.pipe.PipeRuntimeCriticalException; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeNonCriticalException; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.pipe.resource.log.PipeLogger; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.pipe.sink.protocol.opcua.OpcUaSink; import org.apache.iotdb.db.pipe.sink.util.sorter.PipeTableModelTabletEventSorter; import org.apache.iotdb.db.pipe.sink.util.sorter.PipeTreeModelTabletEventSorter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java index be01bb6f00a24..8e02f6af358ad 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/writeback/WriteBackSink.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.pipe.resource.log.PipeLogger; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema; import org.apache.iotdb.db.auth.AuthorityChecker; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java index 91cf7f4b77f70..e88476a27db11 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTableModelTsFileBuilderV2.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.sink.util.builder; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; import org.apache.iotdb.db.storageengine.dataregion.flush.MemTableFlushTask; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java index 4e4b80a85c73a..28b9a2e7ac395 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/util/builder/PipeTreeModelTsFileBuilderV2.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.sink.util.builder; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.storageengine.dataregion.flush.MemTableFlushTask; import org.apache.iotdb.db.storageengine.dataregion.memtable.IMemTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java index 46b0785ab6aba..a748218d250a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/IoTDBDataRegionSource.java @@ -21,7 +21,6 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.consensus.DataRegionId; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.pipe.agent.task.PipeTaskAgent; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta; import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant; @@ -29,6 +28,7 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePatternOperations; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.pipe.source.IoTDBSource; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.pipe.event.common.heartbeat.PipeHeartbeatEvent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java index c3467625fa98f..6cac048baf20a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionSource.java @@ -27,7 +27,6 @@ import org.apache.iotdb.commons.consensus.index.impl.StateProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.TimeWindowStateProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.pipe.agent.task.PipeTaskAgent; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; @@ -38,6 +37,7 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.pipe.datastructure.resource.PersistentResource; import org.apache.iotdb.commons.pipe.event.ProgressReportEvent; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.consensus.pipe.IoTConsensusV2; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java index 0124c46d2da1d..02e32f27e03b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/PipeRealtimeDataRegionSource.java @@ -22,7 +22,6 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.exception.pipe.PipeRuntimeNonCriticalException; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.pipe.agent.task.connection.UnboundedBlockingPendingQueue; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant; @@ -31,6 +30,7 @@ import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.ProgressReportEvent; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java index 3faab85abf28b..10b559a3c8901 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/IoTDBSchemaRegionSource.java @@ -24,17 +24,17 @@ import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.queue.listening.AbstractPipeListeningQueue; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.PipeSnapshotEvent; import org.apache.iotdb.commons.pipe.event.PipeWritePlanEvent; import org.apache.iotdb.commons.pipe.source.IoTDBNonDataRegionSource; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.consensus.exception.ConsensusException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java index 5aeb2aeca52b3..6d4e82a19abd5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePatternParseVisitor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.source.schemaregion; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java index cddd26331b7ad..17075ee46b42f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTablePrivilegeParseVisitor.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.pipe.source.schemaregion; import org.apache.iotdb.commons.audit.IAuditEntity; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java index a5c7a6a4a8b9c..5c9fc5c0fbaa7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePatternParseVisitor.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.pipe.source.schemaregion; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePatternOperations; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java index 532547f7b1f0d..2d97cfa170132 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipePlanTreePrivilegeParseVisitor.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.audit.IAuditEntity; import org.apache.iotdb.commons.auth.entity.PrivilegeType; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java index 99269d05cc9b3..86ad46268afe3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTableStatementToPlanVisitor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.source.schemaregion; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CreateOrUpdateDevice; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java index 470de5c8d811c..4f3bcf5c0f103 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/PipeTreeStatementToPlanVisitor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.pipe.source.schemaregion; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.BatchActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalCreateMultiTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java index a0d037b4d83ef..06cb297fff875 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningFilter.java @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.TreePattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; import org.apache.iotdb.db.schemaengine.SchemaEngine; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningQueue.java index 218ddf0a4a9e4..bb7e18eb21caa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningQueue.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/schemaregion/SchemaRegionListeningQueue.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.pipe.source.schemaregion; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.pipe.datastructure.queue.listening.AbstractPipeListeningQueue; import org.apache.iotdb.commons.pipe.event.EnrichedEvent; import org.apache.iotdb.commons.pipe.event.SerializableEvent; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionSnapshotEvent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaSerializableEventType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/DataNodeInternalClient.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/DataNodeInternalClient.java index 0978337a96ea7..f4b107f92ff20 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/DataNodeInternalClient.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/DataNodeInternalClient.java @@ -21,7 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeService.java index 5b4e3b128867f..bd442a14d8a86 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeService.java @@ -23,7 +23,7 @@ import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; import org.apache.iotdb.commons.client.IClientManager; import org.apache.iotdb.commons.client.exception.ClientManagerException; -import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeService; +import org.apache.iotdb.commons.queryengine.plan.relational.function.ITableFunctionAINodeService; import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; import org.apache.thrift.TException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeServiceProvider.java index 8357d2e84cb76..c23444a8c072f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeServiceProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/an/DataNodeTableFunctionAINodeServiceProvider.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.protocol.client.an; -import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeService; -import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider; +import org.apache.iotdb.commons.queryengine.plan.relational.function.ITableFunctionAINodeService; +import org.apache.iotdb.commons.queryengine.plan.relational.function.ITableFunctionAINodeServiceProvider; public class DataNodeTableFunctionAINodeServiceProvider implements ITableFunctionAINodeServiceProvider { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java index 01a113eece5ab..87d89da44f815 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.protocol.session; import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion; -import org.apache.iotdb.commons.node_commons.common.ConnectionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.common.ConnectionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.service.rpc.thrift.TSConnectionInfo; import org.apache.iotdb.service.rpc.thrift.TSConnectionType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/PreparedStatementInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/PreparedStatementInfo.java index bc68db61424ac..0eb544bf68e61 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/PreparedStatementInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/PreparedStatementInfo.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.protocol.session; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java index ae6f03f03e6df..b5903778a72d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java @@ -26,9 +26,9 @@ import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.node_commons.common.ConnectionInfo; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.common.ConnectionInfo; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; import org.apache.iotdb.commons.service.JMXService; import org.apache.iotdb.commons.service.ServiceType; import org.apache.iotdb.commons.service.metric.MetricService; 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 65fe1d53aa7f7..a6b869d849608 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 @@ -35,19 +35,6 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.path.AlignedFullPath; @@ -55,6 +42,19 @@ 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.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.db.audit.DNAuditLogger; import org.apache.iotdb.db.auth.AuthorityChecker; @@ -417,7 +417,7 @@ private TSExecuteStatementResp executeStatementInternal( } } } else { - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement s = + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement s = request.getTableStatement(relationSqlParser, clientSession.getZoneId(), clientSession); if (s instanceof Use) { @@ -606,8 +606,8 @@ public Statement getTreeStatement(ZoneId zoneId) { } @Override - public org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement - getTableStatement(SqlParser parser, ZoneId zoneId, IClientSession clientSession) { + public org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement getTableStatement( + SqlParser parser, ZoneId zoneId, IClientSession clientSession) { return parser.createStatement(req.getStatement(), zoneId, clientSession); } @@ -650,8 +650,8 @@ public Statement getTreeStatement(ZoneId zoneId) { } @Override - public org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement - getTableStatement(SqlParser parser, ZoneId zoneId, IClientSession clientSession) { + public org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement getTableStatement( + SqlParser parser, ZoneId zoneId, IClientSession clientSession) { ensureParsed(); return executeStatement; } @@ -1690,7 +1690,7 @@ public TSPrepareResp prepareStatement(TSPrepareReq req) { String sql = req.getSql(); String statementName = req.getStatementName(); - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statement = + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement statement = relationSqlParser.createStatement(sql, clientSession.getZoneId(), clientSession); if (statement == null) { @@ -2173,7 +2173,7 @@ public TSStatus executeBatchStatement(TSExecuteBatchStatementReq req) { } } else { - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement s = + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement s = relationSqlParser.createStatement( statement, clientSession.getZoneId(), clientSession); @@ -3624,7 +3624,7 @@ private ExecutionResult executeBatchStatement( * @return the execution result */ private ExecutionResult executeBatchTableStatement( - final org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statement, + final org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement statement, final SqlParser relationSqlParser, final IClientSession clientSession, final long queryId, @@ -3635,7 +3635,7 @@ private ExecutionResult executeBatchTableStatement( final boolean userQuery) { ExecutionResult result = null; - List + List subStatements = statement.getSubStatements(); int totalSubStatements = subStatements.size(); LOGGER.info( @@ -3644,7 +3644,7 @@ private ExecutionResult executeBatchTableStatement( queryId); for (int i = 0; i < totalSubStatements; i++) { - final org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement subStatement = + final org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement subStatement = subStatements.get(i); LOGGER.info( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java index 5a28e060ff4ac..898744401543f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.protocol.thrift.impl; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; @@ -65,11 +65,6 @@ import org.apache.iotdb.commons.enums.DataPartitionTableGeneratorState; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.partition.DataPartitionTable; import org.apache.iotdb.commons.partition.DatabaseScopedDataPartitionTable; import org.apache.iotdb.commons.path.ExtendedPartialPath; @@ -80,6 +75,11 @@ import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.commons.pipe.agent.task.PipeTaskAgent; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeMeta; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.cache.CacheClearOptions; import org.apache.iotdb.commons.schema.filter.SchemaFilterFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/NativeStatementRequest.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/NativeStatementRequest.java index 7493e2684e660..1b189b0df32b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/NativeStatementRequest.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/NativeStatementRequest.java @@ -74,7 +74,7 @@ public interface NativeStatementRequest extends Supplier { * @param clientSession the client session * @return the parsed Table model Statement, or null if not supported */ - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement getTableStatement( + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement getTableStatement( SqlParser parser, ZoneId zoneId, IClientSession clientSession); /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java index b6f3b518dd8f3..e3b33fe9c6b8c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.common; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.audit.AuditEventType; import org.apache.iotdb.commons.audit.AuditLogOperation; import org.apache.iotdb.commons.audit.IAuditEntity; import org.apache.iotdb.commons.auth.entity.PrivilegeType; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.utils.cte.CteDataStore; import org.apache.iotdb.commons.utils.TestOnly; 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/common/QueryId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/QueryId.java index 169ba3cd5cfb2..0946d6a09f4c7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/QueryId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/QueryId.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.common; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ResultNodeContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ResultNodeContext.java index 0381fb3e870da..0601affb0baa4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ResultNodeContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/ResultNodeContext.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.common; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; public class ResultNodeContext { 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 30fc7e6c516c8..585aa7de85bab 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,8 +19,8 @@ package org.apache.iotdb.db.queryengine.common.header; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; import org.apache.iotdb.commons.schema.column.ColumnHeader; import com.google.common.primitives.Bytes; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java index 661291dc0cd38..47d97ebf5ecd8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorFactory.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.calc_commons.execution.aggregation.BinaryModeAccumulator; -import org.apache.iotdb.calc_commons.execution.aggregation.BooleanModeAccumulator; -import org.apache.iotdb.calc_commons.execution.aggregation.DoubleModeAccumulator; -import org.apache.iotdb.calc_commons.execution.aggregation.FloatModeAccumulator; -import org.apache.iotdb.calc_commons.execution.aggregation.IntModeAccumulator; -import org.apache.iotdb.calc_commons.execution.aggregation.LongModeAccumulator; -import org.apache.iotdb.calc_commons.execution.aggregation.VarianceAccumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.BinaryModeAccumulator; +import org.apache.iotdb.calc.execution.aggregation.BooleanModeAccumulator; +import org.apache.iotdb.calc.execution.aggregation.DoubleModeAccumulator; +import org.apache.iotdb.calc.execution.aggregation.FloatModeAccumulator; +import org.apache.iotdb.calc.execution.aggregation.IntModeAccumulator; +import org.apache.iotdb.calc.execution.aggregation.LongModeAccumulator; +import org.apache.iotdb.calc.execution.aggregation.VarianceAccumulator; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.plan.expression.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AvgAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AvgAccumulator.java index 150214ed706d4..cfd77c61ba524 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AvgAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/AvgAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountAccumulator.java index 81be0f8093f42..a8f352da11572 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountIfAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountIfAccumulator.java index cb77adb5e8977..c0ae7d101d7c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountIfAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountIfAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountTimeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountTimeAccumulator.java index 8500d569c6c27..980a6a5a922e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountTimeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/CountTimeAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/ExtremeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/ExtremeAccumulator.java index 53b78623512b8..f99e01e8d5a59 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/ExtremeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/ExtremeAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/FirstValueAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/FirstValueAccumulator.java index f994b5cee88d9..6da27015bdae0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/FirstValueAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/FirstValueAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/LastValueAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/LastValueAccumulator.java index 922ee29790863..b20b3d3ded059 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/LastValueAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/LastValueAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxMinByBaseAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxMinByBaseAccumulator.java index 08ccde5e36159..b03c1852e3d70 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxMinByBaseAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxMinByBaseAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxTimeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxTimeAccumulator.java index ea81997461539..b6ae4b5b76133 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxTimeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxTimeAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxValueAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxValueAccumulator.java index 74e311c0aa08d..44097bd0c1a97 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxValueAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MaxValueAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinTimeAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinTimeAccumulator.java index e7e1d1bf8d8da..e795eee64101d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinTimeAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinTimeAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinValueAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinValueAccumulator.java index 1e54c42b89916..df0b69d34db9e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinValueAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/MinValueAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/SumAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/SumAccumulator.java index 3b396e1eb452a..fb2b59acc4942 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/SumAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/SumAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TimeDurationAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TimeDurationAccumulator.java index 4ffe03def5816..8e9917d89d101 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TimeDurationAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TimeDurationAccumulator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java index bbd8bf6c5706f..07b482bbdfb1f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/TreeAggregator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.metric.QueryExecutionMetricSet; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.tsfile.block.column.Column; @@ -35,8 +35,8 @@ import java.util.List; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.AGGREGATION_FROM_RAW_DATA; -import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.AGGREGATION_FROM_STATISTICS; +import static org.apache.iotdb.calc.metric.QueryExecutionMetricSet.AGGREGATION_FROM_RAW_DATA; +import static org.apache.iotdb.calc.metric.QueryExecutionMetricSet.AGGREGATION_FROM_STATISTICS; public class TreeAggregator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java index 84d964f0b5f8f..a9e567f8694c3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/UDAFAccumulator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; -import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.transformation.dag.udf.UDFParametersFactory; +import org.apache.iotdb.commons.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.udf.api.State; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java index 1134bd2edcf28..d35d7caa54f49 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/EmptyQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java index 97973c9775ae8..8d5a553b7e484 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/MonotonicQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java index b30d410a1f51d..23c5acf6aba89 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/NormalQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java index 0edfeb038a3bb..c34306ad83b62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java index 7b5e807fc4ed0..eed79c9db9bbe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SlidingWindowAggregatorFactory.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java index 024e24ee6b2be..3d60a707ec0ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/slidingwindow/SmoothQueueSlidingWindowAggregator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/AggrWindowIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/AggrWindowIterator.java index 176ae4621b4bd..5e82e01151b7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/AggrWindowIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/AggrWindowIterator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.tsfile.read.common.TimeRange; import org.apache.tsfile.utils.TimeDuration; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java index b957ce900761f..148d0cde40917 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TableDateBinTimeRangeIterator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.tsfile.read.common.TimeRange; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TimeRangeIteratorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TimeRangeIteratorFactory.java index 0e905ab3e5861..6a8f59d7676b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TimeRangeIteratorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/aggregation/timerangeiterator/TimeRangeIteratorFactory.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.tsfile.utils.TimeDuration; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java index 7f3020e358213..70bf68e2f144b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriver.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.driver; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.source.DataSourceOperator; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; @@ -31,7 +31,7 @@ import java.util.List; -import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.QUERY_RESOURCE_INIT; +import static org.apache.iotdb.calc.metric.QueryExecutionMetricSet.QUERY_RESOURCE_INIT; import static org.apache.iotdb.db.storageengine.dataregion.VirtualDataRegion.UNFINISHED_QUERY_DATA_SOURCE; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriverContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriverContext.java index dede7d8919836..f895859d1adff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriverContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DataDriverContext.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.driver; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java index 973251ab7ba15..d988e212a3a43 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.driver; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.metric.QueryExecutionMetricSet; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -55,8 +55,8 @@ import static com.google.common.base.Verify.verify; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static java.lang.Boolean.TRUE; -import static org.apache.iotdb.calc_commons.execution.operator.Operator.NOT_BLOCKED; -import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.DRIVER_INTERNAL_PROCESS; +import static org.apache.iotdb.calc.execution.operator.Operator.NOT_BLOCKED; +import static org.apache.iotdb.calc.metric.QueryExecutionMetricSet.DRIVER_INTERNAL_PROCESS; public abstract class Driver implements IDriver { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java index db0a8069a8bac..46093810b9b8d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/DriverContext.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.driver; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/SchemaDriver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/SchemaDriver.java index 1a5578baa2e94..bbdbccdad1b3a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/SchemaDriver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/SchemaDriver.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.driver; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import com.google.common.util.concurrent.SettableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java index 104e5b90ae315..90659b4660eb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutor.java @@ -25,9 +25,9 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.commons.utils.MetadataUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FakedFragmentInstanceContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FakedFragmentInstanceContext.java index 56b9274ed5195..99e95dbf26b31 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FakedFragmentInstanceContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FakedFragmentInstanceContext.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.fragment; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.db.queryengine.plan.planner.memory.FakedMemoryReservationManager; import org.apache.iotdb.db.storageengine.dataregion.DataRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java index 26f2f8a1089ef..74dbfe0be58af 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.execution.fragment; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.PatternTreeMap; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java index 8da2bfc5cf1f1..617057d420c6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecution.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.fragment; -import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc.exception.MemoryNotEnoughException; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java index 62d86c768ff88..8ea67373af7a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceManager.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.fragment; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc.metric.QueryExecutionMetricSet; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil; @@ -64,7 +64,7 @@ import java.util.concurrent.atomic.AtomicLong; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.LOCAL_EXECUTION_PLANNER; +import static org.apache.iotdb.calc.metric.QueryExecutionMetricSet.LOCAL_EXECUTION_PLANNER; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceExecution.createFragmentInstanceExecution; import static org.apache.iotdb.db.queryengine.execution.schedule.queue.IndexedBlockingQueue.TOO_MANY_CONCURRENT_QUERIES_ERROR_MSG; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/INodeCommonFragmentInstanceContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/INodeCommonFragmentInstanceContext.java index 596529c46db99..1d45895f19806 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/INodeCommonFragmentInstanceContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/INodeCommonFragmentInstanceContext.java @@ -14,7 +14,7 @@ package org.apache.iotdb.db.queryengine.execution.fragment; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; public interface INodeCommonFragmentInstanceContext { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java index 6dfb9824cd40d..4d0e5ba4e1c87 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationUtil.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.commons.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.SingleTimeWindowIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java index 7885abedb922c..368433edbff68 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/EmptyDataOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.tsfile.read.common.block.TsBlock; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java index 935d8bf97513f..c914b6a286ead 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/ExplainAnalyzeOperator.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.client.IClientManager; import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java index 3f1b6e2b27eaa..d9761552e283c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorContext.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java index 80fbeea66d2d5..397ac2e9d61a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractIntoOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java index 32bb08a33a020..41c08de3538c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AbstractTreeIntoOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.protocol.client.DataNodeInternalClient; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertMultiTabletsStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java index 763084c673ecc..7967e90f75eb9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ActiveRegionScanMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java index 51349e44b5ac1..51f6e1c811739 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/AggregationOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/ColumnInjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java index 8b15bc2485287..067c2291c5107 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ColumnInjectOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.utils.columngenerator.ColumnGenerator; 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 9dbb4ca77f364..60ceb0f06e343 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 @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.conf.IoTDBConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java index 018ffd1af4d1d..dad791fdfa971 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/InsertTabletStatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/InsertTabletStatementGenerator.java index d819fbbcc5352..27d88438d4c7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/InsertTabletStatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/InsertTabletStatementGenerator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java index f6333e495fb42..8d7346a1b76a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ProjectOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java index 04dea28b22d42..3018adfd5e1fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/RawDataAggregationOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/SingleDeviceViewOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java index 7e68e514b3ea9..6fc3b50ea1f5f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleDeviceViewOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java index e20509caf6860..8fa95aca270ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SingleInputAggregationOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; 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/SlidingWindowAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java index 44ae7d0852d06..59d22ead36ee9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/SlidingWindowAggregationOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.slidingwindow.SlidingWindowAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableInsertTabletStatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableInsertTabletStatementGenerator.java index 3df82abbcb88f..1e53787c43e7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableInsertTabletStatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableInsertTabletStatementGenerator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java index 8278df9d5b07b..6bc2eb0e7142a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableIntoOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java index 3c72ceacef191..adab0fb1d3059 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TagAggregationOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; 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/TransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java index afd970189bd4f..6a713c183e23d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TransformOperator.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.common.NodeRef; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java index 4d7d4331e20aa..7900ce5bc80ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeFillOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.AbstractFillOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.AbstractFillOperator; +import org.apache.iotdb.calc.execution.operator.process.fill.IFill; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeInsertTabletStatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeInsertTabletStatementGenerator.java index 3b4ac312539f9..f672200173ca8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeInsertTabletStatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeInsertTabletStatementGenerator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java index 5c7f3814d3e1e..4b7fb66a4c5ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeIntoOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; 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/TreeLinearFillOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java index b493813a37bcc..38fc787f61290 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeLinearFillOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.AbstractLinearFillOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.AbstractLinearFillOperator; +import org.apache.iotdb.calc.execution.operator.process.fill.ILinearFill; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java index 831adb4582803..ae811219d814c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeMergeSortOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java index fe77ad7b89bf3..05de9d1e68ba2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeSortOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.SortOperator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.calc_commons.utils.sort.TreeDiskSpiller; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.SortOperator; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.calc.utils.sort.TreeDiskSpiller; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java index 30650313d2cb3..e0570c55d5f44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/TreeTopKOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.TopKOperator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.TopKOperator; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java index 99525bf422791..8db754768a34d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/ai/InferenceOperator.java @@ -21,11 +21,11 @@ import org.apache.iotdb.ainode.rpc.thrift.TInferenceReq; import org.apache.iotdb.ainode.rpc.thrift.TInferenceResp; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.exception.ainode.AINodeConnectionException; import org.apache.iotdb.db.exception.runtime.ModelInferenceProcessException; import org.apache.iotdb.db.protocol.client.an.AINodeClient; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/CopyToOptions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/CopyToOptions.java index 17f5ed8e80be2..10939b8b5e887 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/CopyToOptions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/CopyToOptions.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.copyto; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.CopyToTsFileOptions; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java index bf45d6ca98ecf..8157709cfe6c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/TableCopyToOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.copyto; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile.CopyToTsFileOptions; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java index 0225a3a4bd79b..daa5e5cd4f28f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/copyto/tsfile/CopyToTsFileOptions.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.copyto.tsfile; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java index 357d65458ccdc..915a89852eb69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/FullOuterTimeJoinOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.ColumnMerger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java index a48e9685864a1..f9aaf444ac2fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/HorizontallyConcatOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.AbstractConsumeAllOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.AbstractConsumeAllOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java index 5cf6a9c2bd38d..60cdb8959772a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java index e974669cc055d..ca5912c50c78f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java index 215cc36a3d521..7ee1360886202 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/TableLeftOuterTimeJoinOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.TimeComparator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java index 9c50f795b0aa3..096e3d7ab4b5c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MergeSortComparatorUtils.java @@ -14,8 +14,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; -import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.process.join.merge.MergeSortComparator; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.plan.statement.component.NullOrdering; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.component.SortItem; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MultiColumnMerger.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MultiColumnMerger.java index 3a200ad95a26d..e92c055f1e604 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MultiColumnMerger.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/MultiColumnMerger.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/NonOverlappedMultiColumnMerger.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/NonOverlappedMultiColumnMerger.java index 7083861adab6b..bb532fd24f344 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/NonOverlappedMultiColumnMerger.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/NonOverlappedMultiColumnMerger.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SingleColumnMerger.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SingleColumnMerger.java index 7fa664305bd43..c7f9f08e0dae7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SingleColumnMerger.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/merge/SingleColumnMerger.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join.merge; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java index e9fe266bdfece..77ab84b6a4805 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AbstractUpdateLastCacheOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java index b3f6a969d97d4..8363324c1dd77 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateLastCacheOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; 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.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java index 26b1e5f50cc7a..26aa5b95078e3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/AlignedUpdateViewPathLastCacheOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.MeasurementPath; 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/last/LastQueryCollectOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java index 99600ad784b9c..4e4603fcfcc71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryCollectOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java index 4e1aaa00cca0c..3338ac34b9089 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java index 276b4fb672c2c..532eef1842707 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java index d290ef25e9f6b..694b7434de60f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQuerySortOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.Futures; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java index 9e2b442c6a949..2a742cfbc5a0f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryTransformOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryUtil.java index 8931f1025635c..971225f888948 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/LastQueryUtil.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.aggregation.LastValueDescAccumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.MaxTimeDescAccumulator; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java index 0cef4dbd75455..06a7dadb5b367 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateLastCacheOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java index 98376c43c456d..6d5d3d1a406aa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/last/UpdateViewPathLastCacheOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.last; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TreeDeviceSchemaCacheManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java index 329553e728986..1a15563234c26 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java index 843ce5abb9fc6..69f36680fb747 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelScanOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.schema.source.ISchemaSource; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java index aa8ee1afee1da..ab740a31ea193 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 9e6a05bcbae81..ad1ffc8e7430d 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 @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; import org.apache.iotdb.common.rpc.thrift.TSchemaNode; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.node.MNodeType; 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 4e9d91f0f2091..2c399777dfeea 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 @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; 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 36dc3035dc821..2c4b91c7d4543 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,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; 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/SchemaCountOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java index 0eb674ada0e53..9b2884233c13d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperator.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.SchemaConstant; 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/SchemaFetchMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java index 7f6c52bd6577c..0fc3d5647a4dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java index dcaa643bc9039..9200a622efb59 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaFetchScanOperator.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.commons.utils.TestOnly; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java index b4bde6e6e03b4..999db03329b40 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryMergeOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import com.google.common.util.concurrent.ListenableFuture; 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 64c4b837adc51..010c74d1261c5 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,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; 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 d8dfdb10df848..493e58eea6f0e 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,8 +20,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.column.ColumnHeader; 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 5c41f03a420d2..832d59fe42f14 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 @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; @@ -44,7 +44,7 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator.constructFilteredTsBlock; +import static org.apache.iotdb.calc.execution.operator.process.FilterAndProjectOperator.constructFilteredTsBlock; public class DeviceAttributeUpdater extends DeviceUpdater { private final List commonTransformerList; 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 de9623345f408..3391f3e4080d8 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 @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; 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 360ce586e4d99..589f119c3ae14 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,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; 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 0055e90baf030..ecbcbba858622 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 @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; @@ -39,7 +39,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator.satisfy; +import static org.apache.iotdb.calc.execution.operator.process.FilterAndProjectOperator.satisfy; import static org.apache.iotdb.db.queryengine.execution.operator.schema.source.TableDeviceQuerySource.transformToTableDeviceTsBlockColumns; public abstract class DevicePredicateHandler implements AutoCloseable { 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 ee29834134536..2679f501dd060 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 @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; import org.apache.iotdb.commons.schema.table.TsTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java index db8de516ca5c8..48f14ce1c2df0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java index 7827257178e8d..5e27908ad10ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/ShuffleHelperOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex; import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISinkHandle; 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/sink/SinkOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperator.java index ac566b73011db..70c473714a3f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractRegionScanDataSourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractRegionScanDataSourceOperator.java index 92a99b9b0e5df..c70d3eeb85f0c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractRegionScanDataSourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractRegionScanDataSourceOperator.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.storageengine.dataregion.read.IQueryDataSource; import org.apache.tsfile.common.conf.TSFileDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java index 30d48b91895df..4dc58dd76f109 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSeriesAggregationScanOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/source/AbstractSourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java index 11ac141b0c654..828857bfa9e9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AbstractSourceOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.calc_commons.execution.operator.AbstractOperator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.calc.execution.operator.AbstractOperator; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; public abstract class AbstractSourceOperator extends AbstractOperator implements SourceOperator { 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 4f2329eb2e6fa..cf0b62a256665 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 @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; 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 2b91d6c19b99e..b6ac9ecd85022 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,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.queryengine.common.TimeseriesContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java index 061266b7679e4..588dd0d51d4c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesAggregationScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/source/AlignedSeriesScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java index 32ca6c779b21c..e06b3d17b310a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/AlignedSeriesScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java index f11573d566efa..7f405618944ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ExchangeOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.source.ISourceHandle; 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/source/LastCacheScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java index fc2457a5a8ca7..e5978866b1102 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/LastCacheScanOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.tsfile.read.common.block.TsBlock; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java index ba37f287b1698..94ad66d551398 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesAggregationScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.IFullPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.TreeAggregator; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITimeRangeIterator; 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/source/SeriesScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java index 09565a01bd766..69f1150ff210e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.IFullPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.SeriesScanOptions; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java index ce19f52241751..d94aa4ad9c8ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowDiskUsageOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; 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/source/ShowQueriesOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java index 96d6ff5135f4f..afeb5b0f744f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ShowQueriesOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.Coordinator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java index 2c416ea5afd62..c0167377422dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SourceOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; public interface SourceOperator extends Operator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java index 70b4bc6fa7b6d..637f22a6c5d56 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractAggTableScanOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; 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/source/relational/AbstractDefaultAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java index 6b7da20945cd4..f00b0049ef663 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractDefaultAggTableScanOperator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.tsfile.block.column.Column; @@ -30,7 +30,7 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public abstract class AbstractDefaultAggTableScanOperator extends AbstractAggTableScanOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java index 726b6d83d9ec6..1e3f85d49541f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/AbstractTableScanOperator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractSeriesScanOperator; import org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanUtil; @@ -48,7 +48,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.execution.operator.source.AlignedSeriesScanOperator.appendDataIntoBuilder; import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter.DEVICE_NUMBER; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java index 495254aca65f7..c250ea040cab8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/CteScanOperator.java @@ -21,9 +21,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java index 0e3746dc9b5a5..ddd8abd0057e1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/DeviceIteratorScanOperator.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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 index f0eb0dc6ff8ee..fffb57b932979 100644 --- 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 @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.common.rpc.thrift.Model; import org.apache.iotdb.common.rpc.thrift.TAINodeLocation; import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation; @@ -32,16 +32,16 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; -import org.apache.iotdb.commons.node_commons.common.ConnectionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.relational.function.TableBuiltinTableFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.util.ReservedIdentifiers; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; +import org.apache.iotdb.commons.queryengine.common.ConnectionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.relational.function.TableBuiltinTableFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.util.ReservedIdentifiers; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.commons.schema.table.TableNodeStatus; 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 index 8303fc262ca0c..b8c3a4cbea4d1 100644 --- 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 @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java index c9885c364979a..f0d1f58556011 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/LastQueryAggTableScanOperator.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.LastAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.LastByDescAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.LastDescAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.execution.fragment.DataNodeQueryContext; import org.apache.iotdb.db.queryengine.execution.operator.process.last.LastQueryUtil; @@ -51,8 +51,8 @@ import java.util.concurrent.TimeUnit; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.Utils.serializeTimeValueWithNull; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_PRIMITIVE_TYPE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.TableDeviceLastCache.EMPTY_TIME_VALUE_PAIR; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java index fd403e209d8db..73b4704ac963a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/MeasurementToTableViewAdaptorUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; import org.apache.tsfile.block.column.Column; @@ -32,7 +32,7 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class MeasurementToTableViewAdaptorUtils { private MeasurementToTableViewAdaptorUtils() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java index 30c0b0935ad89..e42ae8cbe8ebf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeNonAlignedDeviceViewAggregationScanOperator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator; import org.apache.iotdb.db.queryengine.execution.operator.source.AbstractDataSourceOperator; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; @@ -38,8 +38,8 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.CURRENT_DEVICE_INDEX_STRING; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.CURRENT_DEVICE_INDEX_STRING; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; public class TreeNonAlignedDeviceViewAggregationScanOperator extends AbstractDefaultAggTableScanOperator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java index a1506afe2a497..0a2ad64477254 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TreeToTableViewAdaptorOperator.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java index ee41669c81d79..047253f784215 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverScheduler.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.schedule; -import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc.exception.MemoryNotEnoughException; import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.StartupException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; import org.apache.iotdb.commons.service.IService; import org.apache.iotdb.commons.service.ServiceType; import org.apache.iotdb.commons.utils.TestOnly; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java index d5d94463431fd..9252baf788ed5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/schedule/IDriverScheduler.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.schedule; -import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.calc.exception.MemoryNotEnoughException; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.exception.CpuNotEnoughException; 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 0e5dda0a9595f..9cee0e71a9702 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 @@ -33,15 +33,15 @@ import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.memory.IMemoryBlock; import org.apache.iotdb.commons.memory.MemoryBlockType; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -432,7 +432,7 @@ private IQueryExecution createQueryExecutionForTreeModel( * along with CTE query dataset. */ public ExecutionResult executeForTableModel( - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statement, + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement statement, SqlParser sqlParser, IClientSession clientSession, long queryId, @@ -468,7 +468,7 @@ public ExecutionResult executeForTableModel( } public ExecutionResult executeForTableModel( - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statement, + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement statement, SqlParser sqlParser, IClientSession clientSession, long queryId, @@ -549,7 +549,7 @@ public ExecutionResult executeForTreeModel( /** For compatibility of MQTT and REST, this method should never be called. */ @Deprecated public ExecutionResult executeForTableModel( - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statement, + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement statement, SqlParser sqlParser, IClientSession currSession, Long queryId, @@ -601,7 +601,7 @@ private IQueryExecution createQueryExecutionForTableModel( } private IQueryExecution createQueryExecutionForTableModel( - final org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statement, + final org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement statement, final SqlParser sqlParser, final IClientSession clientSession, final MPPQueryContext queryContext, @@ -688,13 +688,13 @@ private IQueryExecution createQueryExecutionForTableModel( queryContext)); } // Initialize variables for TableModelPlanner - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement statementToUse = + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement statementToUse = statement; List parameters = Collections.emptyList(); Map, Expression> parameterLookup = Collections.emptyMap(); // Unwrap Explain/ExplainAnalyze to check for inner Execute/ExecuteImmediate - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement innerStatement = + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement innerStatement = statement; if (statement instanceof Explain) { innerStatement = ((Explain) statement).getStatement(); @@ -712,7 +712,7 @@ private IQueryExecution createQueryExecutionForTableModel( String.format("Prepared statement '%s' does not exist", statementName)); } - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement resolvedSql = + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement resolvedSql = preparedInfo.getSql(); parameterLookup = ParameterExtractor.bindParameters(resolvedSql, executeStatement.getParameters()); @@ -732,7 +732,7 @@ private IQueryExecution createQueryExecutionForTableModel( String sql = executeImmediateStatement.getSqlString(); List literalParameters = executeImmediateStatement.getParameters(); - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement resolvedSql = + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement resolvedSql = sqlParser.createStatement(sql, clientSession.getZoneId(), clientSession); if (!literalParameters.isEmpty()) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java index 065dbebccf135..3f58ad4599e6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java @@ -26,10 +26,10 @@ import org.apache.iotdb.common.rpc.thrift.TSchemaNode; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.model.ModelInformation; -import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.NodeRef; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java index d0406bc1e373f..038f7b184a4c5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeUtils.java @@ -25,17 +25,17 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression.Operator; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.confignode.rpc.thrift.TRegionRouteMapResp; 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 973faeebcf6b2..8dd1cc600e8f2 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 @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; @@ -173,8 +173,8 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME_HEADER; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.TREE_MODEL_DATABASE_PREFIX; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.COUNT_TIME_HEADER; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.TREE_MODEL_DATABASE_PREFIX; import static org.apache.iotdb.commons.conf.IoTDBConstant.ALLOWED_SCHEMA_PROPS; import static org.apache.iotdb.commons.conf.IoTDBConstant.DEADBAND; import static org.apache.iotdb.commons.conf.IoTDBConstant.LOSS; 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 f0c01f5943092..4fa2dd07dd61b 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 @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.analyze; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinScalarFunction; -import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; 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.queryengine.plan.udf.BuiltinScalarFunction; +import org.apache.iotdb.commons.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java index 33fd6f30cf1f2..e194c39f0d210 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionTypeAnalyzer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.analyze; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.queryengine.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.binary.ArithmeticBinaryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java index 878367a2cbe62..246f43b16aee9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/PredicateUtils.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.analyze; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; @@ -284,7 +284,7 @@ public static Filter convertPredicateToTimeFilter(Expression predicate) { } public static Filter convertPredicateToTimeFilter( - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression predicate, + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression predicate, ZoneId zoneId, TimeUnit currPrecision) { if (predicate == null) { @@ -312,7 +312,7 @@ public static Filter convertPredicateToFilter( } public static Filter convertPredicateToFilter( - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression predicate, + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression predicate, Map measurementColumnsIndexMap, Map schemaMap, String timeColumnName, @@ -442,7 +442,7 @@ public static boolean predicateCanPushIntoScan(Expression predicate) { } public static boolean predicateCanPushIntoScan( - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression predicate) { + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression predicate) { return new org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate .PredicatePushIntoScanChecker() .process(predicate, null); 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 c88bb258d35ee..d504becba2671 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 @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.analyze; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.NodeRef; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; @@ -44,7 +44,7 @@ import java.util.Map; import java.util.Set; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.COUNT_TIME; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java index 891471f009187..959b350f9ccff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedInfo.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.analyze; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java index adbcba044ec48..dcc2c5e41a3fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TypeProvider.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.analyze; -import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil; +import org.apache.iotdb.commons.queryengine.plan.analyze.ITableTypeProvider; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.utils.TypeUtil; import com.google.common.collect.ImmutableMap; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java index c60d2b92a2d66..e1e6d59719145 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.auth.AuthException; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadAnalyzeException; import org.apache.iotdb.db.exception.load.LoadAnalyzeTypeMismatchException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java index 174b615c7f84d..237f5eea36378 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.commons.path.PatternTreeMap; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema; import org.apache.iotdb.db.auth.AuthorityChecker; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java index 6ac706e2caf5d..de56a8603c5ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze.load; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.auth.AuthException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java index d12edaf29c82b..3014213e67cd6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze.schema; -import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc.exception.MemoryNotEnoughException; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.MetadataException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java index 190157f891ae8..b946a82eb383c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.analyze.schema; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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 86698fe0fa17a..f4beb09917c27 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 @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.execution; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; 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 b791e32d67211..62b003b650eaa 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 @@ -18,13 +18,13 @@ */ package org.apache.iotdb.db.queryengine.plan.execution; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc.metric.QueryExecutionMetricSet; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -72,7 +72,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Throwables.throwIfUnchecked; -import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.WAIT_FOR_RESULT; +import static org.apache.iotdb.calc.metric.QueryExecutionMetricSet.WAIT_FOR_RESULT; import static org.apache.iotdb.commons.utils.ErrorHandlingCommonUtils.getRootCause; import static org.apache.iotdb.db.queryengine.common.DataNodeEndPoints.isSameNode; import static org.apache.iotdb.rpc.TSStatusCode.DATE_OUT_OF_RANGE; 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 5e79fb72cd8a1..36c6a22a643a0 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 @@ -22,7 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; 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 60ce359dfd42c..9283728e8ee6d 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 @@ -31,19 +31,19 @@ import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; import org.apache.iotdb.commons.executable.ExecutableManager; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin; import org.apache.iotdb.commons.pipe.config.constant.PipeSinkConstant; import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant; import org.apache.iotdb.commons.pipe.config.constant.SystemConstant; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TimeColumnSchema; @@ -276,8 +276,8 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.TTL_INFINITE; import static org.apache.iotdb.commons.executable.ExecutableManager.getUnTrustedUriErrorMsg; import static org.apache.iotdb.commons.executable.ExecutableManager.isUriTrusted; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.commons.schema.table.TsTable.TABLE_ALLOWED_PROPERTIES; import static org.apache.iotdb.commons.schema.table.TsTable.TIME_COLUMN_NAME; import static org.apache.iotdb.commons.schema.table.TsTable.TTL_PROPERTY; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java index d196e39ee62f4..b6bf4d2a07bbd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java @@ -60,9 +60,6 @@ import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.executable.ExecutableManager; import org.apache.iotdb.commons.executable.ExecutableResource; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; @@ -77,6 +74,9 @@ import org.apache.iotdb.commons.pipe.datastructure.visibility.Visibility; import org.apache.iotdb.commons.pipe.datastructure.visibility.VisibilityUtils; import org.apache.iotdb.commons.pipe.sink.payload.airgap.AirGapPseudoTPipeTransferRequest; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.commons.schema.cache.CacheClearOptions; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; @@ -387,7 +387,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.ROOT; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.ROOT; import static org.apache.iotdb.commons.conf.IoTDBConstant.MAX_DATABASE_NAME_LENGTH; import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_MATCH_SCOPE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java index 10f31dc8c5dc3..32f63d61a2771 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/executor/IConfigTaskExecutor.java @@ -24,8 +24,8 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.common.rpc.thrift.TSetConfigurationReq; import org.apache.iotdb.commons.cluster.NodeStatus; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; import org.apache.iotdb.commons.schema.cache.CacheClearOptions; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; 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 746e563fd627c..2e0037e91e07a 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,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.metadata; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.utils.TimePartitionUtils; 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 0415127999582..d9fcf3a979c76 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,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.metadata; import org.apache.iotdb.common.rpc.thrift.Model; -import org.apache.iotdb.commons.node_commons.plan.relational.function.TableBuiltinTableFunction; -import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; -import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinScalarFunction; -import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; -import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; +import org.apache.iotdb.commons.queryengine.plan.relational.function.TableBuiltinTableFunction; +import org.apache.iotdb.commons.queryengine.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.commons.queryengine.plan.udf.BuiltinScalarFunction; +import org.apache.iotdb.commons.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction; +import org.apache.iotdb.commons.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.udf.UDFInformation; 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 daf9fea76a57b..83289ba8cded3 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,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.metadata; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.utils.FileUtils; 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 332949bcb5a17..b21cac77466b5 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,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PrepareTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PrepareTask.java index 2188726132314..89295bed6677a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PrepareTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PrepareTask.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.session; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; 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/PreparedStatementHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PreparedStatementHelper.java index 7873e247509e3..6ac494a6a58cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PreparedStatementHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/PreparedStatementHelper.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.session; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.PreparedStatementInfo; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/SetSqlDialectTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/SetSqlDialectTask.java index 75e0e4abbb23e..693fc4a1c7cf5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/SetSqlDialectTask.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/SetSqlDialectTask.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.session; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; 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; 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 9a581ad1e2eb6..d204cd048022b 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,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.sys.pipe; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.confignode.rpc.thrift.TShowPipeInfo; 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 7982f3f08440f..3e5ef4bd90706 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 @@ -22,8 +22,8 @@ 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.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.node.MNodeType; 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 43ea8d07b0042..39b771c45c327 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,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.execution.memory; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java index e70ecfdb191a0..14982238008fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/Expression.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.DivisionExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java index b9c0f4abe364d..f0d8a2cd0b805 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ExpressionFactory.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.udf.BuiltinTimeSeriesGeneratingFunction; import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.EqualToExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java index 935c02426b5e1..d5485afa83265 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/binary/BinaryExpression.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression.binary; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.commons.queryengine.common.NodeRef; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java index f3b3a30b9e7e4..e954723f306fb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/ConstantOperand.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.leaf; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java index dbb7a7da76cb5..4608cecd0bcf6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/LeafOperand.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.leaf; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.commons.queryengine.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java index d408410043325..771a3bd32650f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/NullOperand.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.leaf; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java index 6cb3195c90081..a6f1e98746848 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimeSeriesOperand.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression.leaf; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java index 0dca5214af87e..b138d4de55011 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/leaf/TimestampOperand.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.leaf; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java index 0ccca6e183e3b..f977a24a1bb33 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/FunctionExpression.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.expression.multi.FunctionType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; -import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.NodeRef; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.expression.multi.FunctionType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.commons.queryengine.plan.udf.BuiltinScalarFunction; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; 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/expression/multi/builtin/BuiltInScalarFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java index fc0a71c761fce..45e6d3e6aab47 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/BuiltInScalarFunctionHelper.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java index 46b233dcf1c52..e6c2c509df20e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/CastFunctionHelper.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.CastFunctionColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; @@ -34,7 +34,7 @@ import java.time.ZoneId; import java.util.Map; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.CAST_TYPE; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.CAST_TYPE; public class CastFunctionHelper implements BuiltInScalarFunctionHelper { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java index 0989d6c16d4c2..0c2c65d4af112 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/DiffFunctionHelper.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DiffFunctionColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java index b9ec60d170585..1877aa38d793f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/ReplaceFunctionHelper.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.ReplaceFunctionColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; @@ -33,8 +33,8 @@ import java.util.Map; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.REPLACE_FROM; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.REPLACE_TO; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.REPLACE_FROM; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.REPLACE_TO; public class ReplaceFunctionHelper implements BuiltInScalarFunctionHelper { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java index 208202115cb94..80c74e37782d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/RoundFunctionHelper.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.RoundFunctionColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; @@ -33,7 +33,7 @@ import java.util.Map; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.ROUND_PLACES; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.ROUND_PLACES; import static org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor.checkFunctionExpressionInputSize; public class RoundFunctionHelper implements BuiltInScalarFunctionHelper { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java index d94eb6bf290bc..04aa409391885 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/multi/builtin/helper/SubStringFunctionHelper.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.helper; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.expression.multi.builtin.BuiltInScalarFunctionHelper; @@ -34,11 +34,11 @@ import java.util.LinkedHashMap; import java.util.Map; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_FOR; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_FROM; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_IS_STANDARD; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_LENGTH; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_START; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.SUBSTRING_FOR; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.SUBSTRING_FROM; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.SUBSTRING_IS_STANDARD; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.SUBSTRING_LENGTH; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.SUBSTRING_START; public class SubStringFunctionHelper implements BuiltInScalarFunctionHelper { public static final String BLANK_STRING = " "; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java index 3c3ed62a8e54c..60c7c2b8bcc91 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/CaseWhenThenExpression.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.expression.other; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.commons.queryengine.common.NodeRef; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.binary.WhenThenExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java index 9763ee66f798d..fb33b9670ce41 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/other/GroupByTimeExpression.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.other; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.commons.queryengine.common.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java index 6c2c0fd1c6e7d..6f3d944f7e8ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/BetweenExpression.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.ternary; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java index c60705ded3c7f..17bb1e5a965b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/ternary/TernaryExpression.java @@ -21,9 +21,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.ternary; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.commons.queryengine.common.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java index 227c080ad712a..394a1c0723de6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/InExpression.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java index 17c051a9de89c..948174ee7a6f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/IsNullExpression.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java index 674e5aa41e4d4..f000eccd39e49 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LikeExpression.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java index 353379da9270c..05e967c791b22 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/LogicNotExpression.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java index 7c85398b950b4..249fca1bcc760 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/NegationExpression.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java index c364273ad0578..9882388d17f96 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/RegularExpression.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java index 851acc9adbfc3..2056dec437c0b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/unary/UnaryExpression.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.unary; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.commons.queryengine.common.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.ExpressionVisitor; import org.apache.iotdb.db.queryengine.transformation.dag.memory.LayerMemoryAssigner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java index aa438a25be58b..2f094fd820627 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ColumnTransformerVisitor.java @@ -19,39 +19,39 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.TreeCaseWhenThenColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticDivisionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticModuloColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareLessThanColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.LogicAndColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.LogicOrColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.LongDivisionLongColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.LongModulusLongColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.NullColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.multi.MappableUDFColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.BetweenColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.ArithmeticNegationColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.InColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LikeColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.RegularColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.TreeCaseWhenThenColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.ArithmeticDivisionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.ArithmeticModuloColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareLessThanColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.LogicAndColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.LogicOrColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.LongDivisionLongColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.LongModulusLongColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.NullColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.multi.MappableUDFColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ternary.BetweenColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.ArithmeticNegationColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.InColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.LikeColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.RegularColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.commons.queryengine.common.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java index 0e1e087bac433..1c9b0fbedd33b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/CountTimeAggregationAmountVisitor.java @@ -27,7 +27,7 @@ import java.util.Collections; import java.util.List; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.COUNT_TIME; public class CountTimeAggregationAmountVisitor extends CollectVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java index ad92ee465e77f..014c19ac95716 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/IntermediateLayerVisitor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.commons.queryengine.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java index 3016e96813408..5bce5752adfd6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/ReconstructVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.binary.BinaryExpression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java index 60380a5300778..6802023cc0d08 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForExpressionVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; @@ -44,7 +44,7 @@ import java.util.List; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.COUNT_TIME; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; import static org.apache.iotdb.db.utils.TypeInferenceUtils.bindTypeForBuiltinAggregationNonSeriesInputExpressions; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java index e1e2eaa6da134..fcb426dd97a5a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/BindSchemaForPredicateVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -41,7 +41,7 @@ import java.util.List; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.COUNT_TIME; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructBinaryExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java index 50280d7e813c1..309d4a741bcf1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatDeviceAndBindSchemaForExpressionVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; @@ -41,7 +41,7 @@ import java.util.List; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.COUNT_TIME; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.cartesianProduct; import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionUtils.reconstructFunctionExpressionsWithMemoryCheck; import static org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian.BindSchemaForExpressionVisitor.transformViewPath; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java index c3b97e9973772..b92ca3918d216 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/cartesian/ConcatExpressionWithSuffixPathsVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.cartesian; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java index ed21f4365f699..97aa833f306de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToFilterVisitor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java index 8bdee51b162d1..1cb61c0b8df46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor.predicate; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionType; import org.apache.iotdb.db.queryengine.plan.expression.binary.CompareBinaryExpression; 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 072202412b743..a4eb327f5b77e 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 @@ -21,15 +21,15 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; 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.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; @@ -74,7 +74,7 @@ import java.util.Set; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.COUNT_TIME; public class AggregationPushDown implements PlanOptimizer { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java index 1d606e1f4ac04..00d289c399b10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDown.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; 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/optimization/LimitOffsetPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java index f502b72cfa26b..c291a196b5ac3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDown.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java index d3e86dd64882c..5e28676757690 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/OrderByExpressionWithLimitChangeToTopK.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy.LINEAR; +import static org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy.LINEAR; import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TopKNode.LIMIT_VALUE_USE_TOP_K; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PlanOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PlanOptimizer.java index da5355a2527a5..90d390f40bbe5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PlanOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PlanOptimizer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java index c9c92a0a6025c..828fd67eb077c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDown.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; 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.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; 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 244f27de27d0a..39c52a5c4984b 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 @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.parser; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; import org.apache.iotdb.common.rpc.thrift.TTimedQuota; import org.apache.iotdb.common.rpc.thrift.ThrottleType; @@ -30,21 +30,21 @@ import org.apache.iotdb.commons.cq.TimeoutPolicy; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataTypeParameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NumericParameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TypeParameter; -import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; 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.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataTypeParameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.schema.cache.CacheClearOptions; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; @@ -302,23 +302,23 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.stream.Collectors.toList; -import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.CAST_FUNCTION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.CAST_TYPE; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.REPLACE_FROM; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.REPLACE_FUNCTION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.REPLACE_TO; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.ROUND_FUNCTION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.ROUND_PLACES; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_FUNCTION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_IS_STANDARD; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_LENGTH; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUBSTRING_START; +import static org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.CAST_FUNCTION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.CAST_TYPE; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.REPLACE_FROM; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.REPLACE_FUNCTION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.REPLACE_TO; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.ROUND_FUNCTION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.ROUND_PLACES; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.SUBSTRING_FUNCTION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.SUBSTRING_IS_STANDARD; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.SUBSTRING_LENGTH; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.SUBSTRING_START; import static org.apache.iotdb.commons.conf.IoTDBConstant.COLUMN_TIMESERIES_COMPRESSION; import static org.apache.iotdb.commons.conf.IoTDBConstant.COLUMN_TIMESERIES_COMPRESSOR; import static org.apache.iotdb.commons.conf.IoTDBConstant.COLUMN_TIMESERIES_ENCODING; -import static org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; -import static org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils.currPrecision; +import static org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils.TIMESTAMP_PRECISION; +import static org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils.currPrecision; import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_RESULT_NODES; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG; @@ -5028,13 +5028,13 @@ private Property parseProperty(final IoTDBSqlParser.PropertyContext ctx) { .literalExpression())); } - private org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression parseExpression( + private org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression parseExpression( final IoTDBSqlParser.LiteralExpressionContext context) { if (context.STRING_LITERAL() != null) { - return new org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral( + return new org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral( parseStringLiteral(context.getText())); } else if (context.INTEGER_LITERAL() != null) { - return new org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral( + return new org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral( context.getText()); } throw new UnsupportedOperationException("Currently other expressions are not supported"); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java index 1f6c82f42484a..c8f0aabfdc635 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.parser; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java index d5baa7712ae93..fd23a654740d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/DataNodeTableOperatorGenerator.java @@ -14,36 +14,36 @@ package org.apache.iotdb.db.queryengine.plan.planner; -import org.apache.iotdb.calc_commons.execution.operator.CommonOperatorContext; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAggregator; -import org.apache.iotdb.calc_commons.execution.relational.ColumnTransformerBuilder; -import org.apache.iotdb.calc_commons.plan.planner.TableOperatorGenerator; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; +import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.calc.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc.execution.operator.process.OffsetOperator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.LastDescAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.TableAggregator; +import org.apache.iotdb.calc.execution.relational.ColumnTransformerBuilder; +import org.apache.iotdb.calc.plan.planner.TableOperatorGenerator; +import org.apache.iotdb.calc.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; 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; @@ -172,18 +172,18 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.AVG; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.EXTREME; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_AGGREGATION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.MAX; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.MIN; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.SUM; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.calc.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.AVG; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.COUNT; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.EXTREME; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.FIRST_AGGREGATION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.LAST_AGGREGATION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.LAST_BY_AGGREGATION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.MAX; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.MIN; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.SUM; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME; import static org.apache.iotdb.db.queryengine.common.DataNodeEndPoints.isSameNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java index 2a1caba9f2251..54e475c00d86b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanContext.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.plan.planner.ITableOperatorGeneratorContext; -import org.apache.iotdb.commons.node_commons.plan.analyze.ITableTypeProvider; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.plan.planner.ITableOperatorGeneratorContext; +import org.apache.iotdb.commons.queryengine.plan.analyze.ITableTypeProvider; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java index 312aba8441a2f..8ee7d6064d382 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.planner; -import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.memory.IMemoryBlock; import org.apache.iotdb.commons.memory.MemoryBlockType; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.IFullPath; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -54,7 +54,7 @@ import java.util.Map; import java.util.Objects; -import static org.apache.iotdb.commons.node_commons.common.SqlDialect.TREE; +import static org.apache.iotdb.commons.queryengine.common.SqlDialect.TREE; /** * Used to plan a fragment instance. One fragment instance could be split into multiple pipelines so 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 14c2ba4cd98d5..2a83924bdf367 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 @@ -23,13 +23,13 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.common.rpc.thrift.TSchemaNode; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; 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.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.template.Template; @@ -125,10 +125,10 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_VALUE; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.MAX_TIME; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.LAST_VALUE; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.MAX_TIME; import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; -import static org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy.LINEAR; +import static org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy.LINEAR; 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; 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 fe5b2f21da0cd..3501105183927 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,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanner.java index bb475949f36e6..9ed59b4c3104e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanner.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java index 9d3e65b771e35..2d8a35c254746 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorGeneratorUtil.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.UNKNOWN_DATATYPE; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.UNKNOWN_DATATYPE; public class OperatorGeneratorUtil { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java index d04859634a12b..34ef371c96db9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java @@ -19,41 +19,41 @@ package org.apache.iotdb.db.queryengine.plan.planner; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.AggregationMergeSortOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.CollectOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.BinaryConstantFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.BooleanConstantFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.FloatConstantFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.IntConstantFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.LongConstantFill; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.AggregationMergeSortOperator; +import org.apache.iotdb.calc.execution.operator.process.CollectOperator; +import org.apache.iotdb.calc.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.calc.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc.execution.operator.process.OffsetOperator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc.execution.operator.process.fill.constant.BinaryConstantFill; +import org.apache.iotdb.calc.execution.operator.process.fill.constant.BooleanConstantFill; +import org.apache.iotdb.calc.execution.operator.process.fill.constant.DoubleConstantFill; +import org.apache.iotdb.calc.execution.operator.process.fill.constant.FloatConstantFill; +import org.apache.iotdb.calc.execution.operator.process.fill.constant.IntConstantFill; +import org.apache.iotdb.calc.execution.operator.process.fill.constant.LongConstantFill; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.model.ModelInformation; -import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.AlignedPath; 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.queryengine.common.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java index e640e76cdac2b..5edf4863a6a32 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineDriverFactory.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.execution.driver.DataDriver; import org.apache.iotdb.db.queryengine.execution.driver.DataDriverContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/SubPlanTypeExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/SubPlanTypeExtractor.java index 0421c2852df95..1cca00c161519 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/SubPlanTypeExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/SubPlanTypeExtractor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.AlignedPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; 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 e49fd0a2f4e82..36529b2176248 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 @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; 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 486aa7a798d01..d16bfb4ce6ef6 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 @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; 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.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.expression.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanner.java index b96d3f613161c..078c2c3e8464d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlanner.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java index 3c836604f3ffc..2c3e560159acd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/ExchangeNodeAdder.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.partition.DataPartition; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.ExplainAnalyzeNode; 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/distribution/NodeGroupContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NodeGroupContext.java index 766b331b1108e..23c74bb3075b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NodeGroupContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NodeGroupContext.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.partition.DataPartition; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last.LastQueryNode; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java index 10089c0763acf..4e34d36147168 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SimpleFragmentParallelPlanner.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.plan.ClusterTopology; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java index 27de8f45c5f7d..1fbd100c32892 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java @@ -19,20 +19,20 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.expression.multi.FunctionType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.expression.multi.FunctionType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.table.Audit; import org.apache.iotdb.commons.utils.PathUtils; @@ -106,11 +106,11 @@ import java.util.TreeSet; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.AVG; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_IF; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.DIFF; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_VALUE; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.TIME_DURATION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.AVG; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.COUNT_IF; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.DIFF; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.FIRST_VALUE; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.TIME_DURATION; import static org.apache.iotdb.commons.conf.IoTDBConstant.LAST_VALUE; import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java index 7877b11869762..34b2b34be716a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/WriteFragmentParallelPlanner.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.partition.StorageExecutor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.ClusterTopology; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java index 4f2e497ae13b5..8431e887a0a3e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeAllChildrenPipelineMemoryEstimator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; public class ConsumeAllChildrenPipelineMemoryEstimator extends PipelineMemoryEstimator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java index 32bd7e6cbee15..d2f292053c011 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ConsumeChildrenOneByOnePipelineMemoryEstimator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.utils.TestOnly; public class ConsumeChildrenOneByOnePipelineMemoryEstimator extends PipelineMemoryEstimator { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/FakedMemoryReservationManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/FakedMemoryReservationManager.java index db845993226da..ee6e0b06cf478 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/FakedMemoryReservationManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/FakedMemoryReservationManager.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; import org.apache.tsfile.utils.Pair; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/NotThreadSafeMemoryReservationManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/NotThreadSafeMemoryReservationManager.java index 5da8297a9d244..7dbebaa2b502d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/NotThreadSafeMemoryReservationManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/NotThreadSafeMemoryReservationManager.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java index 8023b29a17a64..181826877d3a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.utils.TestOnly; import java.util.LinkedList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java index b4f1a5415e304..5ad9cbca61929 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/PipelineMemoryEstimatorFactory.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.memory; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; public class PipelineMemoryEstimatorFactory { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/AbstractFragmentParallelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/AbstractFragmentParallelPlanner.java index 442d31c6c16f6..47f1575c4f1b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/AbstractFragmentParallelPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/AbstractFragmentParallelPlanner.java @@ -24,10 +24,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.enums.ReadConsistencyLevel; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.partition.QueryExecutor; import org.apache.iotdb.commons.partition.StorageExecutor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/FragmentInstance.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/FragmentInstance.java index 195b7735ad7c8..1edd672ea1187 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/FragmentInstance.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/FragmentInstance.java @@ -22,8 +22,8 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.partition.ExecutorType; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/LogicalQueryPlan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/LogicalQueryPlan.java index 0ee6cecb0d5f4..b355cac722670 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/LogicalQueryPlan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/LogicalQueryPlan.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; /** 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 596e0d0f4b406..22d8fa4d1f7a5 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 @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPartitionRelatedNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.partition.DataPartition; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPartitionRelatedNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.SubPlanTypeExtractor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java index 7611c20054eca..f410ae29ff001 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TableModelTimePredicate.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java index cac78ceae7d0c..8dfc84898117d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/TimePredicate.java @@ -43,7 +43,7 @@ static TimePredicate deserialize(ByteBuffer byteBuffer) { return new TreeModelTimePredicate(Expression.deserialize(byteBuffer)); } else { return new TableModelTimePredicate( - org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression.deserialize( + org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression.deserialize( byteBuffer)); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java index 5288ab072beb7..b2424bfca26ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/BaseSourceRewriter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import java.util.Collections; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializer.java index 9351553f00100..d46853f222a3f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializer.java @@ -14,8 +14,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.CommonPlanNodeDeserializer; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.CommonPlanNodeDeserializer; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePieceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializerProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializerProvider.java index 4119eabd89fc0..cb10664236ff2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializerProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/DataNodePlanNodeDeserializerProvider.java @@ -14,8 +14,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanNodeDeserializer; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanNodeDeserializer; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanNodeDeserializerProvider; public class DataNodePlanNodeDeserializerProvider implements IPlanNodeDeserializerProvider { @Override 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 8db4b9e8fa953..4460322d6a1a7 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,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; 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 c3d94a6f6ef00..8403aeeb9ef5c 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 @@ -21,33 +21,33 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationMergeSortNode; @@ -715,13 +715,13 @@ public List visitTableScan(TableScanNode node, GraphContext context) { @Override public List visitAggregation( - org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode node, + org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Aggregation-%s", node.getPlanNodeId().getId())); boxValue.add(String.format("OutputSymbols: %s", node.getOutputSymbols())); int i = 0; - for (org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode + for (org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode .Aggregation aggregation : node.getAggregations().values()) { StringBuilder aggregator = @@ -755,7 +755,7 @@ public List visitAggregationTableScan( boxValue.add(String.format("QualifiedTableName: %s", node.getQualifiedObjectName().toString())); boxValue.add(String.format("OutputSymbols: %s", node.getOutputSymbols())); int i = 0; - for (org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode + for (org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode .Aggregation aggregation : node.getAggregations().values()) { StringBuilder aggregator = @@ -823,7 +823,7 @@ public List visitMarkDistinct(MarkDistinctNode node, GraphContext contex @Override public List visitFilter( - org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode node, + org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Filter-%s", node.getPlanNodeId().getId())); @@ -833,7 +833,7 @@ public List visitFilter( @Override public List visitProject( - org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode node, + org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Project-%s", node.getPlanNodeId().getId())); @@ -931,7 +931,7 @@ public List visitTableExchange(ExchangeNode node, GraphContext context) @Override public List visitLimit( - org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode node, + org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Limit-%s", node.getPlanNodeId().getId())); @@ -948,7 +948,7 @@ public List visitEnforceSingleRow(EnforceSingleRowNode node, GraphContex @Override public List visitOffset( - org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode node, + org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Offset-%s", node.getPlanNodeId().getId())); @@ -958,7 +958,7 @@ public List visitOffset( @Override public List visitSort( - org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode node, + org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Sort-%s", node.getPlanNodeId().getId())); @@ -997,7 +997,7 @@ public List visitGroup(GroupNode node, GraphContext context) { @Override public List visitMergeSort( - org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode node, + org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MergeSortNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("MergeSort-%s", node.getPlanNodeId().getId())); @@ -1008,7 +1008,7 @@ public List visitMergeSort( @Override public List visitCollect( - org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode node, + org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CollectNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("Collect-%s", node.getPlanNodeId().getId())); @@ -1018,7 +1018,7 @@ public List visitCollect( @Override public List visitTopK( - org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode node, + org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode node, GraphContext context) { List boxValue = new ArrayList<>(); boxValue.add(String.format("TopK-%s", node.getPlanNodeId().getId())); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeUtil.java index f6201800a7196..e622b9fab6a80 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeUtil.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import java.util.List; import java.util.Map; 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 d620365b22fe7..93ded06e49a19 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 @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DevicesCountNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java index bfe58813c8507..28c0070d62665 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/SimplePlanVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; public class SimplePlanVisitor implements PlanVisitor { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java index 7b7a7000288e3..4a570d75522cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/WritePlanNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPartitionRelatedNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPartitionRelatedNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java index c8d6600704245..24dd28712312a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadSingleTsFileNode.java @@ -23,8 +23,8 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java index ecbb592f9d106..26917e858d0a7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.load; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java index de2ec7b08c63d..3f452ad44f1d8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFilePieceNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.storageengine.load.splitter.TsFileData; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java index 022f0c7519dbf..63d9109d8ec9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/AbstractSchemaMergeNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.ProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.ProcessNode; import java.util.ArrayList; import java.util.Collections; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java index 710ceaec7f136..be6ebc01a41de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/CountSchemaMergeNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java index 9300b183edc64..882c6ab244a9c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DeviceSchemaFetchScanNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/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 26ed001a9a745..018cd4e0a4a9e 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 @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; 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 4bc82944fdd8e..6774e3febaea6 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 @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; 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 c39533b884011..8c27aeaa4a7c8 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 @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; 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 91f9d6255477a..a66e82dc97979 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 @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java index 9f0f214751f29..42be7dc9febe5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodeManagementMemoryMergeNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.common.rpc.thrift.TSchemaNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.ProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.ProcessNode; import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils; 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/metadata/read/NodePathsConvertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java index f872277ca4331..315f71cfacb75 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsConvertNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.ProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.ProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java index 966167eb50e2d..84a8024f05b36 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsCountNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.ProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.ProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; 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 a5fe8fcc99ec3..da9490a248b5d 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; 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 7fb4878f6256d..38a1c651dc69d 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java index a1ba23fa02296..2b5f3e420b39b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchMergeNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java index 8b97d871093e9..0fe944f78bfb9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaFetchScanNode.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.source.SourceNode; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java index 250f2fc0ff1aa..fc655fe2c94eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryMergeNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; 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 7ea3cfb1a4d6e..673f8ba303b7d 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; 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/metadata/read/SchemaQueryScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java index cd3a80445f937..1ef1ee9570772 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryScanNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/metadata/read/SeriesSchemaFetchScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java index e97983091ad9b..4509ebdc6f602 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SeriesSchemaFetchScanNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/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 997b910ce5040..b1b211a763d4e 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,10 +22,10 @@ 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.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; 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 c6f613e26d4f6..7478f61a7b317 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 @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; 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 4be471fc03e94..4640396a9685c 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java index 18ba19dccf9f3..16473e7936ee5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ActivateTemplateNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java index f90053e476a68..ff514e99f6fc1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterEncodingCompressorNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.utils.SerializeUtils; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java index 3ff83bc535b3b..c87359e3589fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/AlterTimeSeriesNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java index 046f653e08ec5..e242259a66999 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/BatchActivateTemplateNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java index f5a18304ad823..abeadce16b55a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/ConstructSchemaBlackListNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java index 0971698edccbe..d96c7eb058832 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateAlignedTimeSeriesNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; 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/metadata/write/CreateMultiTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java index b1b4e0d1a92a8..5d00f7cfa0f42 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateMultiTimeSeriesNode.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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/metadata/write/CreateTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java index 6c91ec8561c1a..187ba041116a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/CreateTimeSeriesNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java index d5bc7a9c03d41..04d5635a3ef69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeactivateTemplateNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.IDeactivateTemplatePlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java index 50ada41e6880d..643cef3e4265e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/DeleteTimeSeriesNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java index a8f15fad4996d..172bb1fae18c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalBatchActivateTemplateNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java index 89140c4a8bb28..8e01176c415f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateMultiTimeSeriesNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java index 1b6b57f833cc1..0084b8cf5e12f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/InternalCreateTimeSeriesNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java index 542c6472b16d8..c9e1dc873c3f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/PreDeactivateTemplateNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.IPreDeactivateTemplatePlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java index 9d4c71536068e..36fc443cdf4fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackPreDeactivateTemplateNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.write.req.IRollbackPreDeactivateTemplatePlan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java index 5453e6d6ccb9f..625f094c83877 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/RollbackSchemaBlackListNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java index c72315d8d61e4..056ed362b73d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/AlterLogicalViewNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; 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/metadata/write/view/ConstructLogicalViewBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java index ca6572c40e8bd..e831cd13430ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/ConstructLogicalViewBlackListNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java index ae93a26d86a6e..e7da2cfda6b46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/CreateLogicalViewNode.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java index 50c4bf4f99ed9..c18ea5ed1be0f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/DeleteLogicalViewNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java index 4133b56f4b578..dbee3f2f9affd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/write/view/RollbackLogicalViewBlackListNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.view; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java index 191be8463abf2..71bde797d6dab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedDeleteDataNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.consensus.statemachine.dataregion.DataExecutionVisitor; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java index 7a545b607e1ec..f08eef7e9c5d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedInsertNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.consensus.statemachine.dataregion.DataExecutionVisitor; import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java index 586eff9faff92..f82e6c4a8da4f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedNonWritePlanNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.consensus.statemachine.schemaregion.SchemaExecutionVisitor; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; 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/pipe/PipeEnrichedWritePlanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java index 590f370799216..73e8ee364866c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeEnrichedWritePlanNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.consensus.statemachine.schemaregion.SchemaExecutionVisitor; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java index 98314b1c415de..145128350683a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/pipe/PipeOperateSchemaQueueNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.pipe.source.schemaregion.SchemaRegionListeningQueue; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegion; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java index fde11973fae5e..be5544e5877d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AI/InferenceNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AI; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.model.ModelInferenceDescriptor; 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 03b07f490beb6..c4da3a4e240c8 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; 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.PlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java index 2c48808d70613..e9adb60c89715 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationMergeSortNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; 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 bfed971894b06..750c9109bb5ba 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; 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.PlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java index 2a3120895f864..03ef02f28b349 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/CollectNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java index 062cce10bc40c..cfb936b7555dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ColumnInjectNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.utils.columngenerator.parameter.ColumnGeneratorParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java index cf2c48db6acc6..8b13c4fccf1f8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceMergeNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; 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 0f100f0c8c706..dd0ebac9f06be 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; 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.PlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java index 2388a0a2d03c6..2de070f8aa7d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java index 5c54df2a13115..084141e90a728 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ExchangeNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; 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/process/FillNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java index 70f7807f71c7a..e558ef146aa29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FillNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.FillDescriptor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java index 705fb5c2bfd76..81d3153bcbb72 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/FilterNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.Expression; 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/process/GroupByLevelNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java index 32e87c7a5c9db..732269817e5b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByLevelNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.CrossSeriesAggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java index 13c0af48f3f5c..d96100bfac81a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/GroupByTagNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.CrossSeriesAggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java index d462dca196a8d..684ae2507b9d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/HorizontallyConcatNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; 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 66bb88a908c39..00e91b3803d7e 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; 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.PlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java index 6aa3cb43b65f8..ea8869af070c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/LimitNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java index c5712a18ee366..25209598b1e3b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/MergeSortNode.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java index 52eb745c0689d..705db4e645934 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/OffsetNode.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java index 0a252ce07c6eb..07fda3d7e34b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ProjectNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; 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/process/RawDataAggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java index a3f0167101e60..34885a2d7d832 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; 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.PlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java index 08aa268a85b77..e2c146495807a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SingleDeviceViewNode.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; 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/process/SlidingWindowAggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SlidingWindowAggregationNode.java index a33321caccd24..da395630c5378 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java index 7a3e1fe184d41..79f277ee9c19a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SortNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java index 36252421e7166..6f9ced9891a95 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TopKNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.OrderByParameter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java index 185321066e8fb..c39bc8f6eedab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/TransformNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java index 945cebac0e8b3..c7353644abab9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/FullOuterTimeJoinNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java index e5a2374be63de..2e5fdf8f9b67a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/InnerTimeJoinNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java index 189f2eba4aab3..91bae39152f29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/join/LeftOuterTimeJoinNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java index b66d7c23e36df..774110d441064 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryCollectNode.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java index 977139bc23755..ffe617085e264 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryMergeNode.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java index 5c7ec1a272262..800d0ae809861 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.LastQueryScanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java index 888de6c76582c..03f02f9510b7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/last/LastQueryTransformNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.last; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java index b35b2f44e5118..6ce7fb1e2a7b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/IdentitySinkNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; 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/sink/MultiChildrenSinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/MultiChildrenSinkNode.java index 6e9b0e6ea4d7b..04edfde42075b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/MultiChildrenSinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/MultiChildrenSinkNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java index 3fd84f978270b..8348d2d4644ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/ShuffleSinkNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; 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/sink/SinkNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/SinkNode.java index c57605b0554f9..8f1a6dc0b6461 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/SinkNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/sink/SinkNode.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; public abstract class SinkNode extends PlanNode implements AutoCloseable { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java index f6d53e2e2b44a..0ed7ae9d99243 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesAggregationScanNode.java @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java index 824fe951de061..bc1fd4a3ca197 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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 72005155cc125..b45632e4aef92 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 @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.queryengine.common.DeviceContext; 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 946877cfd9ed7..052f987d1cab6 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 @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/LastSeriesSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java index 9c3baec7c6d8c..764cdb98f8429 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastSeriesSourceNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java index a26b426a7ee8e..3ddc7b848bdc3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/RegionScanNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java index 2f8422944d6e5..f72a5a2dcf3f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationScanNode.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/SeriesAggregationSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationSourceNode.java index c2431506c7501..1551fe87227ee 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,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; 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.PlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java index 22e9319531e6e..31fa9d217d89f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanNode.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeUtil; 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/SeriesScanSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java index a979902becb0b..f08f069cbaaac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesScanSourceNode.java @@ -20,9 +20,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.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java index 7dbdb85d4413c..e3df971024ea2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesSourceNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.source.SourceNode; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java index b9d49ec8c17a9..50a8146c6ebbd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowDiskUsageNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathDeserializeUtil; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; 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.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 999ce3af4486c..f1740803f472f 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,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeader; 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/TimeseriesRegionScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/TimeseriesRegionScanNode.java index 41ae4ca901f03..d2c96debe1419 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 @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.utils.TestOnly; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/VirtualSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/VirtualSourceNode.java index 888351741b7ed..8639c2565f4e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/VirtualSourceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/VirtualSourceNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; public abstract class VirtualSourceNode extends PlanNode { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java index 08c671c5dcc32..ffd614de25481 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/AbstractDeleteDataNode.java @@ -21,8 +21,8 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntryValue; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java index 3cbc9bca1a8de..791cff616f7d6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ContinuousSameSearchIndexSeparatorNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.IWALByteBufferView; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java index 8d34f60e1007a..948394073c407 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/DeleteDataNode.java @@ -24,14 +24,14 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndexType; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.partition.DataPartition; 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.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.common.schematree.DeviceSchemaInfo; import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java index 26c49147ac71f..1150778469f64 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertMultiTabletsNode.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.index.ProgressIndex; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java index ae87f0a38b644..296e74995ffc0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java @@ -22,9 +22,9 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java index 39f1bf57e7ac7..290ec8a4a71ff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java index a79707e8e2373..28f914e16065b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.consensus.index.ProgressIndex; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java index 7ef9eb2a0ded3..15538e127d484 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java @@ -23,11 +23,11 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java index b7ee5b66f402b..490f16ca5f01b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java @@ -23,12 +23,12 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.commons.utils.TimePartitionUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java index 31aa61a59b98d..b791822fb9036 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/ObjectNode.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.write; -import org.apache.iotdb.calc_commons.utils.IObjectPath; +import org.apache.iotdb.calc.utils.IObjectPath; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.exception.ObjectFileNotExist; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java index 27f202aee670b..57bd9071d3bd7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNode.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.ProgressIndexType; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java index 38d05b298fd43..e622dba30b9b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.write; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.DataTypeInconsistentException; 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/write/RelationalInsertRowsNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java index 1586ed282d54c..83498ceefc9bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertRowsNode.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.exception.DataTypeInconsistentException; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java index 7e95e7cb36f42..b9f7edbe87c53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java @@ -22,10 +22,10 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.exception.DataTypeInconsistentException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/SearchNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/SearchNode.java index 57a4ae4aa9c4b..5a7e5d9cf78ea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/SearchNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/SearchNode.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.write; import org.apache.iotdb.commons.consensus.index.ComparableConsensusRequest; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.consensus.iot.log.ConsensusReqReader; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java index cd435b54febcf..e6589fd29095a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/AggregationDescriptor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.plan.expression.Expression; @@ -37,8 +37,8 @@ import java.util.Objects; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_VALUE; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.STDDEV; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.FIRST_VALUE; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.STDDEV; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.addPartialSuffix; import static org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil.isBuiltinAggregationName; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java index 0bcc6d2f0673b..424c7e763dee0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/CrossSeriesAggregationDescriptor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.db.queryengine.plan.expression.Expression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/FillDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/FillDescriptor.java index 117d749d5eb58..f87b805ab108f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/FillDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/FillDescriptor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; -import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.statement.literal.Literal; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByTimeParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByTimeParameter.java index 6e685383479fd..4a89cb7d06f04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByTimeParameter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/GroupByTimeParameter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.statement.component.GroupByTimeComponent; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/OutputColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/OutputColumn.java index 279b96f3c2b0d..e17a405b7f12f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/OutputColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/parameter/OutputColumn.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.plan.parameter; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java index 05561a8867b83..9e28854ca2b71 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationAnalyzer.java @@ -20,40 +20,40 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; 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 52e68b9a31625..a990ad2ab123b 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 @@ -21,44 +21,44 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TSStatus; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.security.Identity; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.With; -import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.SchemaPartition; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.security.Identity; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Fill; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableFunctionInvocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.With; +import org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; 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 d258a356bcecb..d497c4fb770de 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 @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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/analyzer/CanonicalizationAware.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java index 282ab1554fe77..e79608212de37 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/CanonicalizationAware.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; import java.util.OptionalInt; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java index f5b0a92a8edd8..2efbd39ce500a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalysis.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java index e95b8bcad5ae2..d7ba986ac7146 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionAnalyzer.java @@ -19,72 +19,72 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; -import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind; -import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Columns; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DecimalLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ProcessingMode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionId; +import org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionKind; +import org.apache.iotdb.commons.queryengine.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.FunctionNullability; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Columns; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ProcessingMode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeNotFoundException; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; @@ -142,23 +142,23 @@ import static java.util.Collections.unmodifiableSet; import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_AGGREGATION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_AGGREGATION; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.LAST_BY_AGGREGATION; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression.isQualifiedAllFieldsReference; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.FOLLOWING; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.PRECEDING; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_FOLLOWING; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_PRECEDING; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.GROUPS; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.ROWS; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isNumericType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.FIRST_AGGREGATION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.FIRST_BY_AGGREGATION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.LAST_AGGREGATION; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.LAST_BY_AGGREGATION; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression.isQualifiedAllFieldsReference; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound.Type.FOLLOWING; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound.Type.PRECEDING; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_FOLLOWING; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_PRECEDING; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame.Type.GROUPS; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame.Type.RANGE; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame.Type.ROWS; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.ExpressionTreeUtils.extractExpressions; import static org.apache.iotdb.db.queryengine.plan.relational.utils.NodeUtils.getSortItemsFromOrderBy; import static org.apache.tsfile.read.common.type.BlobType.BLOB; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java index ca2b0875b1058..2abf38d60aec3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExpressionTreeUtils.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultExpressionTraversalVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java index ff21e307449ce..a8417ba73a9c0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Field.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; 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/analyzer/PatternRecognitionAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java index 9428c4c1fc0a2..c9dec8cb9cb19 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalysis.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RangeQuantifier; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java index 8ea7b53a93ba3..eee02db217c00 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PatternRecognitionAnalyzer.java @@ -20,20 +20,20 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.VariableDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExcludedPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.MeasureDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SkipTo; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.VariableDefinition; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.Range; import com.google.common.collect.ImmutableList; @@ -49,7 +49,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableSet.toImmutableSet; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ProcessingMode.Mode.FINAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ProcessingMode.Mode.FINAL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.ExpressionTreeUtils.extractExpressions; import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.AstUtil.preOrder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java index 3639900ad1846..f6b6778865271 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationId.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; import java.util.Objects; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java index a936bd06d3c10..5fce0ad2af1cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RelationType.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java index 9d0bf43b7e5b7..19ff9fa8f369e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Scope.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.rpc.TSStatusCode; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java index 6027233ba10bc..806b08e792ee4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ScopeReferenceExtractor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; import java.util.Map; import java.util.Objects; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java index f7e1bb8b2ede2..2d09ba07f39cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java @@ -19,102 +19,102 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.function.TableBuiltinTableFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllRows; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Columns; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Except; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingElement; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Intersect; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinCriteria; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinOn; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinUsing; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Limit; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Select; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SelectItem; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SetOperation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleGroupBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionArgument; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionTableArgument; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Union; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Values; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.VariableDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Window; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.With; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WithQuery; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; -import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; -import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.function.TableBuiltinTableFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AllRows; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Columns; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Except; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Fill; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupingSets; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Intersect; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinUsing; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Limit; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.MeasureDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NaturalJoin; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Select; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SetOperation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SkipTo; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableFunctionArgument; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableFunctionInvocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Union; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Values; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.VariableDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Window; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.With; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.queryengine.utils.cte.CteDataStore; 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; @@ -270,14 +270,14 @@ import static java.util.Collections.emptyList; import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTimestampType; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.ForecastTableFunction.TIMECOL_PARAMETER_NAME; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression.getQualifiedName; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.FULL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.INNER; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.LEFT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.RIGHT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isTimestampType; +import static org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.ForecastTableFunction.TIMECOL_PARAMETER_NAME; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression.getQualifiedName; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join.Type.FULL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join.Type.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join.Type.LEFT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join.Type.RIGHT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; import static org.apache.iotdb.commons.schema.table.TsTable.TABLE_ALLOWED_PROPERTIES; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; import static org.apache.iotdb.db.queryengine.execution.warnings.StandardWarningCode.REDUNDANT_ORDER_BY; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java index b17245d66464b..3772c63f86f97 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzerFactory.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java index 49e96d9aee4a6..8e84b5160154f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java @@ -20,33 +20,33 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import com.google.common.collect.ImmutableList; @@ -76,9 +76,9 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isExtractTimeColumn; -import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; -import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; +import static org.apache.iotdb.calc.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isExtractTimeColumn; +import static org.apache.iotdb.calc.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.isTimeColumn; +import static org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.ConvertPredicateToTimeFilterVisitor.getLongValue; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java index 360d1a9d03874..c97eb3d803ceb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToTimeFilterVisitor.java @@ -19,23 +19,23 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.filter.basic.Filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java index 73521fba78f44..f63511cc10256 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateCombineIntoTableScanChecker.java @@ -19,23 +19,23 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import java.util.List; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java index 9f12f2f775b66..ec0f4f521c0bb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoMetadataChecker.java @@ -19,40 +19,40 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DecimalLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java index 826a2fe6f7bc2..7282569de686e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicatePushIntoScanChecker.java @@ -19,21 +19,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java index 2ae34d8636c66..cab1142b37ba9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/PredicateVisitor.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java index 384fcd76e5466..c503e7e176b33 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableExpressionType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableExpressionType; 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; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java index 2608152de645e..c07f281f9b58c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java @@ -19,23 +19,23 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.filter.impl.multichildren.AndFilter; import org.apache.iotdb.commons.schema.filter.impl.multichildren.OrFilter; @@ -62,7 +62,7 @@ import java.util.stream.Collectors; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; +import static org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils.getEscapeCharacter; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicatePushIntoScanChecker.isSymbolReference; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java index c39e0a5b0f53b..31369dd721fea 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ExtractPredicateColumnNameVisitor.java @@ -19,21 +19,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.schema; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.predicate.PredicateVisitor; public class ExtractPredicateColumnNameVisitor extends PredicateVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java index e8c6a41731147..6f9cbf12954b4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/tablefunction/TableArgumentAnalysis.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer.tablefunction; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Relation; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.CanIgnoreReturnValue; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java index 2ad741a9413f9..fbee363bdfad8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/Metadata.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; -import org.apache.iotdb.calc_commons.plan.relational.metadata.ITypeMetadata; +import org.apache.iotdb.calc.plan.relational.metadata.ITypeMetadata; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionFactory; -import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; 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.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.function.ITableFunctionFactory; +import org.apache.iotdb.commons.queryengine.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignature; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinWindowFunction; import org.apache.iotdb.db.exception.load.LoadAnalyzeTableColumnDisorderException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java index b755445f1a545..41d1bcb172e4c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/MetadataUtil.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnMetadata; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnMetadata; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java index d706527a61e53..ad09fcefb0c36 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/OperatorNotFoundException.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignature; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadata.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadata.java index 5eb113e68eaa9..7ce8b3a3bc6d9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadata.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadata.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnMetadata; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnMetadata; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; import java.util.ArrayList; import java.util.Collections; 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 3347f8d83a570..7f7158538b6bc 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 @@ -19,27 +19,27 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; -import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.AdditionResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.DivisionResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.ModulusResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.MultiplicationResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.SubtractionResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; -import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; 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.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.AdditionResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.DivisionResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.ModulusResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.MultiplicationResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; @@ -74,7 +74,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.calc.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; import static org.apache.tsfile.read.common.type.BlobType.BLOB; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TreeDeviceViewSchema.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TreeDeviceViewSchema.java index cc06fe736b647..8ee4583bd8f34 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TreeDeviceViewSchema.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TreeDeviceViewSchema.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.commons.schema.table.TreeViewSchema; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java index 3f7928b7d4e90..6eb90d0fa9419 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/SchemaPredicateUtil.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.filter.SchemaFilterType; import org.apache.iotdb.commons.schema.filter.impl.StringValueFilterVisitor; 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 159ee6f79c68c..eaf1a85158ed0 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 @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; 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.TagFilter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java index 9cca3e4c3b87f..baf2056984e44 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher; -import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; @@ -73,7 +73,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.commons.schema.table.TsTable.TIME_COLUMN_NAME; import static org.apache.iotdb.db.utils.EncodingInferenceUtils.getDefaultEncoding; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java index dbc5cbd6931c1..5025f3687fcba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializer.java @@ -26,14 +26,14 @@ import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.With; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WithQuery; -import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.With; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.commons.queryengine.utils.cte.CteDataStore; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.exception.mpp.FragmentInstanceFetchException; import org.apache.iotdb.db.protocol.session.SessionManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java index 331c96a57c1dd..0dc4d121d54d3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/EqualityInference.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.SubExpressionExtractor; import org.apache.iotdb.db.queryengine.plan.relational.utils.DisjointSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java index 6a9ecfc22e03d..91bcc8a974328 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionExtractor.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java index 49ccbd0f2abf3..d34332f64df6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExpressionSymbolInliner.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java index b2f5706e739f3..58053bf6dccd3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java @@ -19,36 +19,36 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.calc_commons.transformation.dag.util.CastFunctionUtils; +import org.apache.iotdb.calc.transformation.dag.util.CastFunctionUtils; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.function.InterpretedFunctionInvoker; -import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.function.InterpretedFunctionInvoker; +import org.apache.iotdb.commons.queryengine.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator; @@ -77,10 +77,10 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.MINUS; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.PLUS; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.ExtractTransformer.constructEvaluateFunction; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.MINUS; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.PLUS; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java index f5625db4ebd35..c2366d08e7de3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java @@ -20,44 +20,44 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.metadata.OperatorNotFoundException; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; @@ -89,7 +89,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toTypeSignature; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; import static org.apache.tsfile.read.common.type.FloatType.FLOAT; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java index a8f0082ba4ad1..8d7b10fa7fa9f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralEncoder.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; import com.google.common.collect.ImmutableList; import org.apache.tsfile.common.conf.TSFileConfig; @@ -44,10 +44,10 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBlobType; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isBool; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isCharType; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isBlobType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isBool; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isCharType; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.tsfile.read.common.type.DoubleType.DOUBLE; import static org.apache.tsfile.read.common.type.FloatType.FLOAT; import static org.apache.tsfile.read.common.type.IntType.INT32; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java index 50f2773fac1f2..212c4f9ca4208 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LiteralInterpreter.java @@ -20,17 +20,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NoOpSymbolResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NoOpSymbolResolver.java index e14ae7b04e060..f71948106b367 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NoOpSymbolResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NoOpSymbolResolver.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; public class NoOpSymbolResolver implements SymbolResolver { public static final NoOpSymbolResolver INSTANCE = new NoOpSymbolResolver(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java index 1551ac504dd81..a2563744d86dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/NodeAndMappings.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java index c53aed0e0dd32..0f82d623a2298 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/OrderingTranslator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem; public class OrderingTranslator { private OrderingTranslator() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java index f1d45ced36002..3c8e5ba4193b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanBuilder.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; 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/planner/PlanNodeSearcher.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanNodeSearcher.java index b13528ec3d4cf..c8d6992b211bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanNodeSearcher.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanNodeSearcher.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlannerContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlannerContext.java index ac1b4433a15c3..8056ae9d79f5f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlannerContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlannerContext.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java index fde6d09ce6369..d7748e2347daf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtils.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException; import org.apache.tsfile.utils.Pair; @@ -32,11 +32,11 @@ import java.util.Arrays; import static org.apache.iotdb.commons.conf.IoTDBConstant.TIME; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.and; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.or; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.OR; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression.and; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression.or; public class PredicateUtils { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java index 564f5cfd9b310..3fc66970fd327 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java @@ -20,47 +20,47 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Aggregation; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QueryBody; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.VariableDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Aggregation; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Fill; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.MeasureDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.VariableDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; @@ -101,17 +101,17 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.lang.String.format; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isNumericType; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.groupingSets; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.GROUPS; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.ROWS; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isNumericType; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.groupingSets; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame.Type.GROUPS; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame.Type.RANGE; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame.Type.ROWS; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingTranslator.sortItemToSortOrder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware.scopeAwareKey; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java index ec4c8a30377dc..ce9ece17c8ab6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlan.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.RelationType; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; 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 667d19ed062ac..9e2244e93e0d5 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 @@ -20,71 +20,71 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.AggregationLabelSet; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.AggregationValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ClassifierValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers.Assignment; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.MatchNumberValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Except; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Intersect; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinCriteria; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinOn; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinUsing; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SetOperation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Union; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Values; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.VariableDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.Measure; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SkipToPosition; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.AggregationLabelSet; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.AggregationValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ClassifierValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers.Assignment; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.LogicalIndexPointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.MatchNumberValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ScalarValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Except; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Intersect; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinUsing; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.MeasureDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SetOperation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SkipTo; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableFunctionInvocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Union; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Values; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.VariableDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.utils.cte.CteDataStore; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -160,16 +160,16 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.lang.String.format; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.CROSS; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.FULL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.IMPLICIT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.INNER; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.LEFT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join.Type.RIGHT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.Position.PAST_LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join.Type.CROSS; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join.Type.FULL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join.Type.IMPLICIT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join.Type.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join.Type.LEFT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join.Type.RIGHT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SkipTo.Position.PAST_LAST; import static org.apache.iotdb.commons.schema.table.InformationSchema.INFORMATION_DATABASE; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.NavigationAnchor.LAST; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.PatternRecognitionAnalysis.NavigationMode.RUNNING; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java index 0b69b8cfdb77d..38ad8dc1831a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ScopeAware.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.CanonicalizationAware; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.ResolvedField; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java index 5f2e064562cb7..43b056372b3fc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SimplePlanRewriter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java index 7ecb95f1e72b1..bb4fba70eb294 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SubqueryPlanner.java @@ -19,28 +19,28 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; @@ -70,8 +70,8 @@ import static com.google.common.collect.Streams.stream; import static java.lang.String.format; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression.Quantifier.ALL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression.Quantifier.ALL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ScopeAware.scopeAwareKey; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java index 219ed6b751113..f7ad25965d1f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolAllocator.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Field; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolResolver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolResolver.java index da97397dbb70f..7ceecf4630c2f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolResolver.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolResolver.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; public interface SymbolResolver { Object getValue(Symbol symbol); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java index 756b4a0acf761..489796b7fa272 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/SymbolsExtractor.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultExpressionTraversalVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultTraversalVisitor; 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 5145d3ffe9df5..e04937e85adc5 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 @@ -19,25 +19,25 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.partition.SchemaPartition; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.commons.schema.table.TreeViewSchema; @@ -103,8 +103,8 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode.COLUMN_NAME_PREFIX; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager.getTSDataType; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode.COLUMN_NAME_PREFIX; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager.getTSDataType; import static org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet.LOGICAL_PLANNER; import static org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet.LOGICAL_PLAN_OPTIMIZE; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.MetadataUtil.createQualifiedObjectName; 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 c9bb007e0a73f..c8433d95416a7 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 @@ -24,11 +24,11 @@ import org.apache.iotdb.commons.client.IClientManager; import org.apache.iotdb.commons.client.async.AsyncDataNodeInternalServiceClient; import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.QueryStateMachine; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java index f6d8d7c2bbc1b..5f31c0ef6bbbc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TranslationMap.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Trim; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.ResolvedField; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Scope; @@ -61,7 +61,7 @@ * boundary. * *

    AST and IR expressions use the same class hierarchy ({@link - * org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression}, but differ in the + * org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression}, but differ in the * following ways: *

  • AST expressions contain Identifiers, while IR expressions contain SymbolReferences *
  • FunctionCalls in AST expressions are SQL function names. In IR expressions, they contain an diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java index 21e5ffe4e65e1..b2ab3eb63c87a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/AddExchangeNodes.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.commons.partition.DataPartition; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.distribution.NodeDistribution; 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/relational/planner/distribute/SubPlanGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/SubPlanGenerator.java index 7a83e26bde0f2..737dc43855aae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/SubPlanGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/SubPlanGenerator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.SubPlan; 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 7fb84440b69d6..eb967534e1731 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 @@ -25,50 +25,50 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.SchemaPartition; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionId; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; @@ -143,12 +143,12 @@ import java.util.stream.IntStream; import static com.google.common.collect.ImmutableList.toImmutableList; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind.AGGREGATE; -import static org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.COUNT; import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED; +import static org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionKind.AGGREGATE; +import static org.apache.iotdb.commons.queryengine.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PushPredicateIntoTableScan.containsDiffFunction; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.TransformSortToStreamSort.isOrderByAllIdsAndTime; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.split; 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 0016af8ff1306..20d533904394b 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 @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; 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 9a72d9a8661aa..0c986eb983833 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 @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java index 9577f9c97a50f..77ccb17ba4027 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelTypeProviderExtractor.java @@ -19,24 +19,24 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.SimplePlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.CountSchemaMergeNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java index a31f28704be8b..4236c8aece537 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DefaultTraversalVisitor.java @@ -19,22 +19,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; public abstract class DefaultTraversalVisitor implements AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java index dfa62e5f1b27a..8fd068341fabd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/DeterminismEvaluator.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionNodeInliner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionNodeInliner.java index d04c651858baa..47e133df4a09e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionNodeInliner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionNodeInliner.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java index 386e4b7daef35..55c210e3fc1cd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionRewriter.java @@ -19,41 +19,41 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; public class ExpressionRewriter { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java index de85541c5897e..a5c4b15cbcd24 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExpressionTreeRewriter.java @@ -19,45 +19,45 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataTypeParameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NumericParameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TypeParameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataTypeParameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java index 10cb784b877f5..e72509e252a4f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ExtractCommonPredicatesExpressionRewriter.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -34,7 +34,7 @@ import static java.util.Collections.emptySet; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.OR; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combinePredicates; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractPredicates; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java index 5bf1427be95d3..c8cb09a696f83 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GapFillStartAndEndTimeExtractVisitor.java @@ -20,27 +20,27 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import javax.annotation.Nullable; import java.time.ZoneId; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.OR; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.OR; public class GapFillStartAndEndTimeExtractVisitor implements AstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java index 2c9877e46f613..ccef426d87a35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/IrUtils.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; @@ -50,8 +50,8 @@ import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toList; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; public final class IrUtils { private IrUtils() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java index e18f102a885bc..7e95208585242 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/NormalizeOrExpressionRewriter.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultimap; @@ -36,8 +36,8 @@ import java.util.Set; import static com.google.common.collect.ImmutableList.toImmutableList; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.or; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java index 3e77a7031f5fe..c90bdb1ef60d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/PredicateWithUncorrelatedScalarSubqueryReconstructor.java @@ -20,24 +20,24 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.With; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.With; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WithQuery; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.MPPQueryContext.ExplainType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java index 79b7c5d82cd32..91716387d97bd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/ReplaceSymbolInExpression.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import java.util.Map; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/SubExpressionExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/SubExpressionExtractor.java index 86527094ae6b9..24be8cde97848 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/SubExpressionExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/SubExpressionExtractor.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.ir; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; import com.google.common.graph.SuccessorsFunction; import com.google.common.graph.Traverser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java index 9b5719607d80b..e450b2ba08340 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/IterativeOptimizer.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Match; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Match; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.PlanOptimizersStatsCollector; @@ -56,7 +56,7 @@ import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static java.util.stream.Collectors.joining; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector; import static org.apache.iotdb.rpc.TSStatusCode.OPTIMIZER_TIMEOUT; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java index fdd50c244bd82..b7bf3383ecf53 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Lookup.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.iterative.GroupReference; import java.util.function.Function; import java.util.stream.Stream; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java index 84086bedeccc6..243333a5cbbe0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Memo.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.common.QueryId; import com.google.common.collect.HashMultiset; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java index e209dcb416907..64decb66f2c7a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Plans.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java index a01ca7e8193eb..6c1c1bab1ec47 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/Rule.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/RuleIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/RuleIndex.java index 755666723d433..e9d8955c97678 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/RuleIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/RuleIndex.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.pattern.TypeOfPattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.pattern.TypeOfPattern; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java index 378d365be98bd..de1bfdb943ef2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/AggregationDecorrelation.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java index 794cdbffa7393..c12642ee729a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/CanonicalizeExpressionRewriter.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; @@ -42,8 +42,8 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; public class CanonicalizeExpressionRewriter { 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 9857907504a58..e1f0737f00993 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 @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; 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.TableScanNode; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; 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 333d63704e156..3ec50ae6fc343 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 @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; 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.TableScanNode; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.tableScan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java index 3c2af3684354e..80e827a05fcf5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EvaluateEmptyIntersect.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java index a311f0a277f73..23edba1d56d48 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ExpressionRewriteRuleSet.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.Measure; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java index ed65e6f734905..a20c25cd91f55 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/GatherAndMergeWindows.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.PropertyPattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.PropertyPattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; @@ -49,7 +49,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableSet.toImmutableSet; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.transpose; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.groupNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java index 45b0ff02ab49e..a94e59876f778 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptAll.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; @@ -41,7 +41,7 @@ import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.SUBTRACT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.SUBTRACT; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Except.distinct; public class ImplementExceptAll implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java index 2e7b831088a6c..1247335f77daa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementExceptDistinctAsUnion.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -36,7 +36,7 @@ import org.apache.tsfile.read.common.type.LongType; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; public class ImplementExceptDistinctAsUnion implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java index 0abd00f6137ea..2460f923ef67c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectAll.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java index e82a81a46bc57..212ae94da4a37 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementIntersectDistinctAsUnion.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -36,7 +36,7 @@ import org.apache.tsfile.read.common.type.LongType; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; public class ImplementIntersectDistinctAsUnion implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java index 2201054a368a8..656b10b33a533 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementPatternRecognition.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java index 1343a9fa1b8ad..7b9b4934333eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ImplementTableFunctionSource.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -41,7 +41,7 @@ import java.util.concurrent.atomic.AtomicReference; import static com.google.common.collect.Iterables.getOnlyElement; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; /** * This rule prepares cartesian product of partitions from all inputs of table function. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java index 56ac79a200358..32ed39d1644a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/InlineProjections.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.analyze.TypeProvider; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; @@ -47,7 +47,7 @@ import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toSet; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java index 284ab2486e450..e495b832f3b5d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeExcept.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java index 4595961a107c3..f29a3fb9b3311 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeFilters.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java index f404a1c941447..e471e3da49b83 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeIntersect.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SetOperationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java index 2150cd4d53d6a..87b8075599aed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithMergeSort.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.MergeLimitWithMergeSort.transformByMergeSortNode; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.mergeSort; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java index 0e43c93e35f1e..fbc4e790c2876 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitOverProjectWithSort.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.sort; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java index 00cea51176e4e..cafa5f0c2e9c9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithMergeSort.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.Optional; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.mergeSort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java index 1b47f5571bd40..968ab39d6b957 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimitWithSort.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.sort; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java index 599063d896d42..541f4e6a42dc2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeLimits.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java index 6d5a330be3399..aa3599d14421d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MergeUnion.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SetOperationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java index 8fec44904ad21..53682050a7ace 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/MultipleDistinctAggregationToMarkDistinct.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.base.Predicates; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java index 789df0f92e4c6..5009835ff1d20 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/OptimizeRowPattern.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrPatternAlternationOptimizer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPatternFlattener; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrPatternAlternationOptimizer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrRowPatternFlattener; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.patternRecognition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java index 81734ffd6aa90..e6976185d244c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ProjectOffPushDownRule.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; @@ -32,7 +32,7 @@ import java.util.Optional; import java.util.Set; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.pruneInputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java index 453563f9c469c..c0ee4cd795a3f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; import com.google.common.collect.Maps; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java index 88cc20b10ca0c..a5d06b8788615 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAggregationSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java index 37c6106046e18..74901facbd487 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java index 7d4488291ef6b..3d1b93b7aabe1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplyCorrelation.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java index 5791c9a745243..d3cc7382b52f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneApplySourceColumns.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java index fcec45a5f4f90..02e4a7d15ff62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneAssignUniqueIdColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCopyToColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCopyToColumns.java index ecabb85d09ae3..4ef3b95185855 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCopyToColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCopyToColumns.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CopyToNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java index ebc266f359e1f..5364d492791fd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; import com.google.common.collect.ImmutableSet; @@ -30,7 +30,7 @@ import java.util.Set; import static com.google.common.collect.Sets.intersection; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor.extractUnique; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java index 27bcb1cd45975..887bce83cd584 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneCorrelatedJoinCorrelation.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java index fe3b7d17a7eb0..a00b131efa895 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneDistinctAggregation.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java index 5f4f8da7bd410..2107e46c5859c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneEnforceSingleRowColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.EnforceSingleRowNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java index 9493aafe7db90..6606e7f719664 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExceptSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ExceptNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExplainAnalyzeColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExplainAnalyzeColumns.java index 32f6a4db2436a..db5291a9d3873 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExplainAnalyzeColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneExplainAnalyzeColumns.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java index 447f46b7fb46b..7c82fcdeaab50 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFillColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FillNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FillNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java index 6a4cd50704d75..767c57ab913f3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneFilterColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java index ea4966b479e9f..4d2ed49335cf3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneGapFillColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GapFillNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java index 18018c9cf025b..5186b07ebf9bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneIntersectSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.IntersectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java index 5b91c09b98a19..8562b70997263 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinChildrenColumns.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java index bd57ed5337e17..14c7446f18588 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneJoinColumns.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java index b667b53fc34dd..65f3c20c6de25 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneLimitColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java index 0b03d6d1950ca..db3b5cb9c4048 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneMarkDistinctColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MarkDistinctNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java index 92fa229a61a93..e1b6d9c2553f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOffsetColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java index 4aa54a1914a19..c76b0ae2f4706 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneOutputSourceColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java index 75d980f21c9f0..0c964b6b42ca9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PrunePatternRecognitionSourceColumns.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.Measure; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch.ONE; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowsPerMatch.ONE; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictChildOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.PatternRecognition.rowsPerMatch; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.patternRecognition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java index 97a350da0ae5a..86712e7618ced 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneProjectColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; import java.util.Optional; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java index bb388ff754b50..157bf2712750d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneSortColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java index 6124ced909a9c..5930f59a566de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java index 4bcc3db116188..3922f4a25de94 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableFunctionProcessorSourceColumns.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; 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 04f170958ac3a..a6cee7ad9d86f 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,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java index 2eec028143d41..2ec929fb23b45 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTopKColumns.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; import com.google.common.collect.Streams; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java index b00704909a141..1c4bd76b7abd8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java index 18981cf63fd67..eaf3c91f7aba2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneUnionSourceColumns.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java index 70ec157be8f07..b5c5e5a303f91 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneWindowColumns.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java index 017cb0af7c021..3a74cd4ad975c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownFilterIntoWindow.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; @@ -42,7 +42,7 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.lang.Math.toIntExact; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.toTopNRankingType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java index 63ac7bcd17ec7..0bde084e5131f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownLimitIntoWindow.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; @@ -34,8 +34,8 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.lang.Math.toIntExact; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.toTopNRankingType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.ChildReplacer.replaceChildren; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java index 2d26c239d9b3e..9e1bdcf0ed9cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownNegationsExpressionRewriter.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; @@ -39,11 +39,11 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.IS_DISTINCT_FROM; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.IS_DISTINCT_FROM; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combinePredicates; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractPredicates; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java index ebd1878f264c5..10ccd1f0559c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushDownOffsetIntoTableScan.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; 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 static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.offset; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.tableScan; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java index 3861a2fd52832..fc7e35dbf0898 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughOffset.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; import static java.lang.Math.addExact; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.offset; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java index 558fb0e3090ea..83af0078b5723 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughProject.java @@ -18,15 +18,15 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.transpose; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java index 8486d32152b7e..2b540cdd1126f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushLimitThroughUnion.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; import java.util.Optional; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Limit.requiresPreSortedInputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.limit; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java index 4449e91d0c92a..6f221fe968c12 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushProjectionThroughUnion.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; @@ -39,7 +39,7 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.project; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java index 92e2fe67a04f8..432cbadfbd2b0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PushTopKThroughUnion.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper; @@ -37,7 +37,7 @@ import static com.google.common.collect.Iterables.getLast; import static com.google.common.collect.Sets.intersection; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.source; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.topK; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.union; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java index 22cc2fe21d66e..7e757e734d76b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveDuplicateConditions.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java index 4b48652ebb14d..405fd5ab7d8a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyExceptBranches.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -38,8 +38,8 @@ import java.util.List; import java.util.Map; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.isEmpty; public class RemoveEmptyExceptBranches implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java index d7bdcf526998c..10122129f4de1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveEmptyUnionBranches.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java index eb09bd250a923..b67afe1d6488e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantEnforceSingleRowNode.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.EnforceSingleRowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.enforceSingleRow; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java index 1215945c07671..9d1284234d8a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantExists.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java index 0721f6f802b53..e89881e397b33 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantIdentityProjections.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java index b9e748ef6b820..e093498b25b94 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveRedundantWindow.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java index d61b66d4a4264..2e7442cf0fa04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveTrivialFilters.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.filter; public class RemoveTrivialFilters implements Rule { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java index 2cb32c1f821d0..bb295e23cc908 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarApplyNodes.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java index 971107116e42f..2c9a8863f320e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/RemoveUnreferencedScalarSubqueries.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.RIGHT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.RIGHT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.isAtLeastScalar; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java index 8723ee2a22800..354e1ad13eb96 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/ReplaceWindowWithRowNumber.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java index d85ab721e7c7e..1e5e707cc3d3f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationMerge.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SetOperationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java index f537d12f9e33b..a5ba553d77ae9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SetOperationNodeTranslator.java @@ -19,29 +19,29 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; -import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SetOperationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.calc.utils.constant.SqlConstant; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionId; +import org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionKind; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.FunctionNullability; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SetOperationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; @@ -63,10 +63,10 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.concat; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.COUNT; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.LongType.INT64; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java index 8854a5c0bcb9d..e950840255be0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyCountOverConstant.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionId; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; @@ -44,10 +44,10 @@ import static com.google.common.base.Verify.verify; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind.AGGREGATE; -import static org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.COUNT; +import static org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionKind.AGGREGATE; +import static org.apache.iotdb.commons.queryengine.plan.relational.metadata.FunctionNullability.getAggregationFunctionNullability; import static org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter.evaluateConstantExpression; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.isEffectivelyLiteral; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java index f42e6f65f37ac..a13757ce7c5c1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SimplifyExpressions.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrExpressionInterpreter; import org.apache.iotdb.db.queryengine.plan.relational.planner.IrTypeAnalyzer; import org.apache.iotdb.db.queryengine.plan.relational.planner.LiteralEncoder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java index b41de6808edd3..e555a7ca18548 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/SingleDistinctAggregationToGroupBy.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; @@ -38,8 +38,8 @@ import java.util.stream.Stream; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.aggregation; /** diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java index 54138297fee53..f9a9aac09b913 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithProjection.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -45,11 +45,11 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java index f088d109f2b43..fd898d9f1e871 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedDistinctAggregationWithoutProjection.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -40,11 +40,11 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.subquery; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java index bb079016462ae..3cd116cb3ebf4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithProjection.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -50,13 +50,13 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.empty; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Pattern.empty; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java index 31ef8b78600f5..6e343a1486203 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGlobalAggregationWithoutProjection.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -47,13 +47,13 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.empty; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Pattern.empty; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java index b80c8d5ff0f70..ecd0da2b42e86 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithProjection.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -45,11 +45,11 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Aggregation.groupingColumns; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java index 2f277468af468..e3426af4275a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedGroupedAggregationWithoutProjection.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns; @@ -40,11 +40,11 @@ import java.util.Optional; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.isDistinctOperator; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.AggregationDecorrelation.restoreDistinctAggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule.Util.restrictOutputs; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java index e60b692930a5b..42723fba62b96 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedJoinToJoin.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; @@ -35,10 +35,10 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java index 30f05cd5563c8..e87607a923c6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformCorrelatedScalarSubquery.java @@ -19,23 +19,23 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Cardinality; @@ -46,12 +46,12 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.nonEmpty; -import static org.apache.iotdb.calc_commons.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Pattern.nonEmpty; +import static org.apache.iotdb.calc.transformation.dag.column.FailFunctionColumnTransformer.FAIL_FUNCTION_NAME; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanNodeSearcher.searchFrom; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.filter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java index c3ce3a6aca901..a16e6a0fc4697 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformExistsApplyToCorrelatedJoin.java @@ -19,22 +19,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanNodeDecorrelator; @@ -48,13 +48,13 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.globalAggregation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.globalAggregation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.Util.getResolvedBuiltInAggregateFunction; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java index 307ff77283ed6..9679961291f20 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformFilteringSemiJoinToInnerJoin.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.calc.plan.relational.utils.matching.Capture; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import com.google.common.collect.ImmutableList; @@ -40,11 +40,11 @@ import java.util.function.Predicate; import static com.google.common.collect.ImmutableList.toImmutableList; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Capture.newCapture; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Capture.newCapture; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ExpressionSymbolInliner.inlineSymbols; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.extractConjuncts; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java index cc5cc0b04373c..03b426616a409 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedInPredicateSubqueryToSemiJoin.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; import static com.google.common.collect.Iterables.getOnlyElement; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.empty; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Pattern.empty; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.Apply.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.applyNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java index 38a6bf148fd28..2dcdb036d7b7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/TransformUncorrelatedSubqueryToJoin.java @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Captures; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.calc.plan.relational.utils.matching.Captures; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule; @@ -41,9 +41,9 @@ import java.util.Optional; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.empty; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Pattern.empty; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.CorrelatedJoin.correlation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.Patterns.correlatedJoin; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.QueryCardinalityUtil.extractCardinality; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java index 2ce4ecf0cf93e..658586e11ad59 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/Util.java @@ -18,14 +18,14 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor; @@ -41,8 +41,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.RANK; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode.RankingType.RANK; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode.RankingType.ROW_NUMBER; final class Util { private Util() {} 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 c0f4bb005d236..5d4248d747089 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 @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; @@ -58,8 +58,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.TABLE_TIME_COLUMN_NAME; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.COUNT; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.TABLE_TIME_COLUMN_NAME; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST_BY; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator.DATE_BIN_PREFIX; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java index 10c8f5701eabf..638bdff1e94cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTreeDeviceViewScanNode.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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/planner/node/AlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java index dc8393409d982..25d0637ea4b0c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AlignedAggregationTreeDeviceViewScanNode.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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/planner/node/ChildReplacer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ChildReplacer.java index 1583fa0958df2..6e7ca275ea2ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ChildReplacer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ChildReplacer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java index ea64c6f359c92..05e6f26cc9b43 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CopyToNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.header.DatasetHeader; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; 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/relational/planner/node/CteScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java index 2a060e18f7877..aed06ed625558 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/CteScanNode.java @@ -22,13 +22,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; 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/relational/planner/node/DeviceTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java index 0e930a27f6ae1..3a522c8af61ce 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.AlignedDeviceEntry; 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/planner/node/ExchangeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java index c1df95e7737b5..a762542e56bf5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExchangeNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; 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/relational/planner/node/ExplainAnalyzeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java index 680448b5d8d4c..e98670c696541 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ExplainAnalyzeNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import java.io.DataOutputStream; 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 index cb3cb1bb91ecb..171fb3c67145b 100644 --- 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 @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; 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/planner/node/IntoNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java index 9277b454716e3..2d70b9311376e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/IntoNode.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Insert; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java index 52176313d091e..4b21ed5e09b4e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/NonAlignedAggregationTreeDeviceViewScanNode.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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/planner/node/Patterns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java index aaeda594eaccd..1a20259a7e583 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/Patterns.java @@ -19,40 +19,40 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern; -import org.apache.iotdb.calc_commons.plan.relational.utils.matching.Property; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.calc.plan.relational.utils.matching.Pattern; +import org.apache.iotdb.calc.plan.relational.utils.matching.Property; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; import java.util.List; @@ -60,9 +60,9 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.Iterables.getOnlyElement; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Pattern.typeOf; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Property.optionalProperty; -import static org.apache.iotdb.calc_commons.plan.relational.utils.matching.Property.property; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Pattern.typeOf; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Property.optionalProperty; +import static org.apache.iotdb.calc.plan.relational.utils.matching.Property.property; public final class Patterns { private Patterns() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java index 1a9449e1f5702..3a148dd8d1159 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableDiskUsageInformationSchemaTableScanNode.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName; import org.apache.tsfile.utils.ReadWriteIOUtils; 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 64efb49f02aa0..79ed9dd09f765 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 @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java index 62b7bd035c668..6fa6e051fd1de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeAlignedDeviceViewScanNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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/planner/node/TreeDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java index 41e5e49bb8c5f..bd3b83eb230c6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeDeviceViewScanNode.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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/planner/node/TreeNonAlignedDeviceViewScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java index dcb6af2268f7d..25f355e2b759a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TreeNonAlignedDeviceViewScanNode.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry; 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/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 4483590932274..2c1830e5637ce 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,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; 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/AbstractTableDevicesDeletionNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java index aabb9b6b744c7..b96e301b287f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDevicesDeletionNode.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java index aafbde2256034..8deecce928c12 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableSchemaQueryAttributeSecurityVisitor.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.commons.consensus.ConsensusGroupId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; 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/ConstructTableDevicesBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java index 221af2ab124e4..f960d416be685 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/ConstructTableDevicesBlackListNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java index 34c1ab79c0ea5..636d9d7dba53c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/CreateOrUpdateTableDeviceNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java index 25133b74cc9b9..a828826130322 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDeviceNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java index 04f6ac093850b..1778b41ceb844 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/DeleteTableDevicesInBlackListNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java index 3ee3225a85d53..029bcb6f8db28 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/RollbackTableDevicesBlackListNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanVisitor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java index 1095116973619..964f379000c69 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableAttributeColumnDropNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java index dcfd77f5f206e..14ec0fbdfc65d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeCommitUpdateNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; 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 88fb2172b593e..d0d6e6a437c9c 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,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis; 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 4483a6f3200fd..829610c1915a5 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,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; 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/TableDeviceQueryCountNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceQueryCountNode.java index be9bc37448d46..86fdba837ad33 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,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; 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/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 f698635cbe0b9..61a18d3f41ca2 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,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; 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/relational/planner/node/schema/TableNodeLocationAddNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java index 6c7972969bd6e..90b18ac5d675f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableNodeLocationAddNode.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegionPlan; import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegionPlanType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableSchemaQueryWriteVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableSchemaQueryWriteVisitor.java index f43abcc1efc7f..29e9b8d46139b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableSchemaQueryWriteVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableSchemaQueryWriteVisitor.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema; import org.apache.iotdb.commons.consensus.ConsensusGroupId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.executor.RegionExecutionResult; import org.apache.iotdb.db.queryengine.execution.executor.RegionWriteExecutor; 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/optimizations/AdaptivePlanOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/AdaptivePlanOptimizer.java index c8761c5df0d27..3ea2f7c9aad86 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/AdaptivePlanOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/AdaptivePlanOptimizer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import java.util.Set; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java index 879f1047f4544..76fecf5962f27 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/CheckSubqueryNodesAreRewritten.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; import java.util.List; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java index c54d8f5f29d57..03e2b5a575073 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/JoinUtils.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.EqualityInference; @@ -34,7 +34,7 @@ import java.util.Set; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor.extractUnique; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java index 8577d1a55bcd9..ccfe4735c963d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/ParallelizeGrouping.java @@ -19,21 +19,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java index f9dae0feb4e41..c09f04aa1da29 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanNodeDecorrelator.java @@ -20,21 +20,21 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeManager; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; @@ -60,9 +60,9 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableMap.toImmutableMap; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleGroupingSet; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleGroupingSet; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEvaluator.isDeterministic; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java index c2741293b617a..4613687d23af2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PlanOptimizer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; 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 666d7c1bddd9c..99a3aca6c5a2c 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 @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.iotdb.db.queryengine.common.QueryId; 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/relational/planner/optimizations/PushLimitOffsetIntoTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushLimitOffsetIntoTableScan.java index bb30a3e7d34f6..fcb2f77ec45b0 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 @@ -19,24 +19,24 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; 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/relational/planner/optimizations/PushPredicateIntoTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushPredicateIntoTableScan.java index 3f414f7062399..5827993a062e7 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 @@ -21,32 +21,32 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -103,16 +103,16 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableMap.toImmutableMap; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.calc_commons.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.extractGlobalTimeFilter; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.FULL; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.LEFT; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.RIGHT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.calc.plan.relational.planner.ir.GlobalTimePredicateExtractVisitor.extractGlobalTimeFilter; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder.DESC_NULLS_LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.FULL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.LEFT; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.RIGHT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.STATE_TABLE_MODEL; import static org.apache.iotdb.commons.schema.table.InformationSchema.CURRENT_QUERIES; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ATTRIBUTE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java index 077b5187048e4..c8c9efa874a4b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/QueryCardinalityUtil.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ExchangeNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; 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 3f4f8d2b459c7..8df10d5d8ec1d 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 @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java index fd0fcbc6db0f6..49c79a502db51 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SymbolMapper.java @@ -19,30 +19,30 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.AggregationValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ClassifierValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.MatchNumberValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.Measure; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.AggregationValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ClassifierValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.MatchNumberValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ScalarValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; @@ -61,7 +61,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.groupingSets; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.groupingSets; public class SymbolMapper { private final Function mappingFunction; 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 ca8ab96f47d8f..7d5e7c7e4b128 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 @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValueFillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java index 283b9de62e6f4..299cc72c9e659 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformQuantifiedComparisonApplyToCorrelatedJoin.java @@ -19,24 +19,24 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.SimplePlanRewriter; @@ -56,18 +56,18 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.globalAggregation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.singleAggregation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode.Quantifier.ALL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.NOT_EQUAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureTranslator.toSqlType; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.globalAggregation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.singleAggregation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode.Quantifier.ALL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.FALSE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.NOT_EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureTranslator.toSqlType; import static org.apache.iotdb.db.queryengine.plan.relational.planner.SimplePlanRewriter.rewriteWith; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.combineConjuncts; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; 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 7c8782d697814..4b4866aa1faab 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 @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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/relational/planner/optimizations/UnaliasSymbolReferences.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/UnaliasSymbolReferences.java index a30b59d26c3b1..6dda2d17503d0 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 @@ -19,44 +19,44 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.NodeAndMappings; @@ -92,7 +92,7 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableMap.toImmutableMap; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper.symbolMapper; import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.SymbolMapper.symbolReallocator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java index b8719f3c2ce1e..4a78b753fbf1b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/Util.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations; -import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; -import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionId; +import org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionKind; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.FunctionNullability; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; @@ -44,10 +44,10 @@ import java.util.Optional; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; public class Util { private Util() {} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java index 108fd2cddc8f9..9679b52967b05 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/rowpattern/rowpattern/RowPatternToIrRewriter.java @@ -19,31 +19,31 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.rowpattern.rowpattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAlternation; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAnchor; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrConcatenation; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrEmpty; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrExclusion; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrPermutation; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantified; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AnchorPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.EmptyPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OneOrMoreQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternAlternation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternConcatenation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternPermutation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternVariable; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ZeroOrMoreQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ZeroOrOneQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrAlternation; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrAnchor; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrAnchor.Type; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrConcatenation; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrEmpty; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrExclusion; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrPermutation; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrQuantified; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AnchorPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.EmptyPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExcludedPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OneOrMoreQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternAlternation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternConcatenation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternPermutation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternVariable; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ZeroOrMoreQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ZeroOrOneQuantifier; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis.Range; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; @@ -52,10 +52,10 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.oneOrMore; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.range; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrMore; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrQuantifier.oneOrMore; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrQuantifier.range; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrQuantifier.zeroOrMore; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; public class RowPatternToIrRewriter implements AstVisitor { private final Analysis analysis; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java index f596cd145b54d..b76655394c1b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ParameterExtractor.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DefaultTraversalVisitor; import com.google.common.collect.ImmutableMap; 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 e3acbcbb4fe33..8c3d46b2cca41 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.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; 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 4c778f5040383..8933a14894128 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,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.table.TsTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java index 8520384a05526..872523dcc721c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AddColumn.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java index 7c3c2fe6e415e..5d0a9aa6bc647 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterColumnDataType.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java index 798ffbe27d973..fc4e3b4407454 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterDB.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java index 3fd9e9e1eb2ac..089e9dcbe877f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AlterPipe.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java index 4f2bccebb16ee..915d1c5c1f2b6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AsofJoinOn.java @@ -20,15 +20,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinCriteria; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinOn; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -39,7 +39,7 @@ import java.util.Objects; import static com.google.common.base.MoreObjects.toStringHelper; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; import static org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils.and; public class AsofJoinOn extends JoinOn { 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 43b8af86a47d4..2e236e116e85f 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 @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; public interface AstVisitor extends CommonQueryAstVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java index 407e6611eae9d..844d2eaaa7be8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ClearCache.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.commons.schema.cache.CacheClearOptions; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java index 38cc565494286..6f069be40c850 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java index 1a099b5cb7544..49ff997998cb3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CopyTo.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.execution.operator.process.copyto.CopyToOptions; import com.google.common.collect.ImmutableList; 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 6d3057897d001..b8800a31f4da9 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,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; 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/CountStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java index bb7c67509ade8..91385b788d59d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountStatement.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java index ac76e9e085d30..27ac04014ff7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateDB.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java index 3e2958a070ddd..2172c8a8dae7f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateExternalService.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java index 7f7fa15d1d7e8..74e621d2668da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateFunction.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java index 5b52e3fed6b3d..ae6dc7c22ae77 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateIndex.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java index de5552db5a920..c9c75cdcc6a4b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateModel.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java index 2f626119b6113..cef2ba0e01029 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateOrUpdateDevice.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java index 1ae464159d6ee..909a8647524de 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipe.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java index 10d21281b6cf6..4302dca37de6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreatePipePlugin.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java index 3950ced20355e..7b81c8f93abf5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTable.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java index 09b59f17236c6..b7518a29abf45 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTopic.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java index 8396dac07c9eb..e6837b5cb8cb6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateTraining.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java index 20116df630331..a0c2cc94fdf61 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CreateView.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java index 1f54404d772f5..950ee060aa721 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DatabaseStatement.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.plan.statement.metadata.DatabaseSchemaStatement; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java index 2d08a3a7baee1..8868fb4dcdcfe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Deallocate.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java index a440f94dd3c89..eeca56aab54a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultExpressionTraversalVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; /** When walking Expressions, don't traverse into SubqueryExpressions */ public abstract class DefaultExpressionTraversalVisitor extends DefaultTraversalVisitor { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java index c558b023f3798..43cee9d88e723 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DefaultTraversalVisitor.java @@ -19,65 +19,65 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingElement; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinOn; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Limit; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternAlternation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternConcatenation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternPermutation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternVariable; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Select; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SelectItem; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SetOperation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleGroupBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Values; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.With; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExcludedPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Fill; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupingSets; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Limit; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternAlternation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternConcatenation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternPermutation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternVariable; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Select; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SetOperation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Values; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.With; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WithQuery; public abstract class DefaultTraversalVisitor implements AstVisitor { @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java index 3157d0e5efe19..8ad2045fab0a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Delete.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.db.storageengine.dataregion.modification.TableDeletionEntry; import com.google.common.collect.ImmutableList; 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 8ac8d0a045095..5ec7102c51501 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 @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.calc_commons.execution.relational.ColumnTransformerBuilder; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.calc.execution.relational.ColumnTransformerBuilder; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.table.TsTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java index 23ac9a6cff21f..07276e0615759 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DescribeTable.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java index fb2b76a949d00..4bd8c3aa7b544 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java index 38f14015f47dc..f7d45ae3123c9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropDB.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java index 2a6de41b6dcb0..e4906c60a1521 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropExternalService.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java index 36fd77c379299..09b198cfd7663 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropFunction.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java index 75d65caaf6ad3..7b3772d80247a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropIndex.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java index b9c2c5ebd6cf7..e716bb745b5cc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropModel.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java index 7df8713e5f502..030465ccdc0a4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipe.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java index b722366e01f76..b2d61dde6f75d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropPipePlugin.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java index 5162c5da43193..92f5427822bef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropSubscription.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java index bebde368e2503..8f182d3bbc68d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTable.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java index 102cec58a0d74..f4b9f954a7c5e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropTopic.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java index 7c84c56dfd591..87cc96ac4fdd6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Execute.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java index 3dd04e382a285..5b6494407200e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExecuteImmediate.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java index a2baf0d3597f6..0e98aabfd1273 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Explain.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java index f131bc0b6c1c3..1c158a1b279bf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExplainAnalyze.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java index 0c0918d1c7491..e43c4bee39cc1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ExtendRegion.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java index 539b337c5fa29..66c84f5a297b2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/FetchDevice.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Flush.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Flush.java index 7fc9cd9d747f5..9438700a46d0b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Flush.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Flush.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java index 560430af3d030..fb42445e6d8a5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Insert.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java index 5247e7bbf7cc8..b5440ba1d8c4c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaValidator; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java index 06a5c226ccdc4..0e53064e95282 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java index fb804d118e447..f77bd3aa143d7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaValidator; import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; 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 index 413e7b60be2a2..653a41a72360e 100644 --- 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 @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadConfiguration.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadConfiguration.java index ca83423ba6d9e..298adfb570b47 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadConfiguration.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadConfiguration.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java index 98aaa0b020b7b..d6f8b1f0f2e39 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadModel.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java index 96682ad536fea..03de9a9ccb10d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.db.storageengine.load.config.LoadTsFileConfigurator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java index d6dbc684ff0ea..3a305c961360d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/MigrateRegion.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java index b8fecb3347e93..ba4dcbd6aaeae 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeEnriched.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java index 3acf1dacbfc33..74737f28ece35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/PipeStatement.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java index 9e4271c8f5c67..0a40033aa8663 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Prepare.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java index 2aa4ed602d259..bb4f4ae7a202c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Property.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java index 6778de6688844..3ac17c5f15c35 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ReconstructRegion.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java index df38cb91b7ff5..9bd192c29e486 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RelationalAuthorStatement.java @@ -20,10 +20,10 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.auth.entity.PrivilegeType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.commons.schema.table.Audit; import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.commons.utils.AuthUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java index 43383e0c9ee2d..1d9213b47019f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveAINode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java index 5b03ebbb205fc..7113ce52540d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveConfigNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java index 4d6375d1f8d30..906dd4d4227b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveDataNode.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java index 3fd7daf3f98f4..703c3174eb5a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RemoveRegion.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java index d84783a660d22..8f7d3f7ca76e6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameColumn.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java index 1dab7aa03f665..5ee6cad4ab381 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/RenameTable.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java index ba93792710c2c..90c82f0a541d0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetColumnComment.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetConfiguration.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetConfiguration.java index 40f6976763fcb..2ff07a3b6bb12 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetConfiguration.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetConfiguration.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java index 86b161c0ce545..d8f7e83ad37f4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetProperties.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java index 0effa50df99b2..95475c2c2b2dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSqlDialect.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSystemStatus.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSystemStatus.java index e1e8b6407f4ea..0a74765c275b8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSystemStatus.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetSystemStatus.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java index c4674461ed6bd..b1dd078f708f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SetTableComment.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java index 2d3f88e656b7c..58e6847e29332 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAIDevices.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java index 645a61474db13..c681dbdc2b8ee 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAINodes.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java index eb4dfb4b1b6b3..f41e2982e8a54 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowAvailableUrls.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java index 536df270185dd..8b6628bb614b5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCluster.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java index e76acb4d3716b..ef744b5c0987a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowClusterId.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java index 49e7de6884b55..8985a998d81f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfigNodes.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfiguration.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfiguration.java index 0bf73de90f6ee..f4c00e2065418 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfiguration.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowConfiguration.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java index 52954606e7770..462ed02b34aff 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentDatabase.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java index b7aa74264762f..6e6653478b129 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentSqlDialect.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java index 4d0da9920b92a..b57b90b41b926 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentTimestamp.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java index 35b7c9c9801b8..028d9a541bb09 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowCurrentUser.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java index e068abdffba9d..5a141658ce22e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDB.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java index 5777bb63b82b4..26d791718d064 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDataNodes.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; 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 b065a9a521352..2a929cec5410b 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,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java index 4324b426b1015..4fb8700e22f67 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowExternalService.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OrderBy; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java index cd722b3d9f937..dd8d6510cff3a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowFunctions.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java index e2cda90a1b46d..0b013d4b38fdf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowIndex.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java index 5876ed8c462c5..b6185debfad70 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowLoadedModels.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java index e4ef2661f0747..0e757ac711591 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowModels.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java index a814b3d49a5b0..0745175206f00 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipePlugins.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java index 5ef5557950b6e..aef298b2b73cb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowPipes.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java index 14e8374cc6a14..aa34f2d85245d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowQueriesStatement.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OrderBy; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java index 0a87d8279a53a..cfdc1587ebed9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowRegions.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; 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 index d28e48155ae1d..ea2870c094c41 100644 --- 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 @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java index e89034af9a3ac..81af08652d984 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowSubscriptions.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java index f302fc5d78db2..1c9032d5b8300 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTables.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java index cde523f02d89d..8dd224f3fe396 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowTopics.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java index edea03087d243..ab0f4f6da5853 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVariables.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java index dcad874b70825..accc7ed0f8235 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowVersion.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java index 6808028dd5329..e1a7d2bca6161 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StackableAstVisitor.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; import java.util.LinkedList; import java.util.Optional; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java index b3f6370f61cfc..1b1c484b0aade 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartExternalService.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java index d934fb7109e26..4221b290a385c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartPipe.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartRepairData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartRepairData.java index 94dd44e1bc1f8..f6e0cb0b3770f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartRepairData.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StartRepairData.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java index 0834ebd66fc7a..85639375d492b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopExternalService.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java index ab4363e2bbe34..b911abd0155dc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopPipe.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopRepairData.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopRepairData.java index bd92329e97489..1dff2b3a1e971 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopRepairData.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/StopRepairData.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java index 81522fc7953ff..4ecd52267d753 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SubscriptionStatement.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java index 9409487f1d170..252cd7d0c4580 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/TimeRange.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java index a17ebf9d7183c..6540e906e2b6a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UnloadModel.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java index 889a6d1cf5aad..1509e5cd3c981 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Update.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java index ae8a9d86e5482..196af0df2851a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/UpdateAssignment.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java index 3c5547cdf3f1e..10e375f84ed8b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/Use.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AstMemoryEstimationHelper; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AstMemoryEstimationHelper; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java index a5142e9d0c85b..eecca1cd177ed 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ViewFieldDefinition.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import javax.annotation.Nullable; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java index 9d6d1f1b8f61e..f3151fbfe10fe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java index e649d0e1e7626..2e10766926efb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedStatement.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import java.util.Collections; 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 e83912c6a1edf..010a6fd4fdf33 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 @@ -19,129 +19,129 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; import org.apache.iotdb.commons.auth.entity.PrivilegeType; import org.apache.iotdb.commons.cluster.NodeStatus; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllRows; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AnchorPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Columns; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataTypeParameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.EmptyPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Except; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingElement; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Intersect; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinCriteria; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinOn; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinUsing; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Limit; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.MeasureDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NumericParameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OneOrMoreQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternAlternation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternConcatenation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternPermutation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternVariable; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ProcessingMode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QueryBody; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Select; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SelectItem; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleGroupBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubsetDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableExpressionType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionArgument; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionTableArgument; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TypeParameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Union; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Values; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.VariableDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Window; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowDefinition; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.With; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WithQuery; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ZeroOrMoreQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ZeroOrOneQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AllRows; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AnchorPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Columns; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataTypeParameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.EmptyPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Except; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExcludedPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Fill; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupingSets; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Intersect; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinUsing; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Limit; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.MeasureDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NaturalJoin; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OneOrMoreQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternAlternation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternConcatenation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternPermutation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternVariable; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ProcessingMode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Select; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SkipTo; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubsetDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableExpressionType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableFunctionArgument; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableFunctionInvocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Union; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Values; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.VariableDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Window; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.With; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ZeroOrMoreQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ZeroOrOneQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.schema.cache.CacheClearOptions; import org.apache.iotdb.commons.schema.table.InformationSchema; import org.apache.iotdb.commons.schema.table.TsTable; @@ -309,26 +309,26 @@ import static java.util.Locale.ENGLISH; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toList; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.APPROX_COUNT_DISTINCT; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.APPROX_MOST_FREQUENT; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.APPROX_PERCENTILE; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_END; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_START; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets.Type.CUBE; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets.Type.EXPLICIT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets.Type.ROLLUP; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_OMIT_EMPTY; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_SHOW_EMPTY; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_WITH_UNMATCHED; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ProcessingMode.Mode.FINAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ProcessingMode.Mode.RUNNING; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName.mapIdentifier; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.skipPastLastRow; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.skipToFirst; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.skipToLast; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.skipToNextRow; -import static org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils.currPrecision; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.APPROX_COUNT_DISTINCT; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.APPROX_MOST_FREQUENT; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.APPROX_PERCENTILE; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_END; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AnchorPattern.Type.PARTITION_START; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupingSets.Type.CUBE; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupingSets.Type.EXPLICIT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupingSets.Type.ROLLUP; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_OMIT_EMPTY; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_SHOW_EMPTY; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ALL_WITH_UNMATCHED; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternRecognitionRelation.RowsPerMatch.ONE; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ProcessingMode.Mode.FINAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ProcessingMode.Mode.RUNNING; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName.mapIdentifier; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SkipTo.skipPastLastRow; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SkipTo.skipToFirst; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SkipTo.skipToLast; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SkipTo.skipToNextRow; +import static org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils.currPrecision; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.DATA_NODE_ID_TABLE_MODEL; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ATTRIBUTE; import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ErrorHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ErrorHandler.java index ae9916808c9a0..07e8817964b10 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ErrorHandler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/ErrorHandler.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.parser.ParsingException; import com.google.common.collect.ImmutableSet; import org.antlr.v4.runtime.BaseErrorListener; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java index e1bb72273bf63..6f41536ba74e2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/SqlParser.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.parser; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.CaseInsensitiveStream; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.parser.CaseInsensitiveStream; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlBaseListener; 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 index 8fc363609ae45..ca7f60de5edb8 100644 --- 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 @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Select; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Select; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.StatementAnalyzerFactory; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; 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 index 5638c29addbcf..f5785879b1116 100644 --- 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 @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.analyzer.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.analyzer.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.StatementAnalyzerFactory; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java index 306a55baeaef7..76406fdc07112 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/AstUtil.java @@ -20,13 +20,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import com.google.common.graph.SuccessorsFunction; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java index d9811c2235a80..399c5a393fab4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/DataNodeSqlFormatter.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.util.CommonQuerySqlFormatter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.util.CommonQuerySqlFormatter; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AddColumn; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterDB; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AlterPipe; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java index 3a253275a047c..93cb99766de90 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/util/QueryUtil.java @@ -19,34 +19,34 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.util; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QueryBody; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Select; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SelectItem; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowDefinition; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Fill; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QueryBody; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Select; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SelectItem; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowDefinition; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeCoercion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeCoercion.java index 159932dfbc239..b838bed9555f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeCoercion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/type/TypeCoercion.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.type; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignature; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java index c73d307e9dc3b..042b8c9b4487f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/utils/NodeUtils.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.utils; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java index cdd441673c32d..7cc14210c8eb8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/ClusterScheduler.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.plan.scheduler; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc.metric.QueryExecutionMetricSet; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.IClientManager; @@ -42,7 +42,7 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; -import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.WAIT_FOR_DISPATCH; +import static org.apache.iotdb.calc.metric.QueryExecutionMetricSet.WAIT_FOR_DISPATCH; /** * QueryScheduler is used to dispatch the fragment instances of a query to target nodes. And it will diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java index 9ae5e74cb939b..5769513df571d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/FragmentInstanceDispatcherImpl.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.scheduler; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc.metric.QueryExecutionMetricSet; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSStatus; @@ -30,7 +30,7 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.ConsensusGroupId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; import org.apache.iotdb.commons.utils.RetryUtils; import org.apache.iotdb.consensus.exception.ConsensusGroupNotExistException; @@ -77,7 +77,7 @@ import java.util.stream.Collectors; import static com.google.common.util.concurrent.Futures.immediateFuture; -import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.DISPATCH_READ; +import static org.apache.iotdb.calc.metric.QueryExecutionMetricSet.DISPATCH_READ; public class FragmentInstanceDispatcherImpl implements IFragInstanceDispatcher { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java index a8100e64c11ae..3dcef495815a9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileDispatcherImpl.java @@ -31,8 +31,8 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.consensus.index.ProgressIndex; import org.apache.iotdb.commons.consensus.index.ProgressIndexType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.load.LoadFileException; import org.apache.iotdb.db.exception.mpp.FragmentInstanceDispatchException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/Statement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/Statement.java index 8916ee25c07c3..69d2887262d2c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/Statement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/Statement.java @@ -61,7 +61,7 @@ public boolean isQuery() { public abstract List getPaths(); - public org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement + public org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement toRelationalStatement(final MPPQueryContext context) { throw new UnsupportedOperationException("Method not implemented yet"); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillComponent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillComponent.java index 22e23db11dec0..b7f635ac24030 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillComponent.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/component/FillComponent.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.component; -import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.statement.StatementNode; import org.apache.iotdb.db.queryengine.plan.statement.literal.Literal; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java index 409ec033426ee..5c0153145cc2a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.statement.crud; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java index 877d6e23bd3f1..168f7c7ccc4a0 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.statement.crud; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java index ba72d6884cdb0..e4052e505607c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.statement.crud; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.PartialPath; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java index 88aec7bb9f44a..01f07a6c75403 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.statement.crud; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InsertRows; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java index 38384e5584ecc..b155b5b635e1a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java @@ -23,10 +23,10 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.view.LogicalViewSchema; import org.apache.iotdb.commons.utils.TimePartitionUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java index 7b467865c9c06..a9b7ca100d05b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java @@ -370,7 +370,7 @@ public List getPaths() { @TableModel @Override - public org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement + public org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement toRelationalStatement(MPPQueryContext context) { final Map loadAttributes = new HashMap<>(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java index 15652f027696b..7d47057d0bd01 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/QueryStatement.java @@ -55,7 +55,7 @@ import java.util.Map; import java.util.Set; -import static org.apache.iotdb.calc_commons.utils.constant.SqlConstant.COUNT_TIME; +import static org.apache.iotdb.calc.utils.constant.SqlConstant.COUNT_TIME; /** * Base class of SELECT statement. diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/pipe/PipeEnrichedStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/pipe/PipeEnrichedStatement.java index 8f49aaed59c9a..3298df0086e6f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/pipe/PipeEnrichedStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/pipe/PipeEnrichedStatement.java @@ -77,7 +77,7 @@ public List getPaths() { @TableModel @Override - public org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement + public org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement toRelationalStatement(final MPPQueryContext context) { final PipeEnriched pipeEnriched = new PipeEnriched(innerStatement.toRelationalStatement(context)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java index a6f5a38b5213d..d145ee571bc97 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/SetSqlDialectStatement.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.statement.sys; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; import org.apache.iotdb.db.queryengine.plan.analyze.QueryType; import org.apache.iotdb.db.queryengine.plan.statement.IConfigStatement; import org.apache.iotdb.db.queryengine.plan.statement.Statement; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java index 15e32ddfc2115..fcfe39cd1b37b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/udf/TreeUDFUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.udf; -import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.commons.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.udf.api.UDAF; import org.apache.iotdb.udf.api.UDTF; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java index 479cba04b70a5..02999d57b010f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/statistics/FragmentInstanceStatisticsDrawer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.statistics; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.planner.plan.FragmentInstance; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/api/LayerRowWindowReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/api/LayerRowWindowReader.java index d14c2b4255b80..4c369000152c4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/api/LayerRowWindowReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/api/LayerRowWindowReader.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.api; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.udf.api.access.RowWindow; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java index 7759ab2219021..dc595fd65203a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindow.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; -import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.calc.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindowIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindowIterator.java index 76652e8a4d8d0..9ee9ed4f7a4d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindowIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableRowRecordListBackedMultiColumnWindowIterator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; -import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.calc.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java index 9cb1d5bb28c04..6cfed15f75b99 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnRow.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; -import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.commons.udf.utils.UDFBinaryTransformer; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.access.Row; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java index 041c59647c54a..ce006e76fe8b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindow.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; -import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindowIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindowIterator.java index 08d5e3884dc67..b24d527ce0415 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindowIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/adapter/ElasticSerializableTVListBackedSingleColumnWindowIterator.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.adapter; -import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.udf.api.access.Row; import org.apache.iotdb.udf.api.access.RowIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java index aa27a2770798f..9e285c0d812fa 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/builder/EvaluationDAGBuilder.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.builder; -import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.common.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.visitor.IntermediateLayerVisitor; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java index 2c6d913c774c2..28d4f2b2b9f2d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/ConstantInputReader.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.input; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java index 68cdbb10c716a..15b7d76f06208 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/QueryDataSetInputLayer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.input; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; -import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.transformation.datastructure.iterator.RowListForwardIterator; +import org.apache.iotdb.calc.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.memory.SafetyLine; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/TsBlockInputDataSet.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/TsBlockInputDataSet.java index ae474ee5aaae9..7d61e2ccb11a8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/TsBlockInputDataSet.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/input/TsBlockInputDataSet.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.input; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java index 2569d4bd63672..1d6408de77aa1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/ConstantIntermediateLayer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java index fff60452e2952..13c73485ea801 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/IntermediateLayer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java index 4c28de3ca13ca..fc0bf8ba1ee0d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/MultiInputLayer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; -import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.transformation.datastructure.iterator.RowListForwardIterator; +import org.apache.iotdb.calc.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java index 36a2e00770a44..e272a1b99b946 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputMultiReferenceLayer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.calc.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java index a3af49e83331e..928a2e68b53b1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/intermediate/SingleInputSingleReferenceLayer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.intermediate; -import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.calc.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/SafetyLine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/SafetyLine.java index 2136e53ddc9b0..317b60dbf52ab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/SafetyLine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/memory/SafetyLine.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.memory; -import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc.transformation.datastructure.tv.ElasticSerializableTVList; /** Tells the {@link ElasticSerializableTVList} if it is safe to remove a cache block. */ public class SafetyLine { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/ArithmeticBinaryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/ArithmeticBinaryTransformer.java index 2d246b527b2ba..0be2013b06ff9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/ArithmeticBinaryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/ArithmeticBinaryTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/BinaryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/BinaryTransformer.java index dc1dab7f70664..d166504182730 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/BinaryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/BinaryTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareBinaryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareBinaryTransformer.java index 095c0e0144bd7..109e2f147f81a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareBinaryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareBinaryTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareEqualToTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareEqualToTransformer.java index 328944baa0f15..0aa60cb166fc8 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareEqualToTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareEqualToTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterEqualTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterEqualTransformer.java index aec22c21a2d95..4373ae6030fcc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterEqualTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterEqualTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterThanTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterThanTransformer.java index 95864a119235b..2ebbb5960da7b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterThanTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareGreaterThanTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessEqualTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessEqualTransformer.java index d8bb7bc5ccf7b..6c9492539db04 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessEqualTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessEqualTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessThanTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessThanTransformer.java index 01dfddce38d79..ef5f3d0a5e552 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessThanTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareLessThanTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareNonEqualTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareNonEqualTransformer.java index 5021cc49b4839..6e631e8da7483 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareNonEqualTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/binary/CompareNonEqualTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.binary; -import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java index 3234f7729eef4..1929a639359a3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/MappableUDFQueryRowTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.util.TypeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowTransformer.java index 1fda4ec853def..b8a235e2d9984 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.util.TypeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java index e900281f81369..8981595b4d567 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryRowWindowTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.db.queryengine.transformation.api.LayerRowWindowReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.util.TypeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java index 5376c0b52d6b4..d982ef86a8626 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UDFQueryTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; import org.apache.iotdb.db.queryengine.transformation.dag.util.TypeUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java index ab806a62c2f08..c9ab59bd57a7e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/multi/UniversalUDFQueryTransformer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.multi; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; -import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.calc.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/BetweenTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/BetweenTransformer.java index 1a44ce9500e82..bb43bd6646f62 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/BetweenTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/BetweenTransformer.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.ternary; -import org.apache.iotdb.calc_commons.transformation.dag.util.CommonTransformUtils; +import org.apache.iotdb.calc.transformation.dag.util.CommonTransformUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/CompareTernaryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/CompareTernaryTransformer.java index 948e8aa14729a..28b07c60365ca 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/CompareTernaryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/CompareTernaryTransformer.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.ternary; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/TernaryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/TernaryTransformer.java index f935fc0dfb857..c95e9118c27ac 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/TernaryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/ternary/TernaryTransformer.java @@ -21,7 +21,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.ternary; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/ArithmeticNegationTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/ArithmeticNegationTransformer.java index 5b5222f177fad..e2b4b8fac7b37 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/ArithmeticNegationTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/ArithmeticNegationTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/InTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/InTransformer.java index f8e77914deae5..b95cdd44461cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/InTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/InTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/IsNullTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/IsNullTransformer.java index fc4b241488abc..2c9310e480158 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/IsNullTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/IsNullTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LikeTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LikeTransformer.java index a0cb4da7e4774..9b34f58a0355a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LikeTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LikeTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LogicNotTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LogicNotTransformer.java index b1e3f51609839..eec6a290cf94f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LogicNotTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/LogicNotTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/RegularTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/RegularTransformer.java index 2e7151bc606ee..fad993a6def28 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/RegularTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/RegularTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/TransparentTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/TransparentTransformer.java index 5c10b93073a75..f359423343025 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/TransparentTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/TransparentTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/UnaryTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/UnaryTransformer.java index 22ab915fb27da..42e5ed47fd555 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/UnaryTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/UnaryTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.Transformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java index 557822e5d8df8..b7c6b0945e50a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/CastFunctionTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.transformation.dag.util.CastFunctionUtils; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.transformation.dag.util.CastFunctionUtils; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.UnaryTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/DiffFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/DiffFunctionTransformer.java index ffc9afb5cb01e..1dc16f6381195 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/DiffFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/DiffFunctionTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.UnaryTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/RoundFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/RoundFunctionTransformer.java index 4a3100f6d80e0..9fb43cd40c513 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/RoundFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/RoundFunctionTransformer.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.UnaryTransformer; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java index b3abb314cacbd..d6e8be4dc9abe 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionColumnTransformer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.transformer.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java index ae37aba9f3746..1bc5c1272c03f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/transformer/unary/scalar/SubStringFunctionTransformer.java @@ -30,7 +30,7 @@ import org.apache.tsfile.utils.BytesUtils; import org.apache.tsfile.write.UnSupportedDataTypeException; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.SubStringColumnTransformer.EMPTY_STRING; public class SubStringFunctionTransformer extends UnaryTransformer { private int beginPosition; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java index 56287c1754727..ce5a49f8bd254 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDAFInformationInferrer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; +import org.apache.iotdb.calc.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.commons.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.UDAF; import org.apache.iotdb.udf.api.customizer.config.UDAFConfigurations; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java index b17b89172c336..c9dd4bb0620a6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFContext.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; -import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDTFExecutor; +import org.apache.iotdb.calc.service.AbstractTemporaryQueryDataFileService; +import org.apache.iotdb.calc.transformation.dag.udf.UDTFExecutor; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java index bf03678ac8f5a..a20105b12abab 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/udf/UDTFInformationInferrer.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.udf; -import org.apache.iotdb.calc_commons.transformation.dag.udf.UDFParametersFactory; +import org.apache.iotdb.calc.transformation.dag.udf.UDFParametersFactory; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.commons.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.commons.udf.utils.UDFDataTypeTransformer; import org.apache.iotdb.udf.api.UDTF; import org.apache.iotdb.udf.api.customizer.config.UDTFConfigurations; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java index b918c384d320c..a42c906606d9d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/LayerCacheUtils.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; -import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; -import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.calc.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.iotdb.db.queryengine.transformation.api.LayerReader; import org.apache.iotdb.db.queryengine.transformation.api.YieldableState; import org.apache.iotdb.db.queryengine.transformation.dag.input.IUDFInputDataSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java index e823a999c40c4..6018a6c7181b9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TransformUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; import org.apache.iotdb.db.queryengine.transformation.datastructure.util.ValueRecorder; import org.apache.iotdb.db.utils.CommonUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TypeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TypeUtils.java index 42c1692ea278b..3042864f24360 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TypeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/util/TypeUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/update/GeneralRegionAttributeSecurityService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/update/GeneralRegionAttributeSecurityService.java index a6c4dfbf41e78..e564fc9ababcb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/update/GeneralRegionAttributeSecurityService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/update/GeneralRegionAttributeSecurityService.java @@ -29,7 +29,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.StartupException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.service.AbstractPeriodicalServiceWithAdvance; import org.apache.iotdb.commons.service.IService; import org.apache.iotdb.commons.service.ServiceType; 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 f96f213fe2e6d..c78d12091e248 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 @@ -19,21 +19,21 @@ package org.apache.iotdb.db.schemaengine.schemaregion.impl; -import org.apache.iotdb.calc_commons.execution.relational.ColumnTransformerBuilder; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.LeafColumnTransformer; +import org.apache.iotdb.calc.execution.relational.ColumnTransformerBuilder; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.LeafColumnTransformer; import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; 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.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.filter.SchemaFilterType; import org.apache.iotdb.commons.schema.node.role.IMeasurementMNode; @@ -156,7 +156,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.plan.planner.TableOperatorGenerator.makeLayout; +import static org.apache.iotdb.calc.plan.planner.TableOperatorGenerator.makeLayout; import static org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.TableDeviceSchemaFetcher.convertTagValuesToDeviceID; import static org.apache.tsfile.common.constant.TsFileConstant.PATH_SEPARATOR; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java index 6bafa18d9af18..dfc91575a5797 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanDeserializer.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.schemaengine.schemaregion.logfile.visitor; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.ConstructTableDevicesBlackListNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanSerializer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanSerializer.java index 2cc642492cc16..b7fb1f0a7214f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanSerializer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/logfile/visitor/SchemaRegionPlanSerializer.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.schemaengine.schemaregion.logfile.visitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.AlterEncodingCompressorNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.ConstructTableDevicesBlackListNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java index f61ffa863b257..da4790e104bde 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/read/resp/reader/impl/TimeseriesReaderWithViewFetch.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.schemaengine.schemaregion.read.resp.reader.impl; -import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.common.NodeRef; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.filter.SchemaFilterType; import org.apache.iotdb.commons.schema.tree.SchemaIterator; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java index 920f9faab9846..1f177864dd17b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.schemaengine.schemaregion.utils; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java index d69d8ef969bac..e782914b76cf6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/table/DataNodeTableCache.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.schemaengine.table; -import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils; import org.apache.iotdb.commons.schema.table.NonCommittableTsTable; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.TsTableInternalRPCUtil; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java index 3678cc95c01f5..5db478c6a097d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.service; -import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; +import org.apache.iotdb.calc.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.common.rpc.thrift.Model; import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation; import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType; @@ -44,9 +44,9 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.StartupException; -import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta; import org.apache.iotdb.commons.pipe.config.PipeConfig; +import org.apache.iotdb.commons.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.commons.service.JMXService; import org.apache.iotdb.commons.service.RegisterManager; import org.apache.iotdb.commons.service.ServiceType; @@ -147,7 +147,7 @@ import java.util.stream.Collectors; import static org.apache.iotdb.commons.conf.IoTDBConstant.DEFAULT_CLUSTER_NAME; -import static org.apache.iotdb.commons.node_commons.utils.DateTimeUtils.initTimestampPrecision; +import static org.apache.iotdb.commons.queryengine.utils.DateTimeUtils.initTimestampPrecision; import static org.apache.iotdb.commons.utils.StatusUtils.retrieveExitStatusCode; import static org.apache.iotdb.db.conf.IoTDBStartCheck.PROPERTIES_FILE_NAME; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java index 36987a31b5320..63a79bfb87ecc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNodeTemporaryQueryDataFileServiceProvider.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.service; -import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; -import org.apache.iotdb.calc_commons.service.ITemporaryQueryDataFileServiceProvider; +import org.apache.iotdb.calc.service.AbstractTemporaryQueryDataFileService; +import org.apache.iotdb.calc.service.ITemporaryQueryDataFileServiceProvider; public class DataNodeTemporaryQueryDataFileServiceProvider implements ITemporaryQueryDataFileServiceProvider { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java index 3cfde4985071e..8cc142926b2f7 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.service; -import org.apache.iotdb.calc_commons.service.AbstractTemporaryQueryDataFileService; +import org.apache.iotdb.calc.service.AbstractTemporaryQueryDataFileService; import org.apache.iotdb.db.conf.IoTDBDescriptor; import java.io.File; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java index 422e4210b55f7..2183d6ac8812b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.service.metrics; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc.metric.QueryExecutionMetricSet; import org.apache.iotdb.commons.client.ClientManagerMetrics; import org.apache.iotdb.commons.concurrent.ThreadModule; import org.apache.iotdb.commons.concurrent.ThreadName; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java index 85a2667045235..dd61d7ddee6a1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.service.metrics; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.client.IClientManager; @@ -27,7 +27,7 @@ import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil; import org.apache.iotdb.commons.consensus.ConfigRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema; import org.apache.iotdb.confignode.rpc.thrift.TGetDatabaseReq; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java index b686130f4d18e..d9f43f3f0a5d6 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.storageengine.dataregion; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils; -import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils; +import org.apache.iotdb.calc.utils.ObjectTypeUtils; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.cluster.NodeStatus; @@ -31,10 +31,10 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.table.Audit; import org.apache.iotdb.commons.schema.table.InformationSchema; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/IDataRegionForQuery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/IDataRegionForQuery.java index c90448359d16f..5b7205cb40edf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/IDataRegionForQuery.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/IDataRegionForQuery.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.storageengine.dataregion; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.common.DeviceContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/VirtualDataRegion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/VirtualDataRegion.java index fed8f0a73f9ec..dd7eb2bee11bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/VirtualDataRegion.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/VirtualDataRegion.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.storageengine.dataregion; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.db.queryengine.common.DeviceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java index 284e0f22b91f3..e564d23007c46 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.AlignedFullPath; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java index 155f911d2b7da..0f78e0717c3b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractWritableMemChunk.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; -import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/IMemTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/IMemTable.java index 9ad8a8be3195d..b988fc94185e4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/IMemTable.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/IMemTable.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.storageengine.dataregion.memtable; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/ReadOnlyMemChunk.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/ReadOnlyMemChunk.java index 5609f03825707..811a080c22f65 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/ReadOnlyMemChunk.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/ReadOnlyMemChunk.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java index b84b0814b7b58..d5c66afaae91d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.metric.QueryExecutionMetricSet; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; @@ -117,7 +117,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Function; -import static org.apache.iotdb.calc_commons.metric.QueryExecutionMetricSet.GET_QUERY_RESOURCE_FROM_MEM; +import static org.apache.iotdb.calc.metric.QueryExecutionMetricSet.GET_QUERY_RESOURCE_FROM_MEM; import static org.apache.iotdb.db.queryengine.metric.QueryResourceMetricSet.FLUSHING_MEMTABLE; import static org.apache.iotdb.db.queryengine.metric.QueryResourceMetricSet.WORKING_MEMTABLE; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TableDeletionEntry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TableDeletionEntry.java index 41e153d612074..952bcc2eaf6ec 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TableDeletionEntry.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TableDeletionEntry.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.modification; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.IDPredicateType; import org.apache.iotdb.db.utils.ModificationUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TreeDeletionEntry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TreeDeletionEntry.java index fb2b7d0fe8857..05436a6c9be94 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TreeDeletionEntry.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TreeDeletionEntry.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.storageengine.dataregion.modification; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.execution.MemoryEstimationHelper; 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.PathPatternUtil; +import org.apache.iotdb.commons.queryengine.execution.MemoryEstimationHelper; import org.apache.iotdb.commons.utils.PathUtils; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java index dc2fc4450a6cb..7c1e9d1263518 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskAlignedChunkLoader.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.read.reader.chunk; -import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.calc.utils.ObjectTypeUtils; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.metric.SeriesScanCostMetricSet; import org.apache.iotdb.db.storageengine.buffer.ChunkCache; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java index e0dbce340663a..7d259a9e50534 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/DiskChunkLoader.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.read.reader.chunk; -import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.calc.utils.ObjectTypeUtils; import org.apache.iotdb.db.exception.ChunkTypeInconsistentException; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; import org.apache.iotdb.db.queryengine.metric.SeriesScanCostMetricSet; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReader.java index 360d94099657d..26e86ccbb821d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/PriorityMergeReader.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.read.reader.common; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; import org.apache.tsfile.read.TimeValuePair; import org.apache.tsfile.read.reader.IPointReader; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/tableDiskUsageIndex/DataRegionTableSizeQueryContext.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/tableDiskUsageIndex/DataRegionTableSizeQueryContext.java index cb3f1b7bf8a1a..f1a3fd8b9bc7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/tableDiskUsageIndex/DataRegionTableSizeQueryContext.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/utils/tableDiskUsageIndex/DataRegionTableSizeQueryContext.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.utils.tableDiskUsageIndex; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileID; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileManager; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java index 08b7a62b338b6..4e1444a8f8136 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALEntry.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.buffer; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.ContinuousSameSearchIndexSeparatorNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java index 345ce224021dc..e9de32a1eb700 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNode.java @@ -21,7 +21,7 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.consensus.common.request.IndexedConsensusRequest; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java index e1941f79e112a..28dfafcbd414d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTableConvertedInsertTabletStatementExceptionVisitor.java @@ -22,7 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; import org.apache.iotdb.db.exception.load.LoadRuntimeOutOfMemoryException; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTsFileDataTypeConverter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTsFileDataTypeConverter.java index 5a9fe1083ad16..3aab4aac29009 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTsFileDataTypeConverter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTsFileDataTypeConverter.java @@ -21,7 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.protocol.session.IClientSession; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java index 00046f9b56e08..856b98019bad1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.tools; import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.tsfile.file.metadata.IDeviceID; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java index 71d46b2bcfce2..123bdaeec886b 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.tools; import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.tsfile.file.metadata.IDeviceID; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java index 3f427aaa61a3e..b3ff127079a83 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient; import org.apache.iotdb.commons.consensus.ConfigRegionId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.trigger.TriggerInformation; import org.apache.iotdb.commons.trigger.TriggerTable; import org.apache.iotdb.commons.trigger.exception.TriggerExecutionException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java index b9cc17cea50cb..bab65c1b94053 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.utils; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.service.metric.MetricService; import org.apache.iotdb.commons.service.metric.enums.Metric; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeAuthUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeAuthUtils.java index 3a5f83ca7cb8a..3ce69d08f74cf 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeAuthUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeAuthUtils.java @@ -26,8 +26,8 @@ import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; import org.apache.iotdb.commons.utils.AuthUtils; import org.apache.iotdb.commons.utils.CommonDateTimeUtils; import org.apache.iotdb.commons.utils.StatusUtils; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeDateTimeUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeDateTimeUtils.java index 22fc959db6041..fcee3bbf61d15 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeDateTimeUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeDateTimeUtils.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.utils; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java index 2fc37ebd65e7d..b852a039c3dbb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileService.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.utils; -import org.apache.iotdb.calc_commons.utils.IObjectFileService; -import org.apache.iotdb.calc_commons.utils.ObjectTypeUtils; +import org.apache.iotdb.calc.utils.IObjectFileService; +import org.apache.iotdb.calc.utils.ObjectTypeUtils; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.ObjectFileNotExist; import org.apache.iotdb.db.service.metrics.FileMetrics; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java index ae544151c0974..46243900fa30e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/DataNodeObjectFileServiceProvider.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.utils; -import org.apache.iotdb.calc_commons.utils.IObjectFileService; -import org.apache.iotdb.calc_commons.utils.IObjectFileServiceProvider; +import org.apache.iotdb.calc.utils.IObjectFileService; +import org.apache.iotdb.calc.utils.IObjectFileServiceProvider; public class DataNodeObjectFileServiceProvider implements IObjectFileServiceProvider { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java index d2dc98ba61954..369dafa3b06dd 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ErrorHandlingUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.utils; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IoTDBException; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java index 707c935abfb22..b96df4aa957bc 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.utils; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java index aed1f2c2b2c51..d2a096eb3e902 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.utils; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/MemoryReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/MemoryReader.java index d303e4065c4c0..7daad8d46e416 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/MemoryReader.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/cte/MemoryReader.java @@ -22,7 +22,7 @@ package org.apache.iotdb.db.utils.cte; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; +import org.apache.iotdb.commons.queryengine.utils.cte.CteDataStore; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner; diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.calc_commons.service.ITemporaryQueryDataFileServiceProvider b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.calc.service.ITemporaryQueryDataFileServiceProvider similarity index 100% rename from iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.calc_commons.service.ITemporaryQueryDataFileServiceProvider rename to iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.calc.service.ITemporaryQueryDataFileServiceProvider diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.calc_commons.utils.IObjectFileServiceProvider b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.calc.utils.IObjectFileServiceProvider similarity index 100% rename from iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.calc_commons.utils.IObjectFileServiceProvider rename to iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.calc.utils.IObjectFileServiceProvider diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanNodeDeserializerProvider similarity index 100% rename from iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanNodeDeserializerProvider rename to iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanNodeDeserializerProvider diff --git a/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider b/iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.commons.queryengine.plan.relational.function.ITableFunctionAINodeServiceProvider similarity index 100% rename from iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider rename to iotdb-core/datanode/src/main/resources/META-INF/services/org.apache.iotdb.commons.queryengine.plan.relational.function.ITableFunctionAINodeServiceProvider diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachineTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachineTest.java index 8dc047118108b..c2ccb56fa7237 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachineTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/consensus/statemachine/dataregion/DataRegionStateMachineTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.consensus.statemachine.dataregion; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; 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 c6b455b23162f..6cc0fe06aeedf 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.metadata.schemaRegion; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.filter.impl.singlechild.TagFilter; import org.apache.iotdb.commons.schema.filter.impl.values.InFilter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionTestUtil.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionTestUtil.java index 430e0f273f3b4..f83a8214dcd81 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionTestUtil.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionTestUtil.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.metadata.schemaRegion; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; 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.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.filter.SchemaFilter; import org.apache.iotdb.commons.schema.filter.SchemaFilterFactory; import org.apache.iotdb.commons.schema.filter.impl.DeviceFilterUtil; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionRecoverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionRecoverTest.java index 6e2846b229d2d..bcdc84a1fd02c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionRecoverTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionRecoverTest.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.consensus.index.impl.RecoverProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.SimpleProgressIndex; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResourceManager; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionResourceTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionResourceTest.java index ac468677a515c..8eb43cab0771a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionResourceTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/consensus/DeletionResourceTest.java @@ -22,13 +22,13 @@ import org.apache.iotdb.commons.consensus.index.impl.RecoverProgressIndex; import org.apache.iotdb.commons.consensus.index.impl.SimpleProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.pipe.agent.task.progress.CommitterKey; import org.apache.iotdb.commons.pipe.agent.task.progress.PipeEventCommitManager; import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant; import org.apache.iotdb.commons.pipe.config.plugin.configuraion.PipeTaskRuntimeConfiguration; import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskSourceRuntimeEnvironment; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.pipe.consensus.deletion.DeletionResource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java index 0536d56df3e2b..62549756d8c70 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/PipeTabletInsertionEventTest.java @@ -21,11 +21,11 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.PrefixTreePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/sink/PipeDataNodeThriftRequestTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/sink/PipeDataNodeThriftRequestTest.java index 6ee1860eefcbb..1246ec9049c5b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/sink/PipeDataNodeThriftRequestTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/sink/PipeDataNodeThriftRequestTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.pipe.sink; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.sink.payload.thrift.response.PipeTransferFilePieceResp; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.db.pipe.processor.twostage.exchange.payload.CombineRequest; import org.apache.iotdb.db.pipe.processor.twostage.state.CountState; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java index 659578abc2f4e..0a7fbfb699dc9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTablePatternParseVisitorTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.pipe.source; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.pattern.TablePattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.source.schemaregion.IoTDBSchemaRegionSource; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.CreateOrUpdateTableDeviceNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTreePatternParseVisitorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTreePatternParseVisitorTest.java index c7ee8bd66dfd9..ea071c3dcaff4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTreePatternParseVisitorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipePlanTreePatternParseVisitorTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.pipe.source; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePattern; import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePatternOperations; import org.apache.iotdb.commons.pipe.datastructure.pattern.UnionIoTDBTreePattern; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; import org.apache.iotdb.db.pipe.source.schemaregion.IoTDBSchemaRegionSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipeRealtimeExtractTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipeRealtimeExtractTest.java index 14b8f0acb6c16..d3adbf9aaadeb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipeRealtimeExtractTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/PipeRealtimeExtractTest.java @@ -21,12 +21,12 @@ import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta; import org.apache.iotdb.commons.pipe.config.constant.PipeSourceConstant; import org.apache.iotdb.commons.pipe.config.plugin.configuraion.PipeTaskRuntimeConfiguration; import org.apache.iotdb.commons.pipe.config.plugin.env.PipeTaskSourceRuntimeEnvironment; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.pipe.source.dataregion.realtime.PipeRealtimeDataRegionHybridSource; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/SchemaRegionListeningQueueTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/SchemaRegionListeningQueueTest.java index 5fc7fcd53c6e0..a33f469f8c75f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/SchemaRegionListeningQueueTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/SchemaRegionListeningQueueTest.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.auth.AuthException; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.pipe.datastructure.queue.ConcurrentIterableLinkedQueue; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.pipe.agent.PipeDataNodeAgent; import org.apache.iotdb.db.pipe.event.common.schema.PipeSchemaRegionWritePlanEvent; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java index 1eb171d4f2315..816fb4ebff456 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.qp.sql; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.queryengine.plan.parser.ASTVisitor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java index 8940c79f6e17b..9ead23ccbdf53 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/common/schematree/NodeRefTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.common.schematree; -import org.apache.iotdb.commons.node_commons.common.NodeRef; +import org.apache.iotdb.commons.queryengine.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.ConstantOperand; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java index b184e8225e8a0..2eda4063c3552 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java @@ -18,15 +18,15 @@ */ package org.apache.iotdb.db.queryengine.execution; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.execution.operator.process.LimitOperator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java index 0bfa7ebd31eb0..c81981eb1618d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/aggregation/AccumulatorTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.aggregation; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutorTest.java index d1b72b1c6d586..ac3215d7027b5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/executor/RegionWriteExecutorTest.java @@ -23,8 +23,8 @@ import org.apache.iotdb.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.consensus.IConsensus; import org.apache.iotdb.consensus.exception.ConsensusException; import org.apache.iotdb.db.protocol.thrift.impl.DataNodeRegionManager; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java index 63e9f0e01e45a..393884a519b34 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceExecutionTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.fragment; -import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java index c96fbea9e9240..0cbf2fef488e9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationMergeSortOperatorTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.process.AggregationMergeSortOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.ProcessOperator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.calc.execution.operator.process.AggregationMergeSortOperator; +import org.apache.iotdb.calc.execution.operator.process.ProcessOperator; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.aggregation.CountAccumulator; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java index 4425ac7dff0e0..a32d0883b4ebb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java index d46598d04450b..9a68324a9119c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesAggregationScanOperatorTest.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java index 19cae206ec287..573107fe2d320 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AlignedSeriesScanOperatorTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java index b77d335d9bdc1..7309e2e06adcb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/CteScanOperatorTest.java @@ -21,10 +21,10 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.utils.cte.CteDataStore; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.CteScanOperator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java index 05567e5172f28..9b470f71020d4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceIteratorScanOperatorTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java index e540076c94d81..7252d2341bd3e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewIntoOperatorTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java index c183448c9a331..c6cb77a614d19 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java index 47870f2d3badd..4b2a000c8592d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ExchangeOperatorTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.execution.operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java index 512f8327ce6b5..24a13ea0d7f3b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/FillOperatorTest.java @@ -18,14 +18,14 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.constant.DoubleConstantFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.FixedIntervalFillFilter; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.IntPreviousFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc.execution.operator.process.fill.constant.DoubleConstantFill; +import org.apache.iotdb.calc.execution.operator.process.fill.filter.FixedIntervalFillFilter; +import org.apache.iotdb.calc.execution.operator.process.fill.previous.IntPreviousFill; +import org.apache.iotdb.calc.execution.operator.process.fill.previous.IntPreviousFillWithTimeDuration; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java index a36c98f5efec3..135bb7ff83f9b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java index ca4c055587bba..ec01305db1fe2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryMergeOperatorTest.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java index 0b1b0b10ccdd5..9c6173e400334 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryTreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryTreeSortOperatorTest.java index 323658f88e408..c8e18ab6a4549 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryTreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryTreeSortOperatorTest.java @@ -20,9 +20,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java index c4114aa28ab0f..3f79efa0e5303 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java @@ -18,14 +18,14 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc.execution.operator.process.LimitOperator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; 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 f7cb393d4bfa4..b6cdefd419448 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 @@ -18,14 +18,14 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MultiColumnMergerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MultiColumnMergerTest.java index d604c7eb834c6..9dec387de9188 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MultiColumnMergerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MultiColumnMergerTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MultiColumnMerger; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java index 4c61f5634a28d..72fb2cba752b8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonAlignedTreeDeviceViewScanOperatorTreeTest.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc.execution.operator.process.OffsetOperator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.commons.schema.table.TreeViewSchema; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.FieldColumnSchema; @@ -86,7 +86,7 @@ import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.execution.operator.Operator.NOT_BLOCKED; +import static org.apache.iotdb.calc.execution.operator.Operator.NOT_BLOCKED; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonOverlappedMultiColumnMergerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonOverlappedMultiColumnMergerTest.java index 402e571087ea7..e6a9a8542dfaf 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonOverlappedMultiColumnMergerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/NonOverlappedMultiColumnMergerTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.NonOverlappedMultiColumnMerger; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java index 7ab147a9322b6..526577d61bb25 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java @@ -18,15 +18,15 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; +import org.apache.iotdb.calc.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc.execution.operator.process.OffsetOperator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java index 5cafb77e27a7d..350860e57ae4b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OperatorMemoryTest.java @@ -18,26 +18,26 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.FilterAndProjectOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.LimitOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.OffsetOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.IFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.LinearFill; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.ConstantColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.TimeColumnTransformer; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.FilterAndProjectOperator; +import org.apache.iotdb.calc.execution.operator.process.LimitOperator; +import org.apache.iotdb.calc.execution.operator.process.OffsetOperator; +import org.apache.iotdb.calc.execution.operator.process.fill.IFill; +import org.apache.iotdb.calc.execution.operator.process.fill.linear.LinearFill; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.ConstantColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.TimeColumnTransformer; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; 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.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java index d5fcd76803e9d..5f9485ac8b098 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.aggregation.Accumulator; +import org.apache.iotdb.calc.execution.aggregation.Accumulator; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java index fe1024d96ae80..edf22b93a4a11 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java @@ -22,8 +22,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java index f62939233efa7..92cb35f515af8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleColumnMergerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleColumnMergerTest.java index 8e3ab2fc1b0dc..aa546bf328ce3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleColumnMergerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleColumnMergerTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.SingleColumnMerger; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java index b0cc744c2bc73..cfe53f4e70862 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java @@ -20,9 +20,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java index 4df5d64f658f4..e66888ed62e83 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java @@ -23,9 +23,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java index ee3b6c4697355..fbe0acc894860 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorSortBranchTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.SortOperator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.SortOperator; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java index 164442743e8c6..d6684a4653d4f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.common.NodeRef; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.NodeRef; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java index cfc7998a4a764..690da2ffd1933 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeIntoOperatorTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java index 513184ce02d98..393a23dc2a707 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeLinearFillOperatorTest.java @@ -18,13 +18,13 @@ */ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.ILinearFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.identity.IdentityLinearFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.FloatLinearFill; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.linear.LinearFill; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.fill.ILinearFill; +import org.apache.iotdb.calc.execution.operator.process.fill.identity.IdentityLinearFill; +import org.apache.iotdb.calc.execution.operator.process.fill.linear.FloatLinearFill; +import org.apache.iotdb.calc.execution.operator.process.fill.linear.LinearFill; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java index 40c0d712888b4..bc2d6abe77fc8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeSortOperatorTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java index 0c0d148c530f9..e9960994ab59d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TreeTopKOperatorTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java index 50dbed2c57c62..c9688bbc2af39 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java index 93c6e15ab7436..92bd6b340850b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/ViewFromTreeAdaptorOperatorTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.path.AlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java index 469bbbcc9cf62..b316c530862a8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/TableStreamSortOperatorTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.TableStreamSortOperator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.TableStreamSortOperator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -55,7 +55,7 @@ import java.util.List; import java.util.concurrent.ExecutorService; -import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; +import static org.apache.iotdb.calc.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.utils.EnvironmentUtils.cleanDir; import static org.junit.Assert.assertEquals; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java index 3c16e58e8de8a..a7aa7e29bfc08 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/ValuesOperatorTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process; -import org.apache.iotdb.calc_commons.execution.operator.process.ValuesOperator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.process.ValuesOperator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalFillFilterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalFillFilterTest.java index 922066ef14d7e..295da4e720d00 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalFillFilterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/fill/filter/MonthIntervalFillFilterTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.fill.filter; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.MonthIntervalMSFillFilter; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.MonthIntervalNSFillFilter; -import org.apache.iotdb.calc_commons.execution.operator.process.fill.filter.MonthIntervalUSFillFilter; +import org.apache.iotdb.calc.execution.operator.process.fill.filter.MonthIntervalMSFillFilter; +import org.apache.iotdb.calc.execution.operator.process.fill.filter.MonthIntervalNSFillFilter; +import org.apache.iotdb.calc.execution.operator.process.fill.filter.MonthIntervalUSFillFilter; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java index 585d4bfc0a183..18880c56ff3a4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWMoOperatorTest.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWGroupWMoOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.calc.execution.operator.process.gapfill.GapFillWGroupWMoOperator; +import org.apache.iotdb.calc.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -54,7 +54,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; -import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; +import static org.apache.iotdb.calc.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java index a79b877ac25dd..a277443e48f0b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWGroupWoMoOperatorTest.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.calc.execution.operator.process.gapfill.GapFillWGroupWoMoOperator; +import org.apache.iotdb.calc.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -53,7 +53,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; -import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; +import static org.apache.iotdb.calc.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java index 6296ebe8bb33b..0947158ae200b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWMoOperatorTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.calc.execution.operator.process.gapfill.GapFillWoGroupWMoOperator; +import org.apache.iotdb.calc.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java index 024d27e5eacad..ebd32ff2e193c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/gapfill/GapFillWoGroupWoMoOperatorTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.gapfill; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.MergeSortOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.MergeSortOperator; +import org.apache.iotdb.calc.execution.operator.process.gapfill.GapFillWoGroupWoMoOperator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java index 6168a2da36fb9..b0630508eed31 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/InnerTimeJoinOperatorTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter.InputLocation; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java index a0a79fb3b7076..6964ca70b67f0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/join/LeftOuterTimeJoinOperatorTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.join; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.AscTimeComparator; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.DescTimeComparator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java index 488e97f63f1f7..8a75a9172d130 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/IrRowPatternOptimizationTest.java @@ -19,25 +19,25 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrPatternAlternationOptimizer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPatternFlattener; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrPatternAlternationOptimizer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrRowPatternFlattener; import org.junit.Assert; import org.junit.Test; import java.util.Optional; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.alternation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.concatenation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.empty; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.excluded; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.label; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.permutation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.plusQuantified; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.questionMarkQuantified; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.rangeQuantified; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.starQuantified; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.alternation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.concatenation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.empty; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.excluded; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.label; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.permutation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.plusQuantified; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.questionMarkQuantified; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.rangeQuantified; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.starQuantified; public class IrRowPatternOptimizationTest { @Test diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java index 35cecdbed1131..40037463ac44c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/MatcherTest.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternAggregator; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.PatternVariableRecognizer; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.ArrayView; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.IrRowPatternToProgramRewriter; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.MatchResult; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Matcher; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.matcher.Program; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PatternAggregator; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.PatternVariableRecognizer; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.ArrayView; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.IrRowPatternToProgramRewriter; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.MatchResult; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.Matcher; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.matcher.Program; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrRowPattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -38,15 +38,15 @@ import java.util.Map; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.alternation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.concatenation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.end; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.excluded; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.label; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.permutation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.questionMarkQuantified; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.starQuantified; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.start; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.alternation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.concatenation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.end; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.excluded; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.label; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.permutation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.questionMarkQuantified; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.starQuantified; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.start; import static org.mockito.Mockito.mock; public class MatcherTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternExpressionTest.java index c618082e97db3..7cbd302f7b963 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/rowpattern/PatternExpressionTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.rowpattern; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.ArithmeticOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.BinaryComputation; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.ComparisonOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.Computation; -import org.apache.iotdb.calc_commons.execution.operator.process.rowpattern.expression.ReferenceComputation; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.expression.ArithmeticOperator; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.expression.BinaryComputation; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.expression.ComparisonOperator; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.expression.Computation; +import org.apache.iotdb.calc.execution.operator.process.rowpattern.expression.ReferenceComputation; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java index 9b4af1ab0c52e..bcd17aa665c47 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/tvf/TableFunctionOperatorTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.tvf; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.function.PartitionRecognizer; -import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.PartitionState; -import org.apache.iotdb.calc_commons.execution.operator.process.function.partition.Slice; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.function.PartitionRecognizer; +import org.apache.iotdb.calc.execution.operator.process.function.partition.PartitionState; +import org.apache.iotdb.calc.execution.operator.process.function.partition.Slice; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; @@ -49,7 +49,7 @@ import java.util.List; import java.util.concurrent.ExecutorService; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java index 3bc374ebaaa8e..65398e9782ce0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/RowNumberOperatorTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.window.RowNumberOperator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.window.RowNumberOperator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java index 8fdad77ea74dc..221e351574382 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.window.TableWindowOperator; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.RankFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.window.TableWindowOperator; +import org.apache.iotdb.calc.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.rank.RankFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java index 40614fc36cb7b..9e4c23bd9c352 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TableWindowOperatorTestUtils.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.tsfile.block.column.ColumnBuilder; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java index 954c9dcf54bd0..d929f251c276f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/TopKRankingOperatorTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.window.TopKRankingOperator; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.window.TopKRankingOperator; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java index 1597b9ae1281c..9da867894fcd7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/FunctionTestUtils.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.WindowFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate.WindowAggregator; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.calc.execution.operator.process.window.function.WindowFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.aggregate.AggregationWindowFunction; +import org.apache.iotdb.calc.execution.operator.process.window.function.aggregate.WindowAggregator; +import org.apache.iotdb.calc.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AccumulatorFactory; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.TableAccumulator; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java index 0c24346eaa960..a7d2001028685 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/aggregate/AggregationWindowFunctionTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.aggregate; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.aggregate.AggregationWindowFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.process.window.function.aggregate.AggregationWindowFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java index 3c1fd6e8bcd99..49aca6ac4385d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/CumeDistFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.CumeDistFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.process.window.function.rank.CumeDistFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java index d66c532921fd3..8bc38643c85b2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/DenseRankFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.DenseRankFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.process.window.function.rank.DenseRankFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java index 70a732ac545d1..488a103aed08c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/NTileFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.NTileFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.process.window.function.rank.NTileFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java index bc14f89cb34fa..56aa1d0ed7b74 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/PercentRankFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.PercentRankFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.process.window.function.rank.PercentRankFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java index 7d8d49f8b0a2e..d0f9d773ba33a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RankFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.RankFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.process.window.function.rank.RankFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java index 6d854031833b1..81fdfa5883919 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/rank/RowNumberFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.rank; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.rank.RowNumberFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.process.window.function.rank.RowNumberFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java index de22779fe7e33..d064fd96020bd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/FirstValueFunctionTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.FirstValueFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.process.window.function.value.FirstValueFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java index 113f4f951bea1..6f5638d6c1689 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LagFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.LagFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.process.window.function.value.LagFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java index 25f8ce88171a0..1aa85d01d3725 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LastValueFunctionTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.LastValueFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.process.window.function.value.LastValueFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java index ff601dd05aac3..534128abafcf1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/LeadFunctionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.LeadFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.process.window.function.value.LeadFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java index d42b371892da5..e4b580a2f94be 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/function/value/NthValueFunctionTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.function.value; -import org.apache.iotdb.calc_commons.execution.operator.process.window.function.value.NthValueFunction; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.PartitionExecutor; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils; +import org.apache.iotdb.calc.execution.operator.process.window.function.value.NthValueFunction; +import org.apache.iotdb.calc.execution.operator.process.window.partition.PartitionExecutor; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc.plan.planner.CommonOperatorUtils; import org.apache.iotdb.db.queryengine.execution.operator.process.window.function.FunctionTestUtils; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameTestUtils.java index d1c7f05b7191e..e0a3e0bad411e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/FrameTestUtils.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.Partition; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.Frame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.GroupsFrame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.RangeFrame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.RowsFrame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.ColumnList; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.Range; -import org.apache.iotdb.calc_commons.execution.operator.process.window.utils.RowComparator; +import org.apache.iotdb.calc.execution.operator.process.window.partition.Partition; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.Frame; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.GroupsFrame; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.RangeFrame; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.RowsFrame; +import org.apache.iotdb.calc.execution.operator.process.window.utils.ColumnList; +import org.apache.iotdb.calc.execution.operator.process.window.utils.Range; +import org.apache.iotdb.calc.execution.operator.process.window.utils.RowComparator; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrameTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrameTest.java index 930c4b3138b9f..1cdb0398defea 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrameTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/GroupsFrameTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java index 8ad85f8f923c4..2ed979c50f364 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RangeFrameTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrameTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrameTest.java index 2726350fd42ad..47d436fc96e0f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrameTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/process/window/partition/frame/RowsFrameTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.execution.operator.process.window.partition.frame; -import org.apache.iotdb.calc_commons.execution.operator.process.window.partition.frame.FrameInfo; +import org.apache.iotdb.calc.execution.operator.process.window.partition.frame.FrameInfo; import org.apache.iotdb.db.queryengine.execution.operator.process.window.TableWindowOperatorTestUtils; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java index 36b3c4698d6a9..e8e6cc8e72607 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/CountGroupByLevelMergeOperatorTest.java @@ -20,8 +20,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java index 74743ab21ee11..b59689a8deb86 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaCountOperatorTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; 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 a1712cf0d30fb..7b30ffa84e446 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 @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java index af18ff82410df..4b124afb6dd03 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java @@ -22,9 +22,9 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java index 5dbab80a74eff..03c93dcf0ca6a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/SinkOperatorDownStreamNodeIdTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.execution.operator.sink; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java index 0ad771954db8b..b4f66dbdcd58d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperatorTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.source.relational; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext; import org.apache.iotdb.db.queryengine.execution.operator.source.relational.AbstractTableScanOperator.AbstractTableScanOperatorParameter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverSchedulerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverSchedulerTest.java index ee062eec9097e..69ec3415eeb0d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverSchedulerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/DriverSchedulerTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.queryengine.execution.schedule; -import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc.exception.MemoryNotEnoughException; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java index fced1af059a5b..76fd4303a0b74 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/expression/predicate/ConvertPredicateToTimeFilterTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.expression.predicate; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter; 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 5d190f9f3d883..2cc9b8faf7e64 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 @@ -22,8 +22,8 @@ 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.node_commons.common.SessionInfo; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java index 4d0025a3d276f..f5154b8277b98 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDownTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java index 6f93eac864234..aae4b28588902 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/ColumnInjectionPushDownTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationStep; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java index 8fd14751c0723..6fd1349401039 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/LimitOffsetPushDownTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.optimization; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java index 7731fd000e411..42f9614bb2a26 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/OptimizationTestUtil.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; 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.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java index c447d21c37fa0..d82cf6d906e76 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/PredicatePushDownTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.junit.Test; 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 7c2eb02aa4caf..849c5d577b4a6 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 @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.optimization; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; 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.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.ColumnInjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java index 7d1192275a21a..b98f34a2484d9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.parser; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.auth.entity.PrivilegeType; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterEqualExpression; import org.apache.iotdb.db.queryengine.plan.expression.binary.LessThanExpression; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java index cace11e6493f2..c022e7ef46eba 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/ExpressionTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner; -import org.apache.iotdb.commons.node_commons.common.NodeRef; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.NodeRef; import org.apache.iotdb.db.queryengine.plan.expression.Expression; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java index 3df13339a9433..b387baddff6b2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/FragmentInstanceSerdeTest.java @@ -25,12 +25,12 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.partition.QueryExecutor; import org.apache.iotdb.commons.partition.StorageExecutor; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java index a5b6e5211a23d..1fd7c42bc84fe 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/PipelineBuilderTest.java @@ -19,16 +19,16 @@ package org.apache.iotdb.db.queryengine.plan.planner; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; 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.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java index c6bd87aec1a9e..be8fe8599a4e3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationAlignByDeviceTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java index c0d8cc5a48e4c..8e33c451df00a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationDistributionTest.java @@ -22,10 +22,10 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java index 131417b0c41a9..9dc5ecce8639c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AggregationTableScanTest.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.FirstAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.FirstByAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.FirstByDescAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.FirstDescAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastByAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastByDescAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.LastDescAccumulator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.TableAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AccumulatorFactory; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.FirstAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.FirstByAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.FirstByDescAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.FirstDescAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.LastAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.LastByAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.LastByDescAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.LastDescAccumulator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.TableAccumulator; import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.enums.TSDataType; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByDeviceOrderByLimitOffsetTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByDeviceOrderByLimitOffsetTest.java index ab77f1d9f6de9..972c6d9bcce52 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByDeviceOrderByLimitOffsetTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByDeviceOrderByLimitOffsetTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByTimeOrderByLimitOffsetTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByTimeOrderByLimitOffsetTest.java index 5a053f353626f..4544d14623ca5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByTimeOrderByLimitOffsetTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignByTimeOrderByLimitOffsetTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java index 7a812832724e1..c8dacb16c4160 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/AlignedByDeviceTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java index 6b4fea340e7df..e1befebf0063f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerBasicTest.java @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerCycleTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerCycleTest.java index e47fc198a5612..d4a0eec11a6d7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerCycleTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/DistributionPlannerCycleTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java index 7e6733c51e8a2..85a15b161e4e7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/LastQueryTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NoDataRegionPlanningTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NoDataRegionPlanningTest.java index a3575667eaf03..acb82d8fe93d6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NoDataRegionPlanningTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/NoDataRegionPlanningTest.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.distribution; import org.apache.iotdb.common.rpc.thrift.TEndPoint; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/RegionScanPlanningTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/RegionScanPlanningTest.java index 6064e4bb90b3b..205758304e0ef 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/RegionScanPlanningTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/RegionScanPlanningTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java index f9e28c7644b13..e4d3a0c4ba9ca 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util.java @@ -27,7 +27,6 @@ import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.SchemaNodeManagementPartition; @@ -35,6 +34,7 @@ import org.apache.iotdb.commons.partition.executor.SeriesPartitionExecutor; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util2.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util2.java index aba865163a095..bb37c554eab79 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util2.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/Util2.java @@ -26,7 +26,6 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.SchemaNodeManagementPartition; @@ -34,6 +33,7 @@ import org.apache.iotdb.commons.partition.executor.SeriesPartitionExecutor; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.schema.template.Template; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; 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 0f52afa64aa1d..1e88743f2aba1 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 @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.logical; import org.apache.iotdb.common.rpc.thrift.TAggregationType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.expression.Expression; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java index a9fbac9ac0674..e9f37ab277bca 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/LogicalPlannerTestUtil.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.logical; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.auth.AuthorityChecker; import org.apache.iotdb.db.queryengine.common.DataNodeEndPoints; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java index 3c89e2e92ebf8..b7accedfd293d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/RegionScanLogicalPlannerTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.logical; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java index 8cfe0a1e8fdaf..e3448929a127f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.filter.SchemaFilterType; import org.apache.iotdb.commons.schema.filter.impl.PathContainsFilter; import org.apache.iotdb.commons.schema.filter.impl.TagFilter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanGraphPrinterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanGraphPrinterTest.java index 252b739afd073..446548a1724c1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanGraphPrinterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanGraphPrinterTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java index 16e97e31679ab..dedeffd52cbe5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/PlanNodeDeserializeHelper.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import java.nio.ByteBuffer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/load/LoadTsFileNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/load/LoadTsFileNodeTest.java index 06746fb40f110..e589810894610 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/load/LoadTsFileNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/load/LoadTsFileNodeTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.load; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadSingleTsFileNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.load.LoadTsFilePieceNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java index cc9c07aa5059f..552ea88b96371 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaFetchScanNodeTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.DeviceSchemaFetchScanNode; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java index bf5ca207292fd..8c65623b7eec2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/DeviceSchemaScanNodeSerdeTest.java @@ -20,8 +20,8 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/NodeManagementMemoryMergeNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/NodeManagementMemoryMergeNodeSerdeTest.java index 8df17ff99e6ef..c1e21577c9c30 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/NodeManagementMemoryMergeNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/NodeManagementMemoryMergeNodeSerdeTest.java @@ -22,8 +22,8 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TSchemaNode; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.commons.schema.node.MNodeType; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java index f6275ddf41096..4d8243457c71b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/PathsUsingTemplateScanNodeTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.PathsUsingTemplateScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaCountNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaCountNodeSerdeTest.java index aaf6af7cb5950..b5dca43728929 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaCountNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaCountNodeSerdeTest.java @@ -20,8 +20,8 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java index 5352f5ea6f597..0bcf6f21c913a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SchemaFetchMergeNodeTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SchemaFetchMergeNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SeriesSchemaFetchScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java index ecb79d3f3f95a..6a88ed2e7690c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/SeriesSchemaFetchScanNodeTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.metadata.read; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.SeriesSchemaFetchScanNode; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java index e44d7251b6b7a..343acdb36d15d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/read/TimeSeriesSchemaScanNodeSerdeTest.java @@ -20,8 +20,8 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.SchemaConstant; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java index d55b744f26080..3ac85f40b4208 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/metadata/write/MetadataWriteNodeSerDeTest.java @@ -20,12 +20,12 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.metadata.write; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; 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.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; import org.apache.iotdb.commons.schema.view.viewExpression.leaf.TimeSeriesViewOperand; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.ActivateTemplateNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java index 052d535ddbdbc..7c43657f2324d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedDeleteDataNodeSerdeTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedDeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java index 41c7d6bc72559..827621087d97f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedInsertNodeSerdeTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.pipe; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedInsertNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java index c78b1580a042f..1e7bd5c60e8c3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedNonWritePlanNodeSerdeTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.pipe; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.DeleteTimeSeriesNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedNonWritePlanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java index 74af30e1aad3c..f3cee4d781813 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/pipe/PipeEnrichedWritePlanNodeSerdeTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.pipe; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.write.InternalBatchActivateTemplateNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.pipe.PipeEnrichedWritePlanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java index 9bf3495bf3274..575b6475b4e10 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/AggregationNodeSerdeTest.java @@ -21,9 +21,9 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.AggregationNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/DeviceViewNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/DeviceViewNodeSerdeTest.java index 6f3659c6276ab..d80672c23f89c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/DeviceViewNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/DeviceViewNodeSerdeTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/ExchangeNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/ExchangeNodeSerdeTest.java index 8c501701500b7..9754d93a03514 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/ExchangeNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/ExchangeNodeSerdeTest.java @@ -20,7 +20,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java index 748838429f0d6..4d877bdd08b9d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FillNodeSerdeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.FillNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java index 538eb25a35654..ae08a21722a82 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/FilterNodeSerdeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; 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.leaf.ConstantOperand; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java index 2486e41b38784..d53d5da59e993 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByLevelNodeSerdeTest.java @@ -20,9 +20,9 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.GroupByLevelNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java index dc09501fadb7f..0bea8b23a708e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/GroupByTagNodeSerdeTest.java @@ -20,9 +20,9 @@ import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.expression.multi.FunctionExpression; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java index 5c19ddbb81440..c75e8cdd72dc8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/IntoNodeSerdeTest.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.DeviceViewIntoNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/LimitNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/LimitNodeSerdeTest.java index 3690100923894..ef83945ef2ced 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/LimitNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/LimitNodeSerdeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.LimitNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/OffsetNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/OffsetNodeSerdeTest.java index dd6a4e766f99e..12b1760a48a18 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/OffsetNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/OffsetNodeSerdeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.OffsetNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SingleDeviceViewNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SingleDeviceViewNodeSerdeTest.java index 6dbe8d1d89901..822ba52bc063b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SingleDeviceViewNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SingleDeviceViewNodeSerdeTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleDeviceViewNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SortNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SortNodeSerdeTest.java index 221c16714377e..447b86bf652b5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SortNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/SortNodeSerdeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SortNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java index 502c6e84b95fa..2f9bbbdfe8f26 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/TimeJoinNodeSerdeTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.FullOuterTimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.join.InnerTimeJoinNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java index 8593312483430..b8d1abe622db7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/process/WindowNodeSerdeTest.java @@ -20,21 +20,21 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.process; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; -import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.FunctionNullability; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionId; +import org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionKind; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.FunctionNullability; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/IdentitySinkNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/IdentitySinkNodeSerdeTest.java index e31a3668f5434..2bd61622f2322 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/IdentitySinkNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/IdentitySinkNodeSerdeTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/ShuffleSinkHandleNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/ShuffleSinkHandleNodeSerdeTest.java index 7a59853e698bd..8f1d111d0f22f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/ShuffleSinkHandleNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/sink/ShuffleSinkHandleNodeSerdeTest.java @@ -21,7 +21,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelLocation; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.ShuffleSinkNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java index f3de7cbacd379..f484eff1466f4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesAggregationScanNodeSerdeTest.java @@ -18,12 +18,12 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.node.source; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesAggregationScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java index f056bd88710a4..2f84e5a2f6b63 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SeriesScanNodeSerdeTest.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.queryengine.plan.planner.node.source; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java index 49bd523583027..7e617bed8a9b3 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/source/SourceNodeSerdeTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.LastQueryScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java index 27bed5fcc8509..c932aed474e7e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/ContinuousSameSearchIndexSeparatorNodeSerDeTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.write; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.ContinuousSameSearchIndexSeparatorNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALByteBufferForTest; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java index 8b4159aafff8a..16cb07f86c477 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/DeleteDataNodeSerdeTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java index f541ec6732b89..b71c6dea18aa0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertMultiTabletsNodeSerdeTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.write; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertMultiTabletsNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java index 3ce3d90ba3b74..dbe69da246221 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowNodeSerdeTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.write; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALByteBufferForTest; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java index af479d8ac39bd..08819830557ed 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.write; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java index f933e3514c92d..2cffd65e41e21 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsOfOneDeviceNodeSerdeTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.write; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsOfOneDeviceNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java index 85eb9acc8aa23..4d8f5f6e4a80f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.node.write; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java index a7851aa2d734c..3b8f972380962 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java @@ -28,11 +28,11 @@ import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.executor.SeriesPartitionExecutor; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.utils.TimePartitionUtils; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java index 817def4d4ac77..78b7a400283e5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalDeleteDataNodeTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.write; import org.apache.iotdb.commons.consensus.index.impl.IoTProgressIndex; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.storageengine.dataregion.modification.DeletionPredicate; import org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.And; import org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.FullExactMatch; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java index 10a9518ce06d2..424eb75118c79 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationCornerCaseTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.GroupedAggregator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.HashAggregationOperator; +import org.apache.iotdb.calc.execution.operator.source.relational.aggregation.grouped.StreamingHashAggregationOperator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -52,10 +52,10 @@ import java.util.List; import java.util.OptionalInt; -import static org.apache.iotdb.calc_commons.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; -import static org.apache.iotdb.calc_commons.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; +import static org.apache.iotdb.calc.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable; +import static org.apache.iotdb.calc.execution.operator.source.relational.aggregation.AccumulatorFactory.createGroupedAccumulator; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.EXTREME; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.FIRST; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.LAST; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java index 87a8c2d563cc0..9998ca76f4e14 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AggregationTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; @@ -35,13 +35,13 @@ import java.util.Optional; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; 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 dc1c1ab427c82..e862673537499 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 @@ -26,26 +26,26 @@ import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.partition.DataPartition; import org.apache.iotdb.commons.partition.DataPartitionQueryParam; import org.apache.iotdb.commons.partition.executor.SeriesPartitionExecutor; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java index b9cbfd7e2c72f..3a32053f06de1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofInnerJoinOperatorTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; -import org.apache.iotdb.calc_commons.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.join.merge.comparator.JoinKeyComparatorFactory; +import org.apache.iotdb.calc.execution.operator.source.relational.AsofMergeSortInnerJoinOperator; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.driver.DriverContext; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; @@ -43,7 +43,7 @@ import java.util.Collections; import java.util.concurrent.TimeUnit; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java index 980eed94f8112..40ba055604322 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AsofJoinTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; @@ -32,9 +32,9 @@ import com.google.common.collect.ImmutableSet; import org.junit.Test; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.assertAnalyzeSemanticException; 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.equiJoinClause; 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 e7d7c6c4a9572..2ba2dc93c6841 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 @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.exception.auth.AccessDeniedException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.execution.config.TableConfigTaskVisitor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/DistinctTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/DistinctTest.java index 31913900693b2..e1fa72c3dfa9f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/DistinctTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/DistinctTest.java @@ -30,7 +30,7 @@ import java.util.Optional; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java index d6bee8de53bd2..cda0113527b76 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import com.google.common.collect.ImmutableMap; import org.junit.BeforeClass; import org.junit.Test; -import static org.apache.iotdb.commons.node_commons.utils.DateTimeUtils.initTimestampPrecision; +import static org.apache.iotdb.commons.queryengine.utils.DateTimeUtils.initTimestampPrecision; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.assertAnalyzeSemanticException; 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.expression; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java index d4c585e880e5f..3dfd85ebbbdaa 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/InsertIntoQueryTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; 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 162a232e1f1ff..411ef3f6829b5 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 @@ -19,23 +19,23 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.calc_commons.execution.operator.Operator; -import org.apache.iotdb.calc_commons.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; +import org.apache.iotdb.calc.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.process.join.SimpleNestedLoopCrossJoinOperator; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -72,12 +72,12 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.calc_commons.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.calc.plan.planner.CommonOperatorUtils.TIME_COLUMN_TEMPLATE; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; import static org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext.createFragmentInstanceContext; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AnalyzerTest.analyzeSQL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.ALL_DEVICE_ENTRIES; 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 2fd2e16684595..470cd83e3d189 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 @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java index e876c52917e82..aa48336e68320 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/PushAggregationThroughUnionTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java index 7334704229b5d..b37c08de8e144 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/RowPatternRecognitionTest.java @@ -14,10 +14,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl; 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 683e163f987c4..40797da29a90f 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 @@ -19,15 +19,15 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; 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 82da0db14d2ef..56a377d227bf8 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 @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.DistributedQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java index 8f32e92f6b659..8035fc6bd725c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java @@ -19,22 +19,22 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnMetadata; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; -import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.commons.partition.DataPartition; 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.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnMetadata; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.queryengine.plan.udf.BuiltinAggregationFunction; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; @@ -66,9 +66,9 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isOneNumericType; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoNumericType; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isOneNumericType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isTwoNumericType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTSBSDataPartition.T1_DEVICE_1; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTSBSDataPartition.T1_DEVICE_2; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTSBSDataPartition.T1_DEVICE_3; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java index 504c287dee43a..f3b76a70ba401 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; @@ -38,15 +38,15 @@ import java.util.Optional; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.DIVIDE; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.DIVIDE; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.MULTIPLY; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; 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.aggregation; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java index f9683ac15219f..9ead3d187ac82 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.ForecastTableFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.ForecastTableFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; @@ -37,12 +37,12 @@ import java.util.Collections; import java.util.function.Consumer; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_INTERVAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_START_TIME; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.FIRST; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; +import static org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_INTERVAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.ForecastTableFunction.DEFAULT_OUTPUT_START_TIME; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.FIRST; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.AnalyzerTest.analyzeSQL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.QUERY_CONTEXT; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.TEST_MATADATA; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java index 8e9c5163312ee..b71395f15bf51 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMetadata.java @@ -20,28 +20,28 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.function.OperatorType; -import org.apache.iotdb.commons.node_commons.plan.relational.function.TableBuiltinTableFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic.SubtractionResolver; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnMetadata; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeManager; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; -import org.apache.iotdb.commons.node_commons.plan.udf.BuiltinAggregationFunction; -import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; import org.apache.iotdb.commons.partition.DataPartition; 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.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.function.OperatorType; +import org.apache.iotdb.commons.queryengine.plan.relational.function.TableBuiltinTableFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic.SubtractionResolver; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnMetadata; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeManager; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeNotFoundException; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.queryengine.plan.udf.BuiltinAggregationFunction; +import org.apache.iotdb.commons.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; @@ -83,9 +83,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isOneNumericType; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoNumericType; -import static org.apache.iotdb.calc_commons.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isOneNumericType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isTwoNumericType; +import static org.apache.iotdb.calc.plan.relational.metadata.CommonMetadataUtils.isTwoTypeComparable; import static org.apache.iotdb.commons.schema.table.InformationSchema.INFORMATION_DATABASE; 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; 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 fe67445cbd338..3243ea3311bc9 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 @@ -19,17 +19,17 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; 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.node.DeviceTableScanNode; 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 7add9179e519b..9ad78fbea89fa 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 @@ -20,14 +20,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.analyzer; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TreeViewTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TreeViewTest.java index 7cdf75860cb7d..959bd4b9d6abb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TreeViewTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TreeViewTest.java @@ -35,9 +35,9 @@ import java.util.Optional; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.INTERMEDIATE; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.PARTIAL; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata.DEVICE_VIEW_TEST_TABLE; import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata.TREE_VIEW_DB; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanAssert.assertPlan; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java index 8c24d60263ac9..ddcce852d1c22 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CorrelatedSubqueryTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; @@ -36,7 +36,7 @@ import java.util.Collections; import java.util.Optional; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.expression; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java index bbb75177bc2f0..97273efb6ec99 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteMaterializerTest.java @@ -23,10 +23,10 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -57,10 +57,10 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java index 30a19f6821381..2a8c3e4777dbb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/CteSubqueryTest.java @@ -23,9 +23,9 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IoTDBException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.commons.schema.column.ColumnHeader; import org.apache.iotdb.db.protocol.session.SessionManager; import org.apache.iotdb.db.queryengine.common.QueryId; @@ -53,7 +53,7 @@ import java.util.List; import java.util.Optional; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; 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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java index e0db086b8d396..d4013efb9302c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ExampleTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; @@ -35,12 +35,12 @@ import com.google.common.collect.ImmutableSet; import org.junit.Test; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression.Operator.AND; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression.Operator.ADD; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression.Operator.AND; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; 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.any; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.anyTree; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java index 7a72ebfb296cc..4651cb2720b38 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PatternRecognitionNodeSerdeTest.java @@ -20,25 +20,25 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.Measure; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SkipToPosition; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.LogicalIndexPointer; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ScalarValuePointer; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.Measure; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowsPerMatch; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SkipToPosition; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrRowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.LogicalIndexPointer; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ScalarValuePointer; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.iotdb.db.queryengine.plan.planner.node.PlanNodeDeserializeHelper; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SeriesScanNode; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; @@ -60,10 +60,10 @@ import java.util.Optional; import java.util.Set; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.concatenation; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.excluded; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.label; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.Patterns.starQuantified; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.concatenation; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.excluded; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.label; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.Patterns.starQuantified; import static org.junit.Assert.assertEquals; public class PatternRecognitionNodeSerdeTest { 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 351122c3bc756..46b393b8794ce 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 @@ -21,11 +21,11 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java index 951fa9e3a6ac4..51df25a68d08d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PredicateUtilsTest.java @@ -20,9 +20,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.common.QueryId; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java index f9dfe8e7bdc25..dd7883f26adbd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/UncorrelatedSubqueryTest.java @@ -19,12 +19,12 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor; @@ -39,12 +39,12 @@ import java.util.Collections; import java.util.Optional; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.FINAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.PARTIAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode.Step.SINGLE; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.FINAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.PARTIAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode.Step.SINGLE; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.GREATER_THAN; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL; 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.aggregation; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.aggregationFunction; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java index d02abdae56079..28cf3727c5e1d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java index 6e950cf6ab24e..3acfc75395edd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunction.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java index 16dc7f30c9ede..8f84da3f7f122 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Map; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java index 09bee2eee6691..38ad646f26326 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationFunctionProvider.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java index c074c22e2b749..54c7cdc70041c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Collection; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java index 223bce917963c..c2088792942cb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationStepMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java index 739b40b8e7045..523a8a85ca76e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java index 3b8233dc7b5ca..a5cb70903bbde 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AliasPresent.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java index e3e0eabd60424..508ed2a12b29b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AsofJoinClauseProvider.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java index ac28bcfa9c016..df7c743c338cc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AssignUniqueIdMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java index ec30f6b73d98c..7617382df17de 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/BaseStrictSymbolsMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Set; 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 2c5a95808088e..b53a62fa5b823 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,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java index 92637aa324b8a..1c63a84ce70bb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/CteScanMatcher.java @@ -21,9 +21,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CteScanNode; 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 index 9f8e6904dc550..afa8884d55fdf 100644 --- 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 @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/EquiJoinClauseProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/EquiJoinClauseProvider.java index dad730ce71be8..3705582f9c4ad 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/EquiJoinClauseProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/EquiJoinClauseProvider.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java index 7b860615e4831..127eaf6b199d7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExchangeNodeMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java index 9f16ef708f1ae..aa60d377c1c71 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java index 45ef8b90ae7c7..084f64db4b2d7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ExpressionVerifier.java @@ -19,36 +19,36 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DecimalLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java index d488aa936f6a3..5f8b050009161 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/FilterMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java index 10987cec2a1b1..2a5a93fd0b8a1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/GroupMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java index a8f244e1d5e47..19f7513afb8bd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/IdentityProjectionMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.Preconditions.checkState; 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 index 41ef19d559a29..b844eba482618 100644 --- 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 @@ -20,8 +20,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java index 9b72dc9ed6142..82b5af04d4ce0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/JoinMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java index b6e14f8546c37..b634485e79911 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/LimitMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java index 2e81971f8fe64..a37204b8d156d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MarkDistinctMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MarkDistinctNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MatchResult.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MatchResult.java index ff9988ac9c567..1c22383628e4e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MatchResult.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/MatchResult.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java index 997c6f5dfee1b..773fbb7ea3417 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Matcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; public interface Matcher { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java index 26e10ea188bc7..f0f66cd38c45a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/NotPlanNodeMatcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java index 1e1170d0c820b..8db7e0744ac12 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OffsetMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java index 25f36936935a3..30babd3c4ba1c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/OutputMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java index cb66fe8d98a0f..b28808303c423 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanAssert.java @@ -20,10 +20,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; import org.apache.iotdb.commons.conf.IoTDBConstant; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.iterative.GroupReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanGraphPrinter; import org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMetadata; 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 9ed2bc5688ed2..01acba6b5d9df 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 @@ -19,38 +19,38 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTreeDeviceViewScanNode; @@ -86,14 +86,14 @@ import static com.google.common.collect.ImmutableMap.toImmutableMap; import static java.util.Collections.nCopies; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.ASC_NULLS_LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder.DESC_NULLS_LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.FIRST; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.NullOrdering.UNDEFINED; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_FIRST; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder.ASC_NULLS_LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder.DESC_NULLS_FIRST; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder.DESC_NULLS_LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.FIRST; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.NullOrdering.UNDEFINED; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.Ordering.ASCENDING; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem.Ordering.DESCENDING; 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; import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.StrictAssignedSymbolsMatcher.actualAssignments; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java index 09bc7249e3732..7d78f4fdc7f49 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchingVisitor.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Lookup; @@ -32,7 +32,7 @@ import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments.identity; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments.identity; 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; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java index 932f4b92f1f75..98a4269d16394 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanNodeMatcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanTestSymbol.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanTestSymbol.java index 80834fed24a00..9c3bd371ae3d0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanTestSymbol.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanTestSymbol.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; public interface PlanTestSymbol { Symbol toSymbol(SymbolAliases aliases); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java index 9a4e8364a7724..d71246e5598b0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PredicateMatcher.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.function.Predicate; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java index e16879acb493d..233a64f858065 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/RvalueMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.Optional; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java index cf74aa84b4a7f..67916ee1c5bee 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SemiJoinMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SemiJoinNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java index a838b2f06a00e..c4a55172f402a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SortMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java index 4c6e97239b1f6..35961e93bc56d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SpecificationProvider.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.SortOrder; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.SortOrder; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java index dbb2f8ec42234..6ccdf9b9b585e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictAssignedSymbolsMatcher.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java index b0dc4872f7d73..1000316be76e8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/StrictSymbolsMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAlias.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAlias.java index 6ef122518dc3c..5f018ed07a441 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAlias.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAlias.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import static java.util.Objects.requireNonNull; 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 c9f09bd4d5204..3f7edff7f74af 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 @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionRewriter; import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ExpressionTreeRewriter; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java index 55b4c5ca2e424..84f57489a3a87 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableFunctionProcessorMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; 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 3632951b766ea..109b3bfca7e3c 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 @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java index a91ad4d14842b..a6a645961bcec 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TopKMatcher.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java index 1d21bb5270a8b..aa66287c28aef 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/Util.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.Ordering; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java index 379199adf7dfc..406ae9ae8771d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/WindowFunctionMatcher.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata; import java.util.List; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java index d58f964a1a20d..91673ac899d46 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/informationschema/CurrentQueriesTest.java @@ -18,9 +18,9 @@ */ package org.apache.iotdb.db.queryengine.plan.relational.planner.informationschema; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan; import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester; @@ -29,7 +29,7 @@ import java.util.Optional; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression.Operator.EQUAL; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.BIN; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.CLIENT_IP; import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.COST_TIME; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java index eafa5d288a4d7..3c38de79b2c85 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/predicate/TablePredicateConversionTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.queryengine.plan.relational.predicate; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils; import org.apache.tsfile.read.common.type.IntType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/AstMemoryEstimatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/AstMemoryEstimatorTest.java index f0286f616bc05..0738b8cd27acc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/AstMemoryEstimatorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/AstMemoryEstimatorTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SqlParserErrorHandlerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SqlParserErrorHandlerTest.java index 968ed2a67283e..b8e5b395005c8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SqlParserErrorHandlerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/SqlParserErrorHandlerTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java index e3b88f8be8eae..509c529b36ddd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AuthorStatementTest.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.auth.entity.PrivilegeModelType; import org.apache.iotdb.commons.auth.entity.PrivilegeType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Statement; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Statement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.RelationalAuthorStatement; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java index d56404565bd0d..bf42e64460982 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java @@ -20,11 +20,11 @@ package org.apache.iotdb.db.queryengine.plan.statement; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.schema.table.InsertNodeMeasurementInfo; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.AttributeColumnSchema; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java index edb9f5b4d88ef..6df3815e43951 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.plan.statement; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ColumnSchema; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ColumnSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; 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.FieldColumnSchema; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java index 9b7ba564dc6b7..64bc431a7b9f2 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/builder/EvaluationDAGBuilderTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.transformation.builder; -import org.apache.iotdb.calc_commons.execution.operator.Operator; +import org.apache.iotdb.calc.execution.operator.Operator; import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; -import org.apache.iotdb.commons.node_commons.common.SqlDialect; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SqlDialect; import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java index 4ca9161b71f5f..f2661a7538395 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/ArithmeticAndCompareBinaryColumnTransformerTest.java @@ -19,18 +19,18 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticDivisionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticModuloColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareEqualToColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareLessEqualColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.CompareNonEqualColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.ArithmeticAdditionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.ArithmeticDivisionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.ArithmeticModuloColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareEqualToColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareGreaterEqualColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareGreaterThanColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareLessEqualColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.CompareNonEqualColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.IdentityColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java index 24d7432ae5f51..086a143c86d33 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/LogicBinaryColumnTransformerTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.BinaryColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.LogicAndColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.LogicOrColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.BinaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.LogicAndColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.LogicOrColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.IdentityColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java index 993627a253bab..65bc3234ff5e6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacMd5ColumnTransformerTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java index d5aa27082fb34..e37ad94329cf0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha1ColumnTransformerTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java index 5231969524835..a73d248012868 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha256ColumnTransformerTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java index 3257e98e7aac9..541faceeebef6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/binary/hmac/HmacSha512ColumnTransformerTest.java @@ -19,11 +19,11 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.binary.hmac; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.HmacColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.factory.HmacStrategiesFactory; -import org.apache.iotdb.calc_commons.transformation.dag.column.binary.strategies.HmacStrategy; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.HmacColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.binary.factory.HmacStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.binary.strategies.HmacStrategy; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.HmacConstantKeyColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java index 667faca4dea3e..0bca3e93575b5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/LpadColumnTransformerTest.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.LpadColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ternary.LpadColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java index a398ddc7e79a6..7b1250a2491b0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/ternary/RpadColumnTransformerTest.java @@ -18,8 +18,8 @@ */ package org.apache.iotdb.db.queryengine.transformation.dag.column.ternary; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.ternary.RpadColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ternary.RpadColumnTransformer; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java index 6c11d4df406fa..38f034e89521c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/UnaryColumnTransformerTest.java @@ -19,14 +19,14 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary; -import org.apache.iotdb.calc_commons.transformation.dag.column.leaf.IdentityColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.ArithmeticNegationColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.InColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.IsNullColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LikeColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.LogicNotColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.RegularColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.UnaryColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.leaf.IdentityColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.ArithmeticNegationColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.InColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.IsNullColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.LikeColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.LogicNotColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.RegularColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.UnaryColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java index 0ea91219b39d7..6b50738c7184f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/BlobLengthColumnTransformerTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BlobLengthColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BlobLengthColumnTransformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java index f242d205e5c26..013e8c8429081 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/DateBinFunctionTest.java @@ -27,7 +27,7 @@ import java.time.ZoneId; import java.util.TimeZone; -import static org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; +import static org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DateBinFunctionColumnTransformer.dateBin; import static org.junit.Assert.assertEquals; public class DateBinFunctionTest { diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java index d9a6256020b71..dfbc215a88f8b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian32ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java index d1819511b4fdd..4cf2a63440b76 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromBigEndian64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java index a30ec9075cf2f..ebd1d4943352f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_32BigEndianColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BytesToFloatColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java index 702f5e21aea15..0d1514e2af82f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromIEEE754_64BigEndianColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BytesToDoubleColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java index c392ce8cf0fb8..fb99ce5d34dcd 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian32ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BytesToIntColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java index 188f93c8193e4..533484563e706 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/FromLittleEndian64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.BytesToLongColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java index 2fbbf0d3c6a9b..e13563e41df23 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian32ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java index 87a5860b21a1a..2d15cf4a5c362 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToBigEndian64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.LongColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java index 3de9b521b8e5e..ffda49dec3bdc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_32BigEndianColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.FloatToBytesColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.FloatColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java index f3146d14ed92e..ded4c9480c8de 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToIEEE754_64BigEndianColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.DoubleToBytesColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.DoubleColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java index 721bf4ba27447..bcee3901b6140 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian32ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.IntToBytesColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.IntColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java index 58daa05364d26..420eb8ef5673b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/IntegerEncoding/ToLittleEndian64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.IntegerEncoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.LongToBytesColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.NumericCodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.LongColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java index 99ec2cd13c3e8..03811972f5d19 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ReverseColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java index 2ac82cf5aa367..068654977deca 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase32ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base32Encoding; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.iotdb.commons.exception.SemanticException; import com.google.common.io.BaseEncoding; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java index 508bca05fe880..1135633bb200f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java index be7fcc6d0a7ca..83bbe84f4d0b1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/FromBase64UrlColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java index ad8bf795d376a..d000b22571119 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase32ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base32Encoding; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java index 2b324e815d8aa..d02f9765b802e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java index 6ec798f1c5ef5..d83fdd7239ffc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/base64Encoding/ToBase64UrlColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.base64Encoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java index d27d5bfb3585a..c3829eb04693e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Crc32ColumnTransformerTest.java @@ -21,8 +21,8 @@ // Note: The actual package may vary, adjust if CRC32Transformer is in a different location. package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.CRC32Transformer; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.CRC32Transformer; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java index a680fe29ed601..7135f334a182e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Md5ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java index dcd86562c13cc..2ce9dba7d8805 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Murmur3ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java index babf71a4c4b44..ef9ae8e222cf4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha1ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java index 2e8ddab05869a..902693f87afc1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha256ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java index da16401d3649e..488b67d02d52d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/Sha512ColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.hash.Hashing; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java index 1cc6906cbac97..258b2db8aad03 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_32ColumnTransformerTest.java @@ -19,9 +19,9 @@ * under the License. */ -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java index b49733dac43ec..5c39e064a4c0c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/SpookyHashV2_64ColumnTransformerTest.java @@ -19,9 +19,9 @@ * under the License. */ -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.column.BinaryColumn; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java index 4e95f9699ca13..e8a0202919d9e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hashing/XxHash64ColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hashing; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import net.jpountz.xxhash.XXHash64; import net.jpountz.xxhash.XXHashFactory; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java index 9f5a8ecebc1fa..2b636b9095a8b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/FromHexColumnTransformerTest.java @@ -21,9 +21,9 @@ // package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.string; package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hexEncoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java index ae38b8d5e4d00..f846ddce17c57 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/hexEncoding/ToHexColumnTransformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.hexEncoding; -import org.apache.iotdb.calc_commons.transformation.dag.column.ColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; -import org.apache.iotdb.calc_commons.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; +import org.apache.iotdb.calc.transformation.dag.column.ColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.GenericCodecColumnTransformer; +import org.apache.iotdb.calc.transformation.dag.column.unary.scalar.factory.CodecStrategiesFactory; import com.google.common.io.BaseEncoding; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java index b9feb8f7dda6c..2425d2d92e074 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/util/BitwiseUtilsTest.java @@ -19,20 +19,20 @@ package org.apache.iotdb.db.queryengine.transformation.dag.util; -import org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils; +import org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils; import org.apache.iotdb.commons.exception.SemanticException; import org.junit.Assert; import org.junit.Test; -import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitCountCheck; -import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseAndTransform; -import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseLeftShiftTransform; -import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseNotTransform; -import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseOrTransform; -import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseRightShiftArithmeticTransform; -import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseRightShiftTransform; -import static org.apache.iotdb.calc_commons.transformation.dag.util.BitwiseUtils.bitwiseXorTransform; +import static org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils.bitCountCheck; +import static org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils.bitwiseAndTransform; +import static org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils.bitwiseLeftShiftTransform; +import static org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils.bitwiseNotTransform; +import static org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils.bitwiseOrTransform; +import static org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils.bitwiseRightShiftArithmeticTransform; +import static org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils.bitwiseRightShiftTransform; +import static org.apache.iotdb.calc.transformation.dag.util.BitwiseUtils.bitwiseXorTransform; public class BitwiseUtilsTest { @Test diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java index 0b51e47d5a3ed..40052f3d3e814 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableRowListTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; -import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.RowListForwardIterator; -import org.apache.iotdb.calc_commons.transformation.datastructure.row.ElasticSerializableRowList; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.transformation.datastructure.SerializableList; +import org.apache.iotdb.calc.transformation.datastructure.iterator.RowListForwardIterator; +import org.apache.iotdb.calc.transformation.datastructure.row.ElasticSerializableRowList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableTVListTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableTVListTest.java index 0c2e2226d3c58..aabb8ae93e2db 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableTVListTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/ElasticSerializableTVListTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; -import org.apache.iotdb.calc_commons.transformation.datastructure.SerializableList; -import org.apache.iotdb.calc_commons.transformation.datastructure.iterator.TVListForwardIterator; -import org.apache.iotdb.calc_commons.transformation.datastructure.tv.ElasticSerializableTVList; +import org.apache.iotdb.calc.transformation.datastructure.SerializableList; +import org.apache.iotdb.calc.transformation.datastructure.iterator.TVListForwardIterator; +import org.apache.iotdb.calc.transformation.datastructure.tv.ElasticSerializableTVList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/LRUCache.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/LRUCache.java index ea872f5d82a6c..be21f365d5fd8 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/LRUCache.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/LRUCache.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; -import org.apache.iotdb.calc_commons.transformation.datastructure.Cache; +import org.apache.iotdb.calc.transformation.datastructure.Cache; import java.util.Arrays; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableRowListTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableRowListTest.java index 9b088fb8303f3..0927809417a54 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableRowListTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableRowListTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; -import org.apache.iotdb.calc_commons.transformation.datastructure.row.SerializableRowList; +import org.apache.iotdb.calc.transformation.datastructure.row.SerializableRowList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableTVListTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableTVListTest.java index 3e46ba350425f..c9459d12708f4 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableTVListTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/datastructure/SerializableTVListTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.queryengine.transformation.datastructure; -import org.apache.iotdb.calc_commons.transformation.datastructure.tv.SerializableTVList; +import org.apache.iotdb.calc.transformation.datastructure.tv.SerializableTVList; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java index 33f4bd2db8378..8d100f4be14b1 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/service/DataNodeInternalRPCServiceImplTest.java @@ -28,9 +28,9 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.consensus.IConsensus; import org.apache.iotdb.consensus.common.Peer; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java index 2ed85a215b979..68d76764920db 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/DataRegionTest.java @@ -19,19 +19,19 @@ package org.apache.iotdb.db.storageengine.dataregion; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.exception.ShutdownException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; 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.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataRegionException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLQueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLQueryTest.java index 3d746f3a96e50..845155aadfe31 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLQueryTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLQueryTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.IFullPath; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java index 16ececb02ce56..c211bc360ade6 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLTest.java @@ -20,15 +20,15 @@ package org.apache.iotdb.db.storageengine.dataregion; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.ttl.TTLCache; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataRegionException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java index 5520ebcd34031..4e81e3ee87cf7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.concurrent.ExceptionalCountDownLatch; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java index 3f79a3c41c240..ab9dd90e778a9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java @@ -21,10 +21,10 @@ import org.apache.iotdb.commons.concurrent.ExceptionalCountDownLatch; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.IFullPath; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java index 08ccd8e3737ef..4c283fad63679 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.storageengine.dataregion.compaction.inner; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataRegionException; import org.apache.iotdb.db.exception.StorageEngineException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java index 23b65b391a08d..875239ce6b6ea 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.storageengine.dataregion.compaction.inner; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataRegionException; import org.apache.iotdb.db.exception.StorageEngineException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandlerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandlerTest.java index c76b2a3df916e..8a28a43c64feb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandlerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleRequestHandlerTest.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.StartupException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataRegionException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AlignedTVListIteratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AlignedTVListIteratorTest.java index 4204c8e3862ba..c58eeb1bf6069 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AlignedTVListIteratorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AlignedTVListIteratorTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemChunkDeserializeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemChunkDeserializeTest.java index 3abf1e4e0902d..8e03776231eae 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemChunkDeserializeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemChunkDeserializeTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemTableTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemTableTestUtils.java index f1468650bfb80..9e9ca36ad807f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemTableTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/MemTableTestUtils.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/NonAlignedTVListIteratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/NonAlignedTVListIteratorTest.java index 67752fd95f96a..ed00999ab9f9e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/NonAlignedTVListIteratorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/NonAlignedTVListIteratorTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.dataregion.memtable; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.db.queryengine.common.FragmentInstanceId; import org.apache.iotdb.db.queryengine.common.PlanFragmentId; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java index eaa652959351c..70ea839382c09 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/PrimitiveMemTableTest.java @@ -18,17 +18,17 @@ */ package org.apache.iotdb.db.storageengine.dataregion.memtable; -import org.apache.iotdb.calc_commons.exception.MemoryNotEnoughException; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; -import org.apache.iotdb.calc_commons.plan.planner.memory.MemoryReservationManager; +import org.apache.iotdb.calc.exception.MemoryNotEnoughException; +import org.apache.iotdb.calc.exception.QueryProcessException; +import org.apache.iotdb.calc.plan.planner.memory.MemoryReservationManager; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; 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.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.WriteProcessException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessorTest.java index 64d529e224488..3cc50496fb64f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessorTest.java @@ -22,10 +22,10 @@ import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.file.SystemFileFactory; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; import org.apache.iotdb.commons.path.NonAlignedFullPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.exception.DataRegionException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManagerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManagerTest.java index 87d93e40612d1..2017805ac7e24 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManagerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManagerTest.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java index 1bb04617abc6d..0684fbca73ba0 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALTestUtils.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.storageengine.dataregion.wal; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java index 22dfa20631206..4e9c73b389e87 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.node.IWALNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALFileUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java index 859d55f11d059..dc614364a4ecc 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.node.IWALNode; import org.apache.iotdb.db.storageengine.dataregion.wal.node.WALNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java index a68e1b4590989..95a3fb4615876 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.storageengine.dataregion.wal.node.IWALNode; import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALFileUtils; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java index 3ff93e9997071..253e71e2a0268 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.db.storageengine.dataregion.wal.buffer; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/compression/WALCompressionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/compression/WALCompressionTest.java index 26d7c1729c725..2e8f86b42d6da 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/compression/WALCompressionTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/compression/WALCompressionTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.storageengine.dataregion.wal.compression; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java index 6fc21e5dfd4e0..8565b3ad3c54c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.io; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java index 00aab67665e71..b59863adc7259 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java @@ -19,10 +19,10 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.node; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.iotdb.consensus.common.request.IndexedConsensusRequest; import org.apache.iotdb.consensus.iot.log.ConsensusReqReader; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALFakeNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALFakeNodeTest.java index 392403eabaa3e..a7f1b777eeb19 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALFakeNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALFakeNodeTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.storageengine.dataregion.wal.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java index 1dfbf6f5685f2..dc762716ec134 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java @@ -20,8 +20,8 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java index 01c3d311dea78..2f57db238b00a 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java @@ -21,8 +21,8 @@ import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.consensus.ConsensusFactory; import org.apache.iotdb.consensus.iot.log.ConsensusReqReader; import org.apache.iotdb.db.conf.IoTDBConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java index a51f0a2ed0c07..cecf04e6781d7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java @@ -18,14 +18,14 @@ */ package org.apache.iotdb.db.storageengine.dataregion.wal.recover; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.concurrent.ExceptionalCountDownLatch; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRepairWriterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRepairWriterTest.java index 088c0ee6d90e8..315e963fbebed 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRepairWriterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRepairWriterTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.recover; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowsNode; import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntry; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java index 0971aacafd7d9..238606b073dfa 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java @@ -18,11 +18,11 @@ */ package org.apache.iotdb.db.storageengine.dataregion.wal.recover.file; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.AlignedFullPath; 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.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.queryengine.execution.fragment.QueryContext; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java index 8449d2482c4d1..49f22af864070 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.recover.file; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.FieldColumnSchema; import org.apache.iotdb.db.conf.IoTDBConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/rescon/memory/TimePartitionManagerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/rescon/memory/TimePartitionManagerTest.java index 81b884ba41326..90eb10c7cfb72 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/rescon/memory/TimePartitionManagerTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/rescon/memory/TimePartitionManagerTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.storageengine.rescon.memory; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/trigger/executor/TriggerExecuteTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/trigger/executor/TriggerExecuteTest.java index a13111c0f4c67..015cbdc350644 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/trigger/executor/TriggerExecuteTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/trigger/executor/TriggerExecuteTest.java @@ -20,8 +20,8 @@ package org.apache.iotdb.db.trigger.executor; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.trigger.TriggerInformation; import org.apache.iotdb.confignode.rpc.thrift.TTriggerState; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/DateTimeUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/DateTimeUtilsTest.java index 494093c07e5b8..056aa7576b1e9 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/DateTimeUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/DateTimeUtilsTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.utils; -import org.apache.iotdb.commons.node_commons.utils.DateTimeUtils; +import org.apache.iotdb.commons.queryengine.utils.DateTimeUtils; import org.apache.iotdb.db.protocol.session.IClientSession; import org.apache.iotdb.db.protocol.session.InternalClientSession; import org.apache.iotdb.db.protocol.session.SessionManager; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java index 2ca087f8d8ec6..7aac119cd370b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java @@ -22,7 +22,7 @@ import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.StartupException; -import org.apache.iotdb.commons.node_commons.plan.udf.UDFManagementService; +import org.apache.iotdb.commons.queryengine.plan.udf.UDFManagementService; import org.apache.iotdb.db.conf.DataNodeMemoryConfig; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ErrorHandlingUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ErrorHandlingUtilsTest.java index dcc39b2f431b3..354037a6aec93 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ErrorHandlingUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ErrorHandlingUtilsTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.utils; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.db.exception.StorageGroupNotReadyException; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/MemUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/MemUtilsTest.java index d124544e601d9..7af2a9775fb0f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/MemUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/MemUtilsTest.java @@ -19,8 +19,8 @@ package org.apache.iotdb.db.utils; import org.apache.iotdb.commons.exception.IllegalPathException; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.commons.path.PartialPath; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode; import org.apache.tsfile.common.conf.TSFileConfig; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java index 6057d0465d485..697fbc75820ba 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.db.utils; -import org.apache.iotdb.calc_commons.utils.constant.SqlConstant; +import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.tsfile.enums.TSDataType; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TimestampPrecisionUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TimestampPrecisionUtilsTest.java index 525a2fdfa54d2..c45fc841782e7 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TimestampPrecisionUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TimestampPrecisionUtilsTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.utils; -import org.apache.iotdb.commons.node_commons.utils.TimestampPrecisionUtils; +import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.junit.Test; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TypeInferenceUtilsTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TypeInferenceUtilsTest.java index 8a8cac8fe2881..2b8f58308a512 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TypeInferenceUtilsTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/TypeInferenceUtilsTest.java @@ -19,7 +19,7 @@ package org.apache.iotdb.db.utils; -import org.apache.iotdb.calc_commons.exception.QueryProcessException; +import org.apache.iotdb.calc.exception.QueryProcessException; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java index 12929ed5e608f..f44ffc7008a6b 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/datastructure/MergeSortHeapTest.java @@ -19,9 +19,9 @@ package org.apache.iotdb.db.utils.datastructure; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortHeap; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; +import org.apache.iotdb.calc.utils.datastructure.MergeSortHeap; +import org.apache.iotdb.calc.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc.utils.datastructure.SortKey; import org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparatorUtils; import org.apache.iotdb.db.queryengine.plan.statement.component.OrderByKey; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java index 1dd148253e274..e6c4e8e3ecc8d 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/sort/SortUtilTest.java @@ -19,13 +19,13 @@ package org.apache.iotdb.db.utils.sort; -import org.apache.iotdb.calc_commons.utils.datastructure.MergeSortKey; -import org.apache.iotdb.calc_commons.utils.datastructure.SortKey; -import org.apache.iotdb.calc_commons.utils.sort.FileSpillerReader; -import org.apache.iotdb.calc_commons.utils.sort.MemoryReader; -import org.apache.iotdb.calc_commons.utils.sort.SortBufferManager; -import org.apache.iotdb.calc_commons.utils.sort.SortReader; -import org.apache.iotdb.calc_commons.utils.sort.TreeDiskSpiller; +import org.apache.iotdb.calc.utils.datastructure.MergeSortKey; +import org.apache.iotdb.calc.utils.datastructure.SortKey; +import org.apache.iotdb.calc.utils.sort.FileSpillerReader; +import org.apache.iotdb.calc.utils.sort.MemoryReader; +import org.apache.iotdb.calc.utils.sort.SortBufferManager; +import org.apache.iotdb.calc.utils.sort.SortReader; +import org.apache.iotdb.calc.utils.sort.TreeDiskSpiller; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.MetadataException; import org.apache.iotdb.commons.utils.FileUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/ConnectionInfo.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/common/ConnectionInfo.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/ConnectionInfo.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/common/ConnectionInfo.java index dece95aecc2d1..b59bf556b8202 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/ConnectionInfo.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/common/ConnectionInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.common; +package org.apache.iotdb.commons.queryengine.common; public class ConnectionInfo { private final long userId; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/NodeRef.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/common/NodeRef.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/NodeRef.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/common/NodeRef.java index 39b79a81b2293..9f57602863145 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/NodeRef.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/common/NodeRef.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.common; +package org.apache.iotdb.commons.queryengine.common; import static java.lang.String.format; import static java.lang.System.identityHashCode; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/SessionInfo.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/common/SessionInfo.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/SessionInfo.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/common/SessionInfo.java index 1d2d00ae8626e..824ea18ce7dfb 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/SessionInfo.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/common/SessionInfo.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.common; +package org.apache.iotdb.commons.queryengine.common; import org.apache.iotdb.commons.audit.UserEntity; import org.apache.iotdb.commons.conf.IoTDBConstant.ClientVersion; -import org.apache.iotdb.commons.node_commons.plan.relational.security.Identity; +import org.apache.iotdb.commons.queryengine.plan.relational.security.Identity; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/SqlDialect.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/common/SqlDialect.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/SqlDialect.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/common/SqlDialect.java index 62b4f69424752..4ac459b11b76f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/common/SqlDialect.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/common/SqlDialect.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.commons.node_commons.common; +package org.apache.iotdb.commons.queryengine.common; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/MemoryEstimationHelper.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/MemoryEstimationHelper.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/MemoryEstimationHelper.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/MemoryEstimationHelper.java index 1498ce05fdd8b..95796129011c6 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/MemoryEstimationHelper.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/MemoryEstimationHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.execution; +package org.apache.iotdb.commons.queryengine.execution; import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.MeasurementPath; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java similarity index 91% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java index 85155c06abf1f..3421c3cc5d477 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/UpdateMemory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped; +package org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped; public interface UpdateMemory { UpdateMemory NOOP = () -> true; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java similarity index 92% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java index 8e9a22282c005..54ddc62198b07 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/CombineHashFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash; public final class CombineHashFunction { private CombineHashFunction() {} diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java similarity index 94% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java index 703f72c64907c..5d55f255f49ea 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatGroupByHash.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; -import org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.queryengine.plan.relational.utils.TypeUtil; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -35,7 +35,7 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Verify.verify; import static java.lang.Math.min; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.sumExact; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.sumExact; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; // This implementation assumes arrays used in the hash are always a power of 2 diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java index 84fc5abad4eea..c14f72f91c5ab 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatHash.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -32,8 +32,8 @@ import static java.lang.Math.max; import static java.lang.Math.min; import static java.lang.Math.toIntExact; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.VariableWidthData.EMPTY_CHUNK; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.VariableWidthData.POINTER_SIZE; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.VariableWidthData.EMPTY_CHUNK; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.VariableWidthData.POINTER_SIZE; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfByteArray; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfIntArray; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java similarity index 94% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java index d4af7aa615ace..143cbfe68f068 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/FlatHashStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java similarity index 89% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java index afb7f1f6cf271..50d30045b19ae 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/GroupByHash.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import com.google.common.annotations.VisibleForTesting; import org.apache.tsfile.block.column.Column; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java index 840d93f9856d2..39fb108f80855 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/HashStrategy.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash; -import org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil; +import org.apache.iotdb.commons.queryengine.plan.relational.utils.TypeUtil; import com.google.common.collect.ImmutableList; import org.apache.tsfile.block.column.Column; @@ -27,8 +27,8 @@ import java.util.List; -import static org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil.getFlatVariableWidthSize; -import static org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil.notDistinctFrom; +import static org.apache.iotdb.commons.queryengine.plan.relational.utils.TypeUtil.getFlatVariableWidthSize; +import static org.apache.iotdb.commons.queryengine.plan.relational.utils.TypeUtil.notDistinctFrom; public class HashStrategy implements FlatHashStrategy { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java similarity index 86% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java index a50d852a80d65..a2bb02b8b9220 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/MarkDistinctHash.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.UpdateMemory; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.UpdateMemory; import com.google.common.annotations.VisibleForTesting; import org.apache.tsfile.block.column.Column; @@ -32,8 +32,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.DEFAULT_GROUP_NUMBER; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.GroupByHash.createGroupByHash; public class MarkDistinctHash { private final GroupByHash groupByHash; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java index d551ed68f9546..7e30e2bd37479 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/NoChannelGroupByHash.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.read.common.block.TsBlockBuilder; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java similarity index 92% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java index 516bcd506e061..880eb47762209 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/VariableWidthData.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash; import com.google.common.primitives.Ints; import org.apache.tsfile.utils.RamUsageEstimator; @@ -30,9 +30,9 @@ import static java.lang.Math.addExact; import static java.lang.Math.max; import static java.lang.Math.subtractExact; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.bytesToInt; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.intToBytes; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.sumExact; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.bytesToInt; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.intToBytes; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.FlatHash.sumExact; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf; import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfObjectArray; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java index 017b5e79468e7..eb50a76c68646 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/execution/operator/source/relational/aggregation/grouped/hash/XxHash64.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash; +package org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash; import java.io.IOException; import java.io.InputStream; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/analyze/ITableTypeProvider.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/analyze/ITableTypeProvider.java similarity index 88% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/analyze/ITableTypeProvider.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/analyze/ITableTypeProvider.java index a8f468c83839f..889f16d9cc35b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/analyze/ITableTypeProvider.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/analyze/ITableTypeProvider.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.analyze; +package org.apache.iotdb.commons.queryengine.plan.analyze; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/expression/multi/FunctionType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/expression/multi/FunctionType.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/expression/multi/FunctionType.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/expression/multi/FunctionType.java index bbfce3cb6b7a8..2589fe60489ea 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/expression/multi/FunctionType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/expression/multi/FunctionType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.expression.multi; +package org.apache.iotdb.commons.queryengine.plan.expression.multi; /** */ public enum FunctionType { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/CommonPlanNodeDeserializer.java similarity index 54% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/CommonPlanNodeDeserializer.java index 113b6286c11e3..7576ce0b5ed14 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/CommonPlanNodeDeserializer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/CommonPlanNodeDeserializer.java @@ -12,31 +12,31 @@ * limitations under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.node; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; import java.io.DataInputStream; import java.io.IOException; @@ -65,29 +65,29 @@ public PlanNode deserialize(ByteBuffer buffer) { public PlanNode deserialize(ByteBuffer buffer, short nodeType) { switch (nodeType) { case 1001: - return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode + return org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode .deserialize(buffer); case 1002: - return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode + return org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode .deserialize(buffer); case 1003: return OutputNode.deserialize(buffer); case 1004: - return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode + return org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode .deserialize(buffer); case 1005: - return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode + return org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode .deserialize(buffer); case 1006: - return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode + return org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode .deserialize(buffer); case 1007: return MergeSortNode.deserialize(buffer); case 1008: - return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode + return org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode .deserialize(buffer); case 1009: - return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode + return org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CollectNode .deserialize(buffer); case 1010: return StreamSortNode.deserialize(buffer); @@ -100,7 +100,7 @@ public PlanNode deserialize(ByteBuffer buffer, short nodeType) { case 1014: return ValueFillNode.deserialize(buffer); case 1015: - return org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode + return org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode .deserialize(buffer); case 1017: return GapFillNode.deserialize(buffer); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/ICoreQueryPlanVisitor.java similarity index 61% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/ICoreQueryPlanVisitor.java index ed39ec23a56a4..3ecac969c78e1 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/ICoreQueryPlanVisitor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/ICoreQueryPlanVisitor.java @@ -12,47 +12,47 @@ * limitations under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative.GroupReference; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AggregationNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ApplyNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.AssignUniqueId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CollectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.CorrelatedJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.EnforceSingleRowNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ExceptNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.FilterNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GapFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.GroupNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.IntersectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LimitNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.LinearFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MarkDistinctNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.MergeSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OffsetNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.OutputNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PatternRecognitionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.PreviousFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ProjectNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowNumberNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SemiJoinNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.SortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.StreamSortNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TableFunctionProcessorNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.TopKRankingNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.UnionNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValueFillNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.ValuesNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.node.WindowNode; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.iterative.GroupReference; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AggregationNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ApplyNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.AssignUniqueId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CollectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.CorrelatedJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.EnforceSingleRowNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ExceptNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.FilterNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GapFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.GroupNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.IntersectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LimitNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.LinearFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MarkDistinctNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.MergeSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OffsetNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.OutputNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PatternRecognitionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.PreviousFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ProjectNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowNumberNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SemiJoinNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.SortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.StreamSortNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TableFunctionProcessorNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.TopKRankingNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.UnionNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValueFillNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.ValuesNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.node.WindowNode; public interface ICoreQueryPlanVisitor extends IPlanVisitor { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPartitionRelatedNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/IPartitionRelatedNode.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPartitionRelatedNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/IPartitionRelatedNode.java index 9cbc2ab6217d4..b1982748e9bd9 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPartitionRelatedNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/IPartitionRelatedNode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/IPlanNodeDeserializer.java similarity index 92% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/IPlanNodeDeserializer.java index 4f00fae62c2bc..f73e94b730651 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanNodeDeserializer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/IPlanNodeDeserializer.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.node; import java.io.DataInputStream; import java.io.IOException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanNodeDeserializerProvider.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/IPlanNodeDeserializerProvider.java similarity index 90% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanNodeDeserializerProvider.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/IPlanNodeDeserializerProvider.java index 87f5d518d70d7..caab718fd48ef 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanNodeDeserializerProvider.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/IPlanNodeDeserializerProvider.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.node; public interface IPlanNodeDeserializerProvider { IPlanNodeDeserializer getDeserializer(); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanVisitor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/IPlanVisitor.java similarity index 91% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanVisitor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/IPlanVisitor.java index 658e9553dee83..b07f6d65cba71 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/IPlanVisitor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/IPlanVisitor.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.node; public interface IPlanVisitor { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNode.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNode.java index 3bd5d26e06d22..ebb0c69ea3679 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNode.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.node; import org.apache.iotdb.commons.exception.runtime.SerializationRunTimeException; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.commons.request.IConsensusRequest; import org.apache.tsfile.utils.PublicBAOS; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNodeId.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeId.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNodeId.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeId.java index c09b15b979913..8bfdf2979f6fc 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNodeId.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeId.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.node; import org.apache.tsfile.utils.Accountable; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNodeType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNodeType.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java index b589a54626b73..80605db85c309 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/PlanNodeType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.node; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.node; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/process/MultiChildProcessNode.java similarity index 89% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/process/MultiChildProcessNode.java index 69da4aaa3a849..c986e954f4e10 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/MultiChildProcessNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/process/MultiChildProcessNode.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/ProcessNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/process/ProcessNode.java similarity index 79% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/ProcessNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/process/ProcessNode.java index 24792bde7e338..f67629038c5ea 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/ProcessNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/process/ProcessNode.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; public abstract class ProcessNode extends PlanNode { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/process/SingleChildProcessNode.java similarity index 90% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/process/SingleChildProcessNode.java index 3544df746bc57..cf8c4587dd169 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/SingleChildProcessNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/process/SingleChildProcessNode.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/TwoChildProcessNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java similarity index 91% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/TwoChildProcessNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java index 78aef78c2d33f..f91b748071596 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/process/TwoChildProcessNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/process/TwoChildProcessNode.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/source/SourceNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/source/SourceNode.java similarity index 78% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/source/SourceNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/source/SourceNode.java index e820ef6e9089f..88f3569d116de 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/node/source/SourceNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/source/SourceNode.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.node.source; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPartitionRelatedNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPartitionRelatedNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; public abstract class SourceNode extends PlanNode implements AutoCloseable, IPartitionRelatedNode { protected SourceNode() {} diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/parameter/InputLocation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/parameter/InputLocation.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/parameter/InputLocation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/parameter/InputLocation.java index 990b8d661ed6a..5f390ea0ccc4e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/planner/plan/parameter/InputLocation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/parameter/InputLocation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.planner.plan.parameter; +package org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/analyzer/NodeRef.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/analyzer/NodeRef.java similarity index 91% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/analyzer/NodeRef.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/analyzer/NodeRef.java index 77a0d851a369b..50dd2a0a2588d 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/analyzer/NodeRef.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/analyzer/NodeRef.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.analyzer; +package org.apache.iotdb.commons.queryengine.plan.relational.analyzer; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; import static java.lang.System.identityHashCode; import static java.util.Objects.requireNonNull; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/BoundSignature.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/BoundSignature.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/BoundSignature.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/BoundSignature.java index 1335a7163a224..65b8fd78788d6 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/BoundSignature.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/BoundSignature.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function; +package org.apache.iotdb.commons.queryengine.plan.relational.function; -import org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil; +import org.apache.iotdb.commons.queryengine.plan.relational.utils.TypeUtil; import org.apache.tsfile.read.common.type.Type; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/FunctionId.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/FunctionId.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/FunctionId.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/FunctionId.java index a97fcde167548..f0177a9b87f46 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/FunctionId.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/FunctionId.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function; +package org.apache.iotdb.commons.queryengine.plan.relational.function; import java.util.Locale; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/FunctionKind.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/FunctionKind.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/FunctionKind.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/FunctionKind.java index 3f70a34cd260e..a43ccf17834ff 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/FunctionKind.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/FunctionKind.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function; +package org.apache.iotdb.commons.queryengine.plan.relational.function; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionAINodeService.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/ITableFunctionAINodeService.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionAINodeService.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/ITableFunctionAINodeService.java index 423cc8d7cc1a1..f35790ba97af0 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionAINodeService.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/ITableFunctionAINodeService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function; +package org.apache.iotdb.commons.queryengine.plan.relational.function; import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionAINodeServiceProvider.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/ITableFunctionAINodeServiceProvider.java similarity index 92% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionAINodeServiceProvider.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/ITableFunctionAINodeServiceProvider.java index eea5032ec4737..49d3acc615b0a 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionAINodeServiceProvider.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/ITableFunctionAINodeServiceProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function; +package org.apache.iotdb.commons.queryengine.plan.relational.function; public interface ITableFunctionAINodeServiceProvider { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionFactory.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/ITableFunctionFactory.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionFactory.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/ITableFunctionFactory.java index 31bf0287df65f..adf64c52f3705 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ITableFunctionFactory.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/ITableFunctionFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function; +package org.apache.iotdb.commons.queryengine.plan.relational.function; import org.apache.iotdb.udf.api.relational.TableFunction; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/InterpretedFunctionInvoker.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/InterpretedFunctionInvoker.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/InterpretedFunctionInvoker.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/InterpretedFunctionInvoker.java index d8811c5c35f2a..2eb4deffc72f7 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/InterpretedFunctionInvoker.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/InterpretedFunctionInvoker.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function; +package org.apache.iotdb.commons.queryengine.plan.relational.function; -import org.apache.iotdb.commons.node_commons.common.SessionInfo; +import org.apache.iotdb.commons.queryengine.common.SessionInfo; import org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/LongVariableConstraint.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/LongVariableConstraint.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/LongVariableConstraint.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/LongVariableConstraint.java index 742ac6d32b358..c6d105a3ad81c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/LongVariableConstraint.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/LongVariableConstraint.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function; +package org.apache.iotdb.commons.queryengine.plan.relational.function; import java.util.Objects; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/OperatorType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/OperatorType.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/OperatorType.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/OperatorType.java index 085201ee0ebff..8df0429759c9c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/OperatorType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/OperatorType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function; +package org.apache.iotdb.commons.queryengine.plan.relational.function; public enum OperatorType { ADD("+", 2), diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/ResolvedFunctionCallBuilder.java similarity index 85% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/ResolvedFunctionCallBuilder.java index c5b3fe349bfd2..e36441116dfcd 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/ResolvedFunctionCallBuilder.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/ResolvedFunctionCallBuilder.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function; +package org.apache.iotdb.commons.queryengine.plan.relational.function; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/Signature.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/Signature.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/Signature.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/Signature.java index 4b3ae03a15535..ae0797a71534f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/Signature.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/Signature.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function; +package org.apache.iotdb.commons.queryengine.plan.relational.function; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignature; import java.util.ArrayList; import java.util.List; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TableBuiltinTableFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/TableBuiltinTableFunction.java similarity index 89% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TableBuiltinTableFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/TableBuiltinTableFunction.java index 4bfc8473a9559..577f02aabd719 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TableBuiltinTableFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/TableBuiltinTableFunction.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function; +package org.apache.iotdb.commons.queryengine.plan.relational.function; -import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.ClassifyTableFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.ForecastTableFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.PatternMatchTableFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.ClassifyTableFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.ForecastTableFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.PatternMatchTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.CapacityTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.CumulateTableFunction; import org.apache.iotdb.commons.udf.builtin.relational.tvf.HOPTableFunction; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TableFunctionFactory.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/TableFunctionFactory.java similarity index 91% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TableFunctionFactory.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/TableFunctionFactory.java index f719b5deb7055..441eda6499b3e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TableFunctionFactory.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/TableFunctionFactory.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function; +package org.apache.iotdb.commons.queryengine.plan.relational.function; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; +import org.apache.iotdb.commons.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.udf.api.relational.TableFunction; public class TableFunctionFactory { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TypeVariableConstraint.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/TypeVariableConstraint.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TypeVariableConstraint.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/TypeVariableConstraint.java index 80157571ae094..a32cd03d48796 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/TypeVariableConstraint.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/TypeVariableConstraint.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function; +package org.apache.iotdb.commons.queryengine.plan.relational.function; -import org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignature; import java.util.HashSet; import java.util.Objects; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/AdditionResolver.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/AdditionResolver.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/AdditionResolver.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/AdditionResolver.java index a33eb9f215ecf..6ba98fc2903cb 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/AdditionResolver.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/AdditionResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic; +package org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/DivisionResolver.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/DivisionResolver.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/DivisionResolver.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/DivisionResolver.java index 093e7db2af145..0fae5be12fb62 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/DivisionResolver.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/DivisionResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic; +package org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/ModulusResolver.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/ModulusResolver.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/ModulusResolver.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/ModulusResolver.java index 2ddc2a7b2228b..c8417ab001fbf 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/ModulusResolver.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/ModulusResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic; +package org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/MultiplicationResolver.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/MultiplicationResolver.java index 9fde7447090d6..d2773fcfab3b4 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/MultiplicationResolver.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/MultiplicationResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic; +package org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/SubtractionResolver.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/SubtractionResolver.java index 8c79c223ddda2..55a6188e0c212 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/arithmetic/SubtractionResolver.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/arithmetic/SubtractionResolver.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.arithmetic; +package org.apache.iotdb.commons.queryengine.plan.relational.function.arithmetic; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/ClassifyTableFunction.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/ClassifyTableFunction.java index 44571dbe4cb7d..45d59b802a8a6 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/ClassifyTableFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/ClassifyTableFunction.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf; +package org.apache.iotdb.commons.queryengine.plan.relational.function.tvf; import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.utils.ResultColumnAppender; -import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; +import org.apache.iotdb.commons.queryengine.plan.relational.utils.ResultColumnAppender; +import org.apache.iotdb.commons.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.relational.TableFunction; @@ -67,7 +67,7 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.apache.iotdb.commons.node_commons.plan.relational.utils.ResultColumnAppender.createResultColumnAppender; +import static org.apache.iotdb.commons.queryengine.plan.relational.utils.ResultColumnAppender.createResultColumnAppender; import static org.apache.iotdb.commons.udf.builtin.relational.tvf.WindowTVFUtils.findColumnIndex; public class ClassifyTableFunction implements TableFunction { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/ForecastTableFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/ForecastTableFunction.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/ForecastTableFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/ForecastTableFunction.java index 305091e00ea65..2465d9d1cf785 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/ForecastTableFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/ForecastTableFunction.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf; +package org.apache.iotdb.commons.queryengine.plan.relational.function.tvf; import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.utils.ResultColumnAppender; -import org.apache.iotdb.commons.node_commons.plan.udf.TableUDFUtils; +import org.apache.iotdb.commons.queryengine.plan.relational.utils.ResultColumnAppender; +import org.apache.iotdb.commons.queryengine.plan.udf.TableUDFUtils; import org.apache.iotdb.rpc.TSStatusCode; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.access.Record; @@ -66,9 +66,9 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.TableFunctionUtils.checkType; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.TableFunctionUtils.parseOptions; -import static org.apache.iotdb.commons.node_commons.plan.relational.utils.ResultColumnAppender.createResultColumnAppender; +import static org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.TableFunctionUtils.checkType; +import static org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.TableFunctionUtils.parseOptions; +import static org.apache.iotdb.commons.queryengine.plan.relational.utils.ResultColumnAppender.createResultColumnAppender; import static org.apache.iotdb.commons.udf.builtin.relational.tvf.WindowTVFUtils.findColumnIndex; public class ForecastTableFunction implements TableFunction { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/PatternMatchTableFunction.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/PatternMatchTableFunction.java index 4c2f522c5acfd..2eed80cb88059 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/PatternMatchTableFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/PatternMatchTableFunction.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf; +package org.apache.iotdb.commons.queryengine.plan.relational.function.tvf; -import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.QetchAlgorithm; -import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.MatchState; -import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.Point; -import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.RegexMatchState; -import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.Section; +import org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.QetchAlgorithm; +import org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model.MatchState; +import org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model.Point; +import org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model.RegexMatchState; +import org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model.Section; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.relational.TableFunction; import org.apache.iotdb.udf.api.relational.access.Record; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/TableFunctionUtils.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/TableFunctionUtils.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/TableFunctionUtils.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/TableFunctionUtils.java index 1946181142ab0..1cd225d68b312 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/TableFunctionUtils.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/TableFunctionUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf; +package org.apache.iotdb.commons.queryengine.plan.relational.function.tvf; import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/MatchConfig.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/MatchConfig.java similarity index 94% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/MatchConfig.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/MatchConfig.java index 04879ba6a26a7..37d8116d1fcf3 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/MatchConfig.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/MatchConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match; +package org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match; public class MatchConfig { // if the gap between new two points is larger than this times gap before, the new point diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/QetchAlgorithm.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/QetchAlgorithm.java index 51774f0fc8c64..8f290ee02d5fb 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/QetchAlgorithm.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/QetchAlgorithm.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match; +package org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match; -import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.MatchState; -import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.PatternSegment; -import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.Point; -import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.RegexMatchState; -import org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.Section; +import org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model.MatchState; +import org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model.PatternSegment; +import org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model.Point; +import org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model.RegexMatchState; +import org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model.Section; import java.util.ArrayDeque; import java.util.ArrayList; @@ -32,9 +32,9 @@ import java.util.List; import java.util.Queue; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.MatchConfig.GAP_TOLERANCE; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model.PatternSegment.tangent; +import static org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.MatchConfig.GAP_TOLERANCE; +import static org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; +import static org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model.PatternSegment.tangent; public class QetchAlgorithm { private int pointNum = -1; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/MatchState.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/MatchState.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/MatchState.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/MatchState.java index dda9e97addda6..b91b17519b6ce 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/MatchState.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/MatchState.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model; +package org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model; import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; +import static org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; public class MatchState { private double matchValue = 0.0; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/PatternSegment.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/PatternSegment.java index b006fe1a462d1..cff10d3ed8cfa 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/PatternSegment.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/PatternSegment.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model; +package org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model; import java.util.ArrayList; import java.util.List; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; +import static org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.MatchConfig.LINE_SECTION_TOLERANCE; public class PatternSegment { // variable area diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/Point.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/Point.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/Point.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/Point.java index a4484a7de5b5d..ee6b896b4313c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/Point.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/Point.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model; +package org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model; public class Point { public double x; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/RegexMatchState.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/RegexMatchState.java index b9c223525d1e2..211daebc0384a 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/RegexMatchState.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/RegexMatchState.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model; +package org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model; import java.util.ArrayDeque; import java.util.ArrayList; @@ -25,8 +25,8 @@ import java.util.Iterator; import java.util.List; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.MatchConfig.CALC_SE_USING_MORE_MEMORY; -import static org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; +import static org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.MatchConfig.CALC_SE_USING_MORE_MEMORY; +import static org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.MatchConfig.SHAPE_TOLERANCE; public class RegexMatchState { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/Section.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/Section.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/Section.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/Section.java index 979c4022d8bfd..bfd20b1e67fcc 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/function/tvf/match/model/Section.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/function/tvf/match/model/Section.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.function.tvf.match.model; +package org.apache.iotdb.commons.queryengine.plan.relational.function.tvf.match.model; import java.util.ArrayList; import java.util.HashMap; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ColumnMetadata.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/ColumnMetadata.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ColumnMetadata.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/ColumnMetadata.java index 7a370e933d816..cd33806516378 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ColumnMetadata.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/ColumnMetadata.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.metadata; +package org.apache.iotdb.commons.queryengine.plan.relational.metadata; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ColumnSchema.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/ColumnSchema.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ColumnSchema.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/ColumnSchema.java index 4a14fc8fc6a01..519fde8721356 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ColumnSchema.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/ColumnSchema.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.metadata; +package org.apache.iotdb.commons.queryengine.plan.relational.metadata; -import org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil; +import org.apache.iotdb.commons.queryengine.plan.relational.utils.TypeUtil; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/FunctionNullability.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/FunctionNullability.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/FunctionNullability.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/FunctionNullability.java index 51b8005a4928b..237b1cc73cef2 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/FunctionNullability.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/FunctionNullability.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.metadata; +package org.apache.iotdb.commons.queryengine.plan.relational.metadata; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ResolvedFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/ResolvedFunction.java similarity index 92% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ResolvedFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/ResolvedFunction.java index c2e51f81ed2b3..09a285a8b3537 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/ResolvedFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/ResolvedFunction.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.metadata; +package org.apache.iotdb.commons.queryengine.plan.relational.metadata; -import org.apache.iotdb.commons.node_commons.plan.relational.function.BoundSignature; -import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionId; -import org.apache.iotdb.commons.node_commons.plan.relational.function.FunctionKind; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.function.BoundSignature; +import org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionId; +import org.apache.iotdb.commons.queryengine.plan.relational.function.FunctionKind; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/TableSchema.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/TableSchema.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/TableSchema.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/TableSchema.java index b512623bb2e27..d7bfbcc19a2cf 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/metadata/TableSchema.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/metadata/TableSchema.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.metadata; +package org.apache.iotdb.commons.queryengine.plan.relational.metadata; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.type.InternalTypeManager; +import org.apache.iotdb.commons.queryengine.plan.relational.type.InternalTypeManager; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/Assignments.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/Assignments.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/Assignments.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/Assignments.java index 1593bb6439564..5374566055511 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/Assignments.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/Assignments.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner; +package org.apache.iotdb.commons.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/DataOrganizationSpecification.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/DataOrganizationSpecification.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/DataOrganizationSpecification.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/DataOrganizationSpecification.java index 28792b9f2836a..54a7e537a447b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/DataOrganizationSpecification.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/DataOrganizationSpecification.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner; +package org.apache.iotdb.commons.queryengine.plan.relational.planner; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/OrderingScheme.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/OrderingScheme.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/OrderingScheme.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/OrderingScheme.java index 43b45e863aef8..95a4503ef85a8 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/OrderingScheme.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/OrderingScheme.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner; +package org.apache.iotdb.commons.queryengine.plan.relational.planner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/SortOrder.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/SortOrder.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/SortOrder.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/SortOrder.java index a197d2476c791..1e9144903b128 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/SortOrder.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/SortOrder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner; +package org.apache.iotdb.commons.queryengine.plan.relational.planner; import static java.lang.String.format; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/Symbol.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/Symbol.java similarity index 91% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/Symbol.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/Symbol.java index a567b5599ebea..c96a7cd507207 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/Symbol.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/Symbol.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner; +package org.apache.iotdb.commons.queryengine.plan.relational.planner; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/iterative/GroupReference.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/iterative/GroupReference.java similarity index 82% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/iterative/GroupReference.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/iterative/GroupReference.java index d248f9732a91a..3ce2dff69284e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/iterative/GroupReference.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/iterative/GroupReference.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.iterative; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.iterative; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/AggregationNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/AggregationNode.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/AggregationNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/AggregationNode.java index 635a44b4667b5..610e77ff97ed4 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/AggregationNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/AggregationNode.java @@ -17,20 +17,20 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.expression.multi.FunctionType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.expression.multi.FunctionType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ApplyNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ApplyNode.java similarity index 91% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ApplyNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ApplyNode.java index dedfa8221a7ea..17908dc4d6337 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ApplyNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ApplyNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/AssignUniqueId.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/AssignUniqueId.java similarity index 81% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/AssignUniqueId.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/AssignUniqueId.java index 087ebcf5adf64..62452561bc3ac 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/AssignUniqueId.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/AssignUniqueId.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/CollectNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/CollectNode.java similarity index 85% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/CollectNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/CollectNode.java index 030f3e412dfe9..63c9040f6d319 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/CollectNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/CollectNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/CorrelatedJoinNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java similarity index 85% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/CorrelatedJoinNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java index 56633fbbdcfaf..3f76a779833f7 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/CorrelatedJoinNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/CorrelatedJoinNode.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/EnforceSingleRowNode.java similarity index 78% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/EnforceSingleRowNode.java index 811b59154092d..6447eebf32e1f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/EnforceSingleRowNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/EnforceSingleRowNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.Iterables; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ExceptNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ExceptNode.java similarity index 85% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ExceptNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ExceptNode.java index 8bd3add84b77e..268576e53e4ec 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ExceptNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ExceptNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ListMultimap; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/FillNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/FillNode.java similarity index 69% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/FillNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/FillNode.java index d6792161764b7..7076f1565cd3e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/FillNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/FillNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import java.util.List; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/FilterNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/FilterNode.java similarity index 80% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/FilterNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/FilterNode.java index ee2a01bdca147..3374f7826a7d1 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/FilterNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/FilterNode.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/GapFillNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/GapFillNode.java similarity index 90% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/GapFillNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/GapFillNode.java index d2831923b663c..1bc77eff2ad20 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/GapFillNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/GapFillNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/GroupNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/GroupNode.java similarity index 85% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/GroupNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/GroupNode.java index aca81beabe89f..a607b99070c34 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/GroupNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/GroupNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/IntersectNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/IntersectNode.java similarity index 85% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/IntersectNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/IntersectNode.java index 80c7e4b5759ac..f3e67f82eddf5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/IntersectNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/IntersectNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ListMultimap; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/JoinNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/JoinNode.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/JoinNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/JoinNode.java index c1694a074365c..8fb6aa44b5e3e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/JoinNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/JoinNode.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -46,8 +46,8 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.lang.String.format; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.EquiJoinClause.flipBatch; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.JoinNode.JoinType.INNER; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.EquiJoinClause.flipBatch; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.JoinNode.JoinType.INNER; public class JoinNode extends TwoChildProcessNode { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/LimitNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/LimitNode.java similarity index 82% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/LimitNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/LimitNode.java index fe5309d1d6f45..1f8991a32971d 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/LimitNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/LimitNode.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/LinearFillNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/LinearFillNode.java similarity index 88% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/LinearFillNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/LinearFillNode.java index 36a7bf2efb13d..9a2434ef51c87 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/LinearFillNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/LinearFillNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/MarkDistinctNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/MarkDistinctNode.java similarity index 88% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/MarkDistinctNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/MarkDistinctNode.java index 7c165c787a97d..541b50a2a38c4 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/MarkDistinctNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/MarkDistinctNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/Measure.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/Measure.java similarity index 92% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/Measure.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/Measure.java index b9962fddbc957..9a39d6c8b67d3 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/Measure.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/Measure.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.commons.node_commons.plan.relational.utils.TypeUtil; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.queryengine.plan.relational.utils.TypeUtil; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/MergeSortNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/MergeSortNode.java similarity index 85% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/MergeSortNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/MergeSortNode.java index bd281b4f01c40..bc293ee36c3f5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/MergeSortNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/MergeSortNode.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/OffsetNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/OffsetNode.java similarity index 81% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/OffsetNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/OffsetNode.java index 8de8636229a14..3b982191a7e07 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/OffsetNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/OffsetNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/OutputNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/OutputNode.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/OutputNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/OutputNode.java index e432a1c17b05c..40deff74e10ae 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/OutputNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/OutputNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/PatternRecognitionNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/PatternRecognitionNode.java similarity index 91% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/PatternRecognitionNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/PatternRecognitionNode.java index df0e7da70dcc4..8c6a3c8b5430a 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/PatternRecognitionNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/PatternRecognitionNode.java @@ -17,19 +17,19 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.ExpressionAndValuePointers; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrLabel; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrRowPattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.ExpressionAndValuePointers; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrLabel; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrRowPattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -47,7 +47,7 @@ import java.util.Set; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.node.RowsPerMatch.ONE; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.node.RowsPerMatch.ONE; public class PatternRecognitionNode extends SingleChildProcessNode { private final List partitionBy; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/PreviousFillNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/PreviousFillNode.java similarity index 90% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/PreviousFillNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/PreviousFillNode.java index ce7d444176ce7..36b66835d2d08 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/PreviousFillNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/PreviousFillNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.Iterables; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ProjectNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ProjectNode.java similarity index 82% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ProjectNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ProjectNode.java index 5f9f98a4d392e..d31a9bfee71dc 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ProjectNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ProjectNode.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Assignments; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Assignments; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/RowNumberNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/RowNumberNode.java similarity index 91% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/RowNumberNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/RowNumberNode.java index 6c5a04a77b4b5..a32ff34936d92 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/RowNumberNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/RowNumberNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/RowsPerMatch.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/RowsPerMatch.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/RowsPerMatch.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/RowsPerMatch.java index 5c666b9829f17..cdf1dab89590c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/RowsPerMatch.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/RowsPerMatch.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SemiJoinNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/SemiJoinNode.java similarity index 89% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SemiJoinNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/SemiJoinNode.java index 01aa85389abbe..a0af86af7e889 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SemiJoinNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/SemiJoinNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.TwoChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.TwoChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SetOperationNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/SetOperationNode.java similarity index 91% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SetOperationNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/SetOperationNode.java index f350764b046f4..34a0b13144f20 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SetOperationNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/SetOperationNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SkipToPosition.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/SkipToPosition.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SkipToPosition.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/SkipToPosition.java index f9824f851803c..c185a220807e5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SkipToPosition.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/SkipToPosition.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SortNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/SortNode.java similarity index 83% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SortNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/SortNode.java index 02add19e7bbb3..50fcedb312f0c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/SortNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/SortNode.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/StreamSortNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/StreamSortNode.java similarity index 86% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/StreamSortNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/StreamSortNode.java index 32bc1942faef3..05591c43848ad 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/StreamSortNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/StreamSortNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; import com.google.common.base.Objects; import com.google.common.collect.Iterables; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TableFunctionNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/TableFunctionNode.java similarity index 94% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TableFunctionNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/TableFunctionNode.java index f33b3566e5e37..223a5ea4d67d8 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TableFunctionNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/TableFunctionNode.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.function.TableFunctionFactory; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.function.TableFunctionFactory; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/TableFunctionProcessorNode.java similarity index 92% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/TableFunctionProcessorNode.java index 5d135711046bf..a6bb8c44e5f22 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TableFunctionProcessorNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/TableFunctionProcessorNode.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.function.TableFunctionFactory; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.function.TableFunctionFactory; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import org.apache.iotdb.udf.api.relational.table.TableFunctionHandle; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TopKNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/TopKNode.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TopKNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/TopKNode.java index 72c968c0e7107..843b1296865db 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TopKNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/TopKNode.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.MultiChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.MultiChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TopKRankingNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/TopKRankingNode.java similarity index 88% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TopKRankingNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/TopKRankingNode.java index eda5b6f40a0f8..36f775713fc0d 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/TopKRankingNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/TopKRankingNode.java @@ -17,16 +17,16 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/UnionNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/UnionNode.java similarity index 88% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/UnionNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/UnionNode.java index ac4f79993cc1b..28446f7e6a02d 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/UnionNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/UnionNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ValueFillNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ValueFillNode.java similarity index 81% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ValueFillNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ValueFillNode.java index dafe43909ad19..5fe3164fd9b4e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ValueFillNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ValueFillNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; import com.google.common.collect.Iterables; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ValuesNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ValuesNode.java similarity index 90% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ValuesNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ValuesNode.java index c38e4c99cbfc4..473282d41f0b9 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/ValuesNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/ValuesNode.java @@ -17,18 +17,18 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.source.SourceNode; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.source.SourceNode; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Row; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/WindowNode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/WindowNode.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/WindowNode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/WindowNode.java index c44a31b15ec9b..0fed9c83f640b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/node/WindowNode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/node/WindowNode.java @@ -17,21 +17,21 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.node; - -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.ICoreQueryPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.IPlanVisitor; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNode; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeId; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.PlanNodeType; -import org.apache.iotdb.commons.node_commons.plan.planner.plan.node.process.SingleChildProcessNode; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.DataOrganizationSpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.OrderingScheme; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.node; + +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.ICoreQueryPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.IPlanVisitor; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNode; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeType; +import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.process.SingleChildProcessNode; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.DataOrganizationSpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.OrderingScheme; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -55,9 +55,9 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.Iterables.concat; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_PRECEDING; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame.Type.RANGE; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound.Type.CURRENT_ROW; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound.Type.UNBOUNDED_PRECEDING; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame.Type.RANGE; public class WindowNode extends SingleChildProcessNode { private final Set prePartitionedInputs; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/AggregationLabelSet.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/AggregationLabelSet.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/AggregationLabelSet.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/AggregationLabelSet.java index d677b33d6476f..3dd30d2eb1b71 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/AggregationLabelSet.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/AggregationLabelSet.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/AggregationValuePointer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/AggregationValuePointer.java similarity index 94% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/AggregationValuePointer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/AggregationValuePointer.java index 3425bfaed1928..be45e067304bb 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/AggregationValuePointer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/AggregationValuePointer.java @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.ResolvedFunction; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.ResolvedFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ClassifierValuePointer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/ClassifierValuePointer.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ClassifierValuePointer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/ClassifierValuePointer.java index 73d39db351272..771fcc92ceb6a 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ClassifierValuePointer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/ClassifierValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java index 52d42be148fb5..d72d37fffe5e8 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/ExpressionAndValuePointers.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -35,7 +35,7 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral.TRUE_LITERAL; public class ExpressionAndValuePointers { public static final ExpressionAndValuePointers TRUE = diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrAlternation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrAlternation.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrAlternation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrAlternation.java index 82a02e457b760..17e38f05add89 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrAlternation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrAlternation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrAnchor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrAnchor.java similarity index 92% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrAnchor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrAnchor.java index e4b407d48fc0a..bca1237e38984 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrAnchor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrAnchor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; @@ -27,7 +27,7 @@ import java.util.Objects; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_START; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_START; public class IrAnchor extends IrRowPattern { public enum Type { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrConcatenation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrConcatenation.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrConcatenation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrConcatenation.java index 1b619ee94b806..f698f67840f93 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrConcatenation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrConcatenation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrEmpty.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrEmpty.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrEmpty.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrEmpty.java index 4dccac82dbad2..4a4b69d289b8e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrEmpty.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrEmpty.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrExclusion.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrExclusion.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrExclusion.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrExclusion.java index 7ff7a07952ee7..c9618e8f3c1cd 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrExclusion.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrExclusion.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrLabel.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrLabel.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrLabel.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrLabel.java index c2d2135159b23..e2bb562b1bff5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrLabel.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrLabel.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java index 71d5a6cbdaf9a..2080898706486 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrPatternAlternationOptimizer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import com.google.common.collect.ImmutableList; @@ -25,7 +25,7 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.toImmutableList; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; /** * Remove empty pattern from pattern alternation and replace it with quantification of a diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrPermutation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrPermutation.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrPermutation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrPermutation.java index 009b435c3cc90..3cf5b89ac9b5f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrPermutation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrPermutation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrQuantified.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrQuantified.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrQuantified.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrQuantified.java index 19af6c0fba57f..2a1f860e6fbd2 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrQuantified.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrQuantified.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrQuantifier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrQuantifier.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrQuantifier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrQuantifier.java index 8a52ad0d8fddb..7201d37f15089 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrQuantifier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrQuantifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrRowPattern.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrRowPattern.java index 4d0145c6d74a1..76e39ac15049f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrRowPattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPatternFlattener.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrRowPatternFlattener.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPatternFlattener.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrRowPatternFlattener.java index fcaaf05b918ed..21c049d59d6e7 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPatternFlattener.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrRowPatternFlattener.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import java.util.List; import java.util.Optional; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPatternVisitor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrRowPatternVisitor.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPatternVisitor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrRowPatternVisitor.java index 296918f14e31d..d435eb9914ea7 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/IrRowPatternVisitor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/IrRowPatternVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import javax.annotation.Nullable; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/LogicalIndexPointer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/LogicalIndexPointer.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/LogicalIndexPointer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/LogicalIndexPointer.java index 09c77cf4f14f9..ae3ff2864ad2c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/LogicalIndexPointer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/LogicalIndexPointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/MatchNumberValuePointer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/MatchNumberValuePointer.java similarity index 94% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/MatchNumberValuePointer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/MatchNumberValuePointer.java index d54036b41fd87..dce06d3f300f4 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/MatchNumberValuePointer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/MatchNumberValuePointer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/Patterns.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/Patterns.java similarity index 78% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/Patterns.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/Patterns.java index 71f8dfc61b47b..e362922e54623 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/Patterns.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/Patterns.java @@ -17,17 +17,17 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; import com.google.common.collect.ImmutableList; import java.util.Optional; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_END; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_START; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.oneOrMore; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrMore; -import static org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_END; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrAnchor.Type.PARTITION_START; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrQuantifier.oneOrMore; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrQuantifier.zeroOrMore; +import static org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern.IrQuantifier.zeroOrOne; public class Patterns { private Patterns() {} diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ScalarValuePointer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/ScalarValuePointer.java similarity index 94% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ScalarValuePointer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/ScalarValuePointer.java index 6953ba6d93f60..0a5895076c608 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ScalarValuePointer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/ScalarValuePointer.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; -import org.apache.iotdb.commons.node_commons.plan.relational.planner.Symbol; +import org.apache.iotdb.commons.queryengine.plan.relational.planner.Symbol; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ValuePointer.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/ValuePointer.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ValuePointer.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/ValuePointer.java index c871210ce9f8d..2d4db45203f57 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/planner/rowpattern/ValuePointer.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/planner/rowpattern/ValuePointer.java @@ -12,6 +12,6 @@ * limitations under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.planner.rowpattern; +package org.apache.iotdb.commons.queryengine.plan.relational.planner.rowpattern; public interface ValuePointer {} diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/security/Identity.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/security/Identity.java similarity index 94% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/security/Identity.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/security/Identity.java index fdf9e82e21f48..b71cec02f77f5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/security/Identity.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/security/Identity.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.security; +package org.apache.iotdb.commons.queryengine.plan.relational.security; import java.util.Objects; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AliasedRelation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AliasedRelation.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AliasedRelation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AliasedRelation.java index bd16888a7d94d..c92ff448b2330 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AliasedRelation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AliasedRelation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AllColumns.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AllColumns.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AllColumns.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AllColumns.java index 3b6268af11c04..92988b29feb31 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AllColumns.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AllColumns.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AllRows.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AllRows.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AllRows.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AllRows.java index 34e3e8344faea..fc194277672cd 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AllRows.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AllRows.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AnchorPattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AnchorPattern.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AnchorPattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AnchorPattern.java index 61967638469e2..c7de79fea9fd0 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AnchorPattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AnchorPattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ArithmeticBinaryExpression.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ArithmeticBinaryExpression.java index 9c365ba1c099d..1d38eb44261d3 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ArithmeticBinaryExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ArithmeticBinaryExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ArithmeticUnaryExpression.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ArithmeticUnaryExpression.java index 4d32dc8b0682f..8b2ed3ec77d58 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ArithmeticUnaryExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ArithmeticUnaryExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AstMemoryEstimationHelper.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AstMemoryEstimationHelper.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java index e25751c35263e..7c39b6bb289fc 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/AstMemoryEstimationHelper.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/AstMemoryEstimationHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.Accountable; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BetweenPredicate.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/BetweenPredicate.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BetweenPredicate.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/BetweenPredicate.java index c3a1d5f06bcb8..d301b7f842b6e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BetweenPredicate.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/BetweenPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BinaryLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/BinaryLiteral.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BinaryLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/BinaryLiteral.java index da68533b12a2a..c24361269630e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BinaryLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/BinaryLiteral.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.parser.ParsingException; import com.google.common.base.CharMatcher; import com.google.common.io.BaseEncoding; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BooleanLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/BooleanLiteral.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BooleanLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/BooleanLiteral.java index 98a2d91aa7ae3..4ba420bee0b66 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/BooleanLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/BooleanLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Cast.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Cast.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Cast.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Cast.java index 449fa37b98764..6b7d15dfc0e21 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Cast.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Cast.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CoalesceExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CoalesceExpression.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CoalesceExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CoalesceExpression.java index 9757d18218bef..e6dff6dca5912 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CoalesceExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CoalesceExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Columns.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Columns.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Columns.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Columns.java index 9adef260c9e71..2ececfd8d19c2 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Columns.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Columns.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CommonQueryAstVisitor.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CommonQueryAstVisitor.java index 7b8f8b5e93bf7..501c308a9b1b5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CommonQueryAstVisitor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CommonQueryAstVisitor.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ComparisonExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ComparisonExpression.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ComparisonExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ComparisonExpression.java index 1ac69c24b4bba..5cb892f95755c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ComparisonExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ComparisonExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentDatabase.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CurrentDatabase.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentDatabase.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CurrentDatabase.java index 91f77fa271c95..bb92937b29b52 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentDatabase.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CurrentDatabase.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentTime.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CurrentTime.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentTime.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CurrentTime.java index 3f3b5136dd7cc..28df3b23bf4fc 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentTime.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CurrentTime.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentUser.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CurrentUser.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentUser.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CurrentUser.java index 44e29efd487e0..a3a767dc46e00 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/CurrentUser.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/CurrentUser.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DataType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DataType.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DataType.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DataType.java index 9498e3697cc05..80a836fa208ed 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DataType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DataType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DataTypeParameter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DataTypeParameter.java similarity index 94% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DataTypeParameter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DataTypeParameter.java index da0455a08a141..f366931dd992c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DataTypeParameter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DataTypeParameter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DecimalLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DecimalLiteral.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DecimalLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DecimalLiteral.java index 7dd1c07780954..1ea253369575e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DecimalLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DecimalLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DereferenceExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DereferenceExpression.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DereferenceExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DereferenceExpression.java index 7cbd434eb12ad..052741f26b2ce 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DereferenceExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DereferenceExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DoubleLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DoubleLiteral.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DoubleLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DoubleLiteral.java index 3ab9dbf484a86..f0481473684be 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/DoubleLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/DoubleLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/EmptyPattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/EmptyPattern.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/EmptyPattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/EmptyPattern.java index 172c2fc137954..d9c017983edfc 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/EmptyPattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/EmptyPattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Except.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Except.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Except.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Except.java index 8ecbc43e0efe1..d9ad587f6e9b2 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Except.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Except.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ExcludedPattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ExcludedPattern.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ExcludedPattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ExcludedPattern.java index 54710330d8049..672e78c405dc5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ExcludedPattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ExcludedPattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ExistsPredicate.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ExistsPredicate.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ExistsPredicate.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ExistsPredicate.java index 8069303829cf0..c5849adbf6362 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ExistsPredicate.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ExistsPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Expression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Expression.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Expression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Expression.java index 36cd5a674c5b8..e5643692e89a4 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Expression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Expression.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.util.ExpressionFormatter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.util.ExpressionFormatter; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Extract.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Extract.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Extract.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Extract.java index 984d79253afa7..ee8771ee1cd86 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Extract.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Extract.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.Immutable; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FieldReference.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/FieldReference.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FieldReference.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/FieldReference.java index 9fb22519a67e2..8f6d1ec997a75 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FieldReference.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/FieldReference.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Fill.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Fill.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Fill.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Fill.java index 12e2932d7fb92..c544b2eac7e8d 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Fill.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Fill.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; +import org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FloatLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/FloatLiteral.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FloatLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/FloatLiteral.java index 93bae4dd6fc68..c0bfd41e0f607 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FloatLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/FloatLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FrameBound.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/FrameBound.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FrameBound.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/FrameBound.java index 8245d2aab2aac..50e70a2610d19 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FrameBound.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/FrameBound.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FunctionCall.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/FunctionCall.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FunctionCall.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/FunctionCall.java index 90b5045c07726..68a6aa3a50c4b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/FunctionCall.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/FunctionCall.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GenericDataType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GenericDataType.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GenericDataType.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GenericDataType.java index 697bee780b904..c1e7e97759592 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GenericDataType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GenericDataType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GenericLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GenericLiteral.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GenericLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GenericLiteral.java index 62e72a1e6d08e..073be944d6bb9 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GenericLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GenericLiteral.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupBy.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GroupBy.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupBy.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GroupBy.java index c972a3de6316e..9a22e84243481 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupBy.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GroupBy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupingElement.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GroupingElement.java similarity index 94% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupingElement.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GroupingElement.java index 4cf1704a09c45..44de910504346 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupingElement.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GroupingElement.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import java.util.List; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupingSets.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GroupingSets.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupingSets.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GroupingSets.java index ae07f2b893ff2..31cf494a9a1d6 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/GroupingSets.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/GroupingSets.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IAstVisitor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/IAstVisitor.java similarity index 89% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IAstVisitor.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/IAstVisitor.java index 82bb186dc0103..98e887cc6bcd5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IAstVisitor.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/IAstVisitor.java @@ -12,6 +12,6 @@ * limitations under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; public interface IAstVisitor {} diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Identifier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Identifier.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Identifier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Identifier.java index 0ba70c1e440c9..7c492c641ca96 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Identifier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Identifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.base.CharMatcher; import com.google.common.base.Strings; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IfExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/IfExpression.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IfExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/IfExpression.java index 649e8d05c7d69..ca3d7cf8a01d1 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IfExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/IfExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/InListExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/InListExpression.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/InListExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/InListExpression.java index 8df66af98ae5a..9b7ea4a3e5877 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/InListExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/InListExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/InPredicate.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/InPredicate.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/InPredicate.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/InPredicate.java index 28311e5f8fe22..976f0d25a9dff 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/InPredicate.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/InPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Intersect.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Intersect.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Intersect.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Intersect.java index 67f887aeecbdb..cbe31fee92bc2 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Intersect.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Intersect.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/IsNotNullPredicate.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/IsNotNullPredicate.java index fdde84442e91b..2578710096a5f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IsNotNullPredicate.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/IsNotNullPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IsNullPredicate.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/IsNullPredicate.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IsNullPredicate.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/IsNullPredicate.java index 96cb7d905a239..ad52b29ce8a41 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/IsNullPredicate.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/IsNullPredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Join.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Join.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Join.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Join.java index 252d3812b9918..2aaadc2d1bb1b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Join.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Join.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinCriteria.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/JoinCriteria.java similarity index 94% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinCriteria.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/JoinCriteria.java index 705644ebb1180..2c28696cfc8b0 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinCriteria.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/JoinCriteria.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinOn.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/JoinOn.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinOn.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/JoinOn.java index ed9d5c2f50aa6..4cc5e60f1d5cf 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinOn.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/JoinOn.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinUsing.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/JoinUsing.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinUsing.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/JoinUsing.java index 58ca5430dd71b..8121280f87f4e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/JoinUsing.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/JoinUsing.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LikePredicate.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/LikePredicate.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LikePredicate.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/LikePredicate.java index fa8ae5a2f4f31..0db19609b5a32 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LikePredicate.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/LikePredicate.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Limit.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Limit.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Limit.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Limit.java index 4af648658810d..1f16efb24308d 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Limit.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Limit.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Literal.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Literal.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Literal.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Literal.java index 69b3b0529dbd8..2de498b28b42c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Literal.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Literal.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LogicalExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/LogicalExpression.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LogicalExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/LogicalExpression.java index e747d8462bc85..13a5400339524 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LogicalExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/LogicalExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LongLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/LongLiteral.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LongLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/LongLiteral.java index 8933c12d09ef8..461683c424091 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/LongLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/LongLiteral.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.tsfile.utils.RamUsageEstimator; import org.apache.tsfile.utils.ReadWriteIOUtils; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/MeasureDefinition.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/MeasureDefinition.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/MeasureDefinition.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/MeasureDefinition.java index 168cb8d0ff66b..b99e25270ce06 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/MeasureDefinition.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/MeasureDefinition.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NaturalJoin.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NaturalJoin.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NaturalJoin.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NaturalJoin.java index af48799f8aa8e..b8afddd75542f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NaturalJoin.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NaturalJoin.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Node.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Node.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Node.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Node.java index 7a6f81c262782..f28a252c0a883 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Node.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Node.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.Accountable; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NodeLocation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NodeLocation.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NodeLocation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NodeLocation.java index dac4e4c4213e7..c634ac27fc04c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NodeLocation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NodeLocation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import java.util.Objects; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NotExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NotExpression.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NotExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NotExpression.java index ee4f7c48b22a8..09f35a2fdf0a6 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NotExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NotExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NullIfExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NullIfExpression.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NullIfExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NullIfExpression.java index 39c18f126180f..564954920b349 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NullIfExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NullIfExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NullLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NullLiteral.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NullLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NullLiteral.java index 6e1e90d2311f6..ff305bbc9f051 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NullLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NullLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NumericParameter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NumericParameter.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NumericParameter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NumericParameter.java index e27241c98b3d9..842fd795d7e49 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/NumericParameter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/NumericParameter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Offset.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Offset.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Offset.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Offset.java index b2885a2ae6371..3a4ed9f81283d 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Offset.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Offset.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/OneOrMoreQuantifier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/OneOrMoreQuantifier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java index 99ee7234b256a..14531c88748cc 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/OneOrMoreQuantifier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/OneOrMoreQuantifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/OrderBy.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/OrderBy.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/OrderBy.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/OrderBy.java index 96029d40e4462..6a83489342b7a 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/OrderBy.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/OrderBy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Parameter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Parameter.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Parameter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Parameter.java index 39da7cf9a70ed..bc0d7f02ca976 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Parameter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Parameter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternAlternation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternAlternation.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternAlternation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternAlternation.java index 52d18a9023580..98940ef838e33 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternAlternation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternAlternation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternConcatenation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternConcatenation.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternConcatenation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternConcatenation.java index 889aa2d01bae0..bc380cec48f45 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternConcatenation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternConcatenation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternPermutation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternPermutation.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternPermutation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternPermutation.java index 060d2d80f576f..a1467daa5e8a5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternPermutation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternPermutation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternQuantifier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternQuantifier.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternQuantifier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternQuantifier.java index e53632be90d3c..fd30c6f64284b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternQuantifier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternQuantifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternRecognitionRelation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternRecognitionRelation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java index 8e2cfd4c662fd..91d8569b68786 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternRecognitionRelation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternRecognitionRelation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternVariable.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternVariable.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternVariable.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternVariable.java index 94c1da36173ba..8ca766fc9d1ac 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/PatternVariable.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/PatternVariable.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ProcessingMode.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ProcessingMode.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ProcessingMode.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ProcessingMode.java index c5768e071c8c7..2cecdee607ce3 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ProcessingMode.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ProcessingMode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QualifiedName.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QualifiedName.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QualifiedName.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QualifiedName.java index ed6f7065e17df..4f5cc295f2595 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QualifiedName.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QualifiedName.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuantifiedComparisonExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuantifiedComparisonExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java index 444157804c165..f724c4db709cf 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuantifiedComparisonExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QuantifiedComparisonExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuantifiedPattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QuantifiedPattern.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuantifiedPattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QuantifiedPattern.java index 55636978699dd..b3145f3f69fe5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuantifiedPattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QuantifiedPattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Query.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Query.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Query.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Query.java index 5de7f23b5b33c..2e29e85c399eb 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Query.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Query.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; -import org.apache.iotdb.commons.node_commons.utils.cte.CteDataStore; +import org.apache.iotdb.commons.queryengine.utils.cte.CteDataStore; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QueryBody.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QueryBody.java similarity index 94% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QueryBody.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QueryBody.java index dda26be51c8f7..e59d277ea023f 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QueryBody.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QueryBody.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuerySpecification.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QuerySpecification.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuerySpecification.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QuerySpecification.java index a100aeac73b1f..28489a91bbcc6 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/QuerySpecification.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/QuerySpecification.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/RangeQuantifier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/RangeQuantifier.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/RangeQuantifier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/RangeQuantifier.java index fb7a6f8bad7ba..560b6cef40344 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/RangeQuantifier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/RangeQuantifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Relation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Relation.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Relation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Relation.java index 9732901b6121c..6d8522f90d873 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Relation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Relation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; public abstract class Relation extends Node { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Row.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Row.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Row.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Row.java index d340051ee77a2..4670908983c07 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Row.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Row.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/RowPattern.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/RowPattern.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/RowPattern.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/RowPattern.java index 4e1758e9faf64..7439ce188cbe2 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/RowPattern.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/RowPattern.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; public abstract class RowPattern extends Node { protected RowPattern(NodeLocation location) { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SearchedCaseExpression.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SearchedCaseExpression.java index 22533a1e17110..e4d123d136880 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SearchedCaseExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SearchedCaseExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.external.commons.lang3.Validate; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Select.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Select.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Select.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Select.java index eeb8858d6cb29..300524043ceba 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Select.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Select.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SelectItem.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SelectItem.java similarity index 92% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SelectItem.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SelectItem.java index 85a58478d61cd..777c95da3f854 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SelectItem.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SelectItem.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; public abstract class SelectItem extends Node { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SetOperation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SetOperation.java similarity index 94% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SetOperation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SetOperation.java index 11e3e952d216b..41f4eb576e211 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SetOperation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SetOperation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import java.util.List; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java index bd0b5b6999218..cce24b7bce0e1 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SimpleCaseExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SimpleCaseExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.external.commons.lang3.Validate; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SimpleGroupBy.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SimpleGroupBy.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SimpleGroupBy.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SimpleGroupBy.java index ef546f50f018b..c9c84bc423cd2 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SimpleGroupBy.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SimpleGroupBy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SingleColumn.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SingleColumn.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SingleColumn.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SingleColumn.java index 0d15231b58191..97f377cafd747 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SingleColumn.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SingleColumn.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SkipTo.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SkipTo.java similarity index 90% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SkipTo.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SkipTo.java index 50996b8158970..1a2768b6e28c0 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SkipTo.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SkipTo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -29,10 +29,10 @@ import static com.google.common.base.MoreObjects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.Position.FIRST; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.Position.LAST; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.Position.NEXT; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SkipTo.Position.PAST_LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SkipTo.Position.FIRST; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SkipTo.Position.LAST; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SkipTo.Position.NEXT; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SkipTo.Position.PAST_LAST; public class SkipTo extends Node { private static final long INSTANCE_SIZE = RamUsageEstimator.shallowSizeOfInstance(SkipTo.class); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SortItem.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SortItem.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SortItem.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SortItem.java index 3691d885c17f1..c9a4bb7bfdb35 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SortItem.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SortItem.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Statement.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Statement.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Statement.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Statement.java index a8ce86b26b7e2..8b8c37eadb83e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Statement.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Statement.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import javax.annotation.Nullable; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/StringLiteral.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/StringLiteral.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/StringLiteral.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/StringLiteral.java index 256d987ad866e..9550da25a8d46 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/StringLiteral.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/StringLiteral.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SubqueryExpression.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SubqueryExpression.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SubqueryExpression.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SubqueryExpression.java index b0319587d3ba3..f5bb7c52bfd9e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SubqueryExpression.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SubqueryExpression.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SubsetDefinition.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SubsetDefinition.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SubsetDefinition.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SubsetDefinition.java index 7be25c6692f67..ba5c506ce9c45 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SubsetDefinition.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SubsetDefinition.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SymbolReference.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SymbolReference.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SymbolReference.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SymbolReference.java index df2fc79fc0ee5..74fca5d8fc949 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/SymbolReference.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/SymbolReference.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Table.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Table.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Table.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Table.java index c9c765cd23184..5909dc8af52e0 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Table.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Table.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableExpressionType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableExpressionType.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableExpressionType.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableExpressionType.java index 7a4f2d299fed6..61d79605d99f0 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableExpressionType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableExpressionType.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; public enum TableExpressionType { ARITHMETIC_BINARY((short) 1), diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionArgument.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableFunctionArgument.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionArgument.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableFunctionArgument.java index 1496c2f635115..2175fcac60a04 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionArgument.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableFunctionArgument.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionInvocation.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionInvocation.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java index 979015ded2c34..687b331c3e8af 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionInvocation.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableFunctionInvocation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionTableArgument.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionTableArgument.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java index edac4264ecc49..5c176f2f5d6b2 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableFunctionTableArgument.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableFunctionTableArgument.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; @@ -28,7 +28,7 @@ import java.util.stream.Collectors; import static java.util.Objects.requireNonNull; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.util.ExpressionFormatter.formatSortItems; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.util.ExpressionFormatter.formatSortItems; public class TableFunctionTableArgument extends Node { private static final long INSTANCE_SIZE = diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableSubquery.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableSubquery.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableSubquery.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableSubquery.java index 2ddcff26bd8f3..4c5968a23cfa5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TableSubquery.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TableSubquery.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Trim.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Trim.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Trim.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Trim.java index e9ef649bafdf2..2be6af1fda8b9 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Trim.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Trim.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TypeParameter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TypeParameter.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TypeParameter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TypeParameter.java index 4174a6403a8ac..4e27dddb3bdab 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/TypeParameter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/TypeParameter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Union.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Union.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Union.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Union.java index 158ced1cde303..b99e7fd45a316 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Union.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Union.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Values.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Values.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Values.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Values.java index d59cde8471e3d..5e6e094dbe72b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Values.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Values.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/VariableDefinition.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/VariableDefinition.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/VariableDefinition.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/VariableDefinition.java index 02f3a42254196..4a42a13f506e5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/VariableDefinition.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/VariableDefinition.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WhenClause.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WhenClause.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WhenClause.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WhenClause.java index 23370cbd2ec94..666dc9626c32c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WhenClause.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WhenClause.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Window.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Window.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Window.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Window.java index d1d5959dce813..aa885f0274e18 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/Window.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/Window.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import java.io.DataOutputStream; import java.io.IOException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowDefinition.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WindowDefinition.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowDefinition.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WindowDefinition.java index 2d31964d907c1..b72033e403bfe 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowDefinition.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WindowDefinition.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowFrame.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WindowFrame.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowFrame.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WindowFrame.java index f326b6998fdee..20134c5b1cd18 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowFrame.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WindowFrame.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowReference.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WindowReference.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowReference.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WindowReference.java index b2a8b2fd6118b..a086a644c934c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowReference.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WindowReference.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowSpecification.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WindowSpecification.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowSpecification.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WindowSpecification.java index d9a7ab7cfa949..715e867fd177b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WindowSpecification.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WindowSpecification.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/With.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/With.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/With.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/With.java index fda32ab98a705..86d8dd4994138 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/With.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/With.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WithQuery.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WithQuery.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WithQuery.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WithQuery.java index 05b945e443ba0..a0b4f78d6f5e7 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/WithQuery.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/WithQuery.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import com.google.common.collect.ImmutableList; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ZeroOrMoreQuantifier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ZeroOrMoreQuantifier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java index d2a5064b7c504..6963b1b9b1a30 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ZeroOrMoreQuantifier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ZeroOrMoreQuantifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ZeroOrOneQuantifier.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ZeroOrOneQuantifier.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java index b1124c86994e3..68449b1d79cee 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/ast/ZeroOrOneQuantifier.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/ast/ZeroOrOneQuantifier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.ast; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.ast; import org.apache.tsfile.utils.RamUsageEstimator; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/parser/CaseInsensitiveStream.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/parser/CaseInsensitiveStream.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/parser/CaseInsensitiveStream.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/parser/CaseInsensitiveStream.java index 9640eab83c426..4c3dc8c17b996 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/parser/CaseInsensitiveStream.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/parser/CaseInsensitiveStream.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.parser; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.parser; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.IntStream; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/parser/ParsingException.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/parser/ParsingException.java similarity index 92% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/parser/ParsingException.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/parser/ParsingException.java index 9968c9ff5a5cf..f42b61545b08b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/parser/ParsingException.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/parser/ParsingException.java @@ -17,9 +17,9 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.parser; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.parser; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NodeLocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NodeLocation; import org.antlr.v4.runtime.RecognitionException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/CommonQuerySqlFormatter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java similarity index 85% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/CommonQuerySqlFormatter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java index c6c5af93728a7..0869dbb309aef 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/CommonQuerySqlFormatter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/util/CommonQuerySqlFormatter.java @@ -17,43 +17,43 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.util; - -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AliasedRelation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Except; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Fill; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Intersect; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Join; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinCriteria; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinOn; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.JoinUsing; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Limit; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NaturalJoin; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Offset; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternRecognitionRelation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Query; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuerySpecification; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Relation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Select; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SingleColumn; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Table; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionArgument; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionInvocation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableFunctionTableArgument; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TableSubquery; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Union; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Values; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WithQuery; -import org.apache.iotdb.commons.node_commons.plan.statement.component.FillPolicy; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.util; + +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AliasedRelation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Except; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Fill; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Intersect; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Join; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinCriteria; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinOn; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.JoinUsing; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Limit; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NaturalJoin; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Offset; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternRecognitionRelation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Query; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuerySpecification; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Relation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Select; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SingleColumn; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Table; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableFunctionArgument; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableFunctionInvocation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableFunctionTableArgument; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TableSubquery; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Union; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Values; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WithQuery; +import org.apache.iotdb.commons.queryengine.plan.statement.component.FillPolicy; import com.google.common.base.Joiner; import com.google.common.base.Strings; @@ -68,8 +68,8 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.joining; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.util.ExpressionFormatter.formatOrderBy; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.util.RowPatternFormatter.formatPattern; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.util.ExpressionFormatter.formatOrderBy; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.util.RowPatternFormatter.formatPattern; public class CommonQuerySqlFormatter implements CommonQueryAstVisitor { @@ -404,7 +404,7 @@ public Void visitQuerySpecification(QuerySpecification node, Integer indent) { indent, "GROUP BY " + (groupBy.isDistinct() ? " DISTINCT " : "") - + org.apache.iotdb.commons.node_commons.plan.relational.sql.util + + org.apache.iotdb.commons.queryengine.plan.relational.sql.util .ExpressionFormatter.formatGroupBy(groupBy.getGroupingElements())) .append('\n')); @@ -426,7 +426,7 @@ public Void visitSelect(Select node, Integer indent) { if (node.getSelectItems().size() > 1) { boolean first = true; - for (org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SelectItem item : + for (org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SelectItem item : node.getSelectItems()) { builder.append("\n").append(indentString(indent)).append(first ? " " : ", "); process(item, indent); @@ -597,7 +597,7 @@ public Void visitPatternRecognitionRelation(PatternRecognitionRelation node, Int .append( node.getPartitionBy().stream() .map( - org.apache.iotdb.commons.node_commons.plan.relational.sql.util + org.apache.iotdb.commons.queryengine.plan.relational.sql.util .ExpressionFormatter ::formatExpression) .collect(joining(", "))) @@ -680,7 +680,7 @@ public Void visitPatternRecognitionRelation(PatternRecognitionRelation node, Int + " = " + subset.getIdentifiers().stream() .map( - org.apache.iotdb.commons.node_commons.plan.relational.sql.util + org.apache.iotdb.commons.queryengine.plan.relational.sql.util .ExpressionFormatter ::formatExpression) .collect(joining(", ", "(", ")"))) diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/ExpressionFormatter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/util/ExpressionFormatter.java similarity index 81% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/ExpressionFormatter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/util/ExpressionFormatter.java index 37092ab618849..655e1973af697 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/ExpressionFormatter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/util/ExpressionFormatter.java @@ -17,71 +17,71 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.util; - -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllColumns; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AllRows; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticBinaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ArithmeticUnaryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BetweenPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BinaryLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.BooleanLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Cast; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CoalesceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Columns; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentDatabase; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentTime; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CurrentUser; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DecimalLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DereferenceExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DoubleLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExistsPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Expression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Extract; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FieldReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FloatLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FrameBound; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.FunctionCall; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingElement; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GroupingSets; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InListExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.InPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNotNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.IsNullPredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LikePredicate; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Literal; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LogicalExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.LongLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NotExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullIfExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NullLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NumericParameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OrderBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Parameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QualifiedName; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedComparisonExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Row; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SearchedCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleCaseExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SimpleGroupBy; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SortItem; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.StringLiteral; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SubqueryExpression; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.SymbolReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Trim; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TypeParameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WhenClause; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Window; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowFrame; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowReference; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.WindowSpecification; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.util; + +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AllColumns; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AllRows; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticBinaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BetweenPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BinaryLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.BooleanLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Cast; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CoalesceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Columns; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentDatabase; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentTime; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CurrentUser; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DecimalLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DereferenceExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DoubleLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExistsPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Expression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Extract; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FieldReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FloatLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FrameBound; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.FunctionCall; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupingElement; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GroupingSets; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InListExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.InPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNotNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.IsNullPredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LikePredicate; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Literal; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LogicalExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.LongLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NotExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullIfExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NullLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OrderBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Parameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QualifiedName; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedComparisonExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Row; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SearchedCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleCaseExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SimpleGroupBy; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SortItem; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.StringLiteral; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SubqueryExpression; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.SymbolReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Trim; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WhenClause; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Window; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowFrame; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowReference; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.WindowSpecification; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; @@ -98,8 +98,8 @@ import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.util.CommonQuerySqlFormatter.formatName; -import static org.apache.iotdb.commons.node_commons.plan.relational.sql.util.ReservedIdentifiers.reserved; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.util.CommonQuerySqlFormatter.formatName; +import static org.apache.iotdb.commons.queryengine.plan.relational.sql.util.ReservedIdentifiers.reserved; import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN; public final class ExpressionFormatter { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/ReservedIdentifiers.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/util/ReservedIdentifiers.java similarity index 91% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/ReservedIdentifiers.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/util/ReservedIdentifiers.java index a09824ff04d45..e7fd081dce24e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/ReservedIdentifiers.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/util/ReservedIdentifiers.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.util; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.util; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.CaseInsensitiveStream; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.parser.ParsingException; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.parser.CaseInsensitiveStream; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.parser.ParsingException; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlLexer; import org.apache.iotdb.db.relational.grammar.sql.RelationalSqlParser; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/RowPatternFormatter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/util/RowPatternFormatter.java similarity index 75% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/RowPatternFormatter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/util/RowPatternFormatter.java index 1ce3643c29edb..33d795065b7e0 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/sql/util/RowPatternFormatter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/sql/util/RowPatternFormatter.java @@ -17,23 +17,23 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.sql.util; - -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.AnchorPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.CommonQueryAstVisitor; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.EmptyPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ExcludedPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Node; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.OneOrMoreQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternAlternation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternConcatenation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternPermutation; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.PatternVariable; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.QuantifiedPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RangeQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.RowPattern; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ZeroOrMoreQuantifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.ZeroOrOneQuantifier; +package org.apache.iotdb.commons.queryengine.plan.relational.sql.util; + +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.AnchorPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.CommonQueryAstVisitor; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.EmptyPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ExcludedPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Node; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.OneOrMoreQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternAlternation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternConcatenation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternPermutation; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.PatternVariable; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.QuantifiedPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RangeQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.RowPattern; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ZeroOrMoreQuantifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.ZeroOrOneQuantifier; import static java.util.stream.Collectors.joining; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/InternalTypeManager.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/InternalTypeManager.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/InternalTypeManager.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/InternalTypeManager.java index ede1253b2e992..c3d2fcd880fc9 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/InternalTypeManager.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/InternalTypeManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.type; +package org.apache.iotdb.commons.queryengine.plan.relational.type; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.type.Type; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/NamedTypeSignature.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/NamedTypeSignature.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/NamedTypeSignature.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/NamedTypeSignature.java index 50ddc76c936e9..63b1436e578b8 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/NamedTypeSignature.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/NamedTypeSignature.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.type; +package org.apache.iotdb.commons.queryengine.plan.relational.type; import com.google.errorprone.annotations.Immutable; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/ParameterKind.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/ParameterKind.java similarity index 92% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/ParameterKind.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/ParameterKind.java index b8127002af25f..fabb735ef3c7d 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/ParameterKind.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/ParameterKind.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.type; +package org.apache.iotdb.commons.queryengine.plan.relational.type; public enum ParameterKind { TYPE, diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/RowFieldName.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/RowFieldName.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/RowFieldName.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/RowFieldName.java index eb5c4fbfe5078..18df01e3e24c6 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/RowFieldName.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/RowFieldName.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.type; +package org.apache.iotdb.commons.queryengine.plan.relational.type; import com.google.errorprone.annotations.Immutable; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/StandardTypes.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/StandardTypes.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/StandardTypes.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/StandardTypes.java index 88e34c785da3b..3edcab8654fc5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/StandardTypes.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/StandardTypes.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.type; +package org.apache.iotdb.commons.queryengine.plan.relational.type; public class StandardTypes { public static final String BIGINT = "bigint"; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeId.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeId.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeId.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeId.java index ca522a6d5308f..4340249f49415 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeId.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeId.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.type; +package org.apache.iotdb.commons.queryengine.plan.relational.type; import java.util.Objects; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeManager.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeManager.java similarity index 87% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeManager.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeManager.java index b499a039cdc32..0ad32a60615c8 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeManager.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeManager.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.type; +package org.apache.iotdb.commons.queryengine.plan.relational.type; import org.apache.tsfile.read.common.type.Type; @@ -25,7 +25,7 @@ public interface TypeManager { /** * Gets the type with the specified signature. * - * @throws org.apache.iotdb.commons.node_commons.plan.relational.type.TypeNotFoundException if not + * @throws org.apache.iotdb.commons.queryengine.plan.relational.type.TypeNotFoundException if not * found */ Type getType(TypeSignature signature); diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeNotFoundException.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeNotFoundException.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeNotFoundException.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeNotFoundException.java index 18a44e2ff12c0..9d3460b9488cd 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeNotFoundException.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeNotFoundException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.type; +package org.apache.iotdb.commons.queryengine.plan.relational.type; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignature.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeSignature.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignature.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeSignature.java index 65ff6f2577ce7..f848c665e485c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignature.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeSignature.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.type; +package org.apache.iotdb.commons.queryengine.plan.relational.type; import com.google.errorprone.annotations.FormatMethod; import com.google.errorprone.annotations.Immutable; @@ -31,8 +31,8 @@ import static java.lang.String.format; import static java.util.Arrays.asList; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.StandardTypes.TIME_WITH_TIME_ZONE; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureParameter.typeParameter; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.StandardTypes.TIME_WITH_TIME_ZONE; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureParameter.typeParameter; @Immutable public class TypeSignature { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignatureParameter.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeSignatureParameter.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignatureParameter.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeSignatureParameter.java index 04504df2e7128..2a55d4f1c7294 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignatureParameter.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeSignatureParameter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.type; +package org.apache.iotdb.commons.queryengine.plan.relational.type; import com.google.errorprone.annotations.Immutable; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignatureTranslator.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeSignatureTranslator.java similarity index 81% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignatureTranslator.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeSignatureTranslator.java index 275e345f43c38..fec8adba91539 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/type/TypeSignatureTranslator.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/type/TypeSignatureTranslator.java @@ -17,15 +17,15 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.type; +package org.apache.iotdb.commons.queryengine.plan.relational.type; import org.apache.iotdb.commons.exception.SemanticException; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.DataTypeParameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.GenericDataType; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.Identifier; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.NumericParameter; -import org.apache.iotdb.commons.node_commons.plan.relational.sql.ast.TypeParameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.DataTypeParameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.GenericDataType; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.Identifier; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.NumericParameter; +import org.apache.iotdb.commons.queryengine.plan.relational.sql.ast.TypeParameter; import com.google.common.collect.ImmutableList; import org.apache.tsfile.read.common.type.Type; @@ -35,9 +35,9 @@ import java.util.Set; import static com.google.common.base.Preconditions.checkArgument; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureParameter.numericParameter; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureParameter.typeParameter; -import static org.apache.iotdb.commons.node_commons.plan.relational.type.TypeSignatureParameter.typeVariable; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureParameter.numericParameter; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureParameter.typeParameter; +import static org.apache.iotdb.commons.queryengine.plan.relational.type.TypeSignatureParameter.typeVariable; public class TypeSignatureTranslator { diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/utils/ResultColumnAppender.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/utils/ResultColumnAppender.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/utils/ResultColumnAppender.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/utils/ResultColumnAppender.java index 9d791f6f3c433..57e86fd137be7 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/utils/ResultColumnAppender.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/utils/ResultColumnAppender.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.utils; +package org.apache.iotdb.commons.queryengine.plan.relational.utils; import org.apache.iotdb.udf.api.relational.access.Record; import org.apache.iotdb.udf.api.type.Type; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/utils/TypeUtil.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/utils/TypeUtil.java similarity index 96% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/utils/TypeUtil.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/utils/TypeUtil.java index 44ea64086c2a2..e9255b3071bdb 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/relational/utils/TypeUtil.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/relational/utils/TypeUtil.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.relational.utils; +package org.apache.iotdb.commons.queryengine.plan.relational.utils; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.FlatHashStrategy; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.HashStrategy; -import org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.XxHash64; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.FlatHashStrategy; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.HashStrategy; +import org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.XxHash64; import org.apache.tsfile.block.column.Column; import org.apache.tsfile.block.column.ColumnBuilder; @@ -48,8 +48,8 @@ import static java.lang.Double.doubleToLongBits; import static java.lang.Float.floatToIntBits; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.XxHash64.FALSE_XX_HASH; -import static org.apache.iotdb.commons.node_commons.execution.operator.source.relational.aggregation.grouped.hash.XxHash64.TRUE_XX_HASH; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.XxHash64.FALSE_XX_HASH; +import static org.apache.iotdb.commons.queryengine.execution.operator.source.relational.aggregation.grouped.hash.XxHash64.TRUE_XX_HASH; import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN; import static org.apache.tsfile.read.common.type.DateType.DATE; import static org.apache.tsfile.read.common.type.IntType.INT32; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/statement/component/FillPolicy.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/statement/component/FillPolicy.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/statement/component/FillPolicy.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/statement/component/FillPolicy.java index bc89154d858fd..507eda6d1b8e5 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/statement/component/FillPolicy.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/statement/component/FillPolicy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.statement.component; +package org.apache.iotdb.commons.queryengine.plan.statement.component; public enum FillPolicy { PREVIOUS((byte) 0), diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinAggregationFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/BuiltinAggregationFunction.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinAggregationFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/BuiltinAggregationFunction.java index eb72a670f9209..1c3c5aba15b6c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinAggregationFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/BuiltinAggregationFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.udf; +package org.apache.iotdb.commons.queryengine.plan.udf; import java.util.Arrays; import java.util.HashSet; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinScalarFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/BuiltinScalarFunction.java similarity index 97% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinScalarFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/BuiltinScalarFunction.java index 694cb711a7781..881abc0d7b624 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinScalarFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/BuiltinScalarFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.udf; +package org.apache.iotdb.commons.queryengine.plan.udf; import com.google.common.collect.ImmutableSet; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/BuiltinTimeSeriesGeneratingFunction.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/BuiltinTimeSeriesGeneratingFunction.java index 7174c19eebeb7..c9cca33b8ae2b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/BuiltinTimeSeriesGeneratingFunction.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/BuiltinTimeSeriesGeneratingFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.udf; +package org.apache.iotdb.commons.queryengine.plan.udf; import org.apache.iotdb.commons.udf.builtin.String.UDTFConcat; import org.apache.iotdb.commons.udf.builtin.String.UDTFEndsWith; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/TableUDFUtils.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/TableUDFUtils.java similarity index 93% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/TableUDFUtils.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/TableUDFUtils.java index e81af57f37b16..0e23cfcf1d026 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/TableUDFUtils.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/TableUDFUtils.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.udf; +package org.apache.iotdb.commons.queryengine.plan.udf; import org.apache.iotdb.common.rpc.thrift.FunctionType; import org.apache.iotdb.common.rpc.thrift.Model; -import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeService; -import org.apache.iotdb.commons.node_commons.plan.relational.function.ITableFunctionAINodeServiceProvider; +import org.apache.iotdb.commons.queryengine.plan.relational.function.ITableFunctionAINodeService; +import org.apache.iotdb.commons.queryengine.plan.relational.function.ITableFunctionAINodeServiceProvider; import org.apache.iotdb.commons.udf.UDFInformation; import org.apache.iotdb.udf.api.exception.UDFException; import org.apache.iotdb.udf.api.relational.AggregateFunction; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/UDFManagementService.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/UDFManagementService.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/UDFManagementService.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/UDFManagementService.java index 5317f6a4d35c1..e75dc6174918a 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/UDFManagementService.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/UDFManagementService.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.udf; +package org.apache.iotdb.commons.queryengine.plan.udf; import org.apache.iotdb.common.rpc.thrift.Model; -import org.apache.iotdb.commons.node_commons.plan.relational.function.TableBuiltinTableFunction; +import org.apache.iotdb.commons.queryengine.plan.relational.function.TableBuiltinTableFunction; import org.apache.iotdb.commons.udf.UDFInformation; import org.apache.iotdb.commons.udf.UDFTable; import org.apache.iotdb.commons.udf.UDFType; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/UDTFForecast.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/UDTFForecast.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/UDTFForecast.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/UDTFForecast.java index 1e285af3d130f..48ea964a4ce48 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/plan/udf/UDTFForecast.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/udf/UDTFForecast.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.commons.node_commons.plan.udf; +package org.apache.iotdb.commons.queryengine.plan.udf; import org.apache.iotdb.ainode.rpc.thrift.TForecastReq; import org.apache.iotdb.ainode.rpc.thrift.TForecastResp; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/DateTimeUtils.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/utils/DateTimeUtils.java similarity index 99% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/DateTimeUtils.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/utils/DateTimeUtils.java index 5575bfc776b7f..ccab91ba0a996 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/DateTimeUtils.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/utils/DateTimeUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.commons.node_commons.utils; +package org.apache.iotdb.commons.queryengine.utils; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.IoTDBRuntimeException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/TimestampPrecisionUtils.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/utils/TimestampPrecisionUtils.java similarity index 98% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/TimestampPrecisionUtils.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/utils/TimestampPrecisionUtils.java index 9779cab3e3661..54d1c70a679be 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/TimestampPrecisionUtils.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/utils/TimestampPrecisionUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.commons.node_commons.utils; +package org.apache.iotdb.commons.queryengine.utils; import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.exception.SemanticException; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/cte/CteDataStore.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/utils/cte/CteDataStore.java similarity index 95% rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/cte/CteDataStore.java rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/utils/cte/CteDataStore.java index c669753fa3781..d2cbcc17fa55b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/node_commons/utils/cte/CteDataStore.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/utils/cte/CteDataStore.java @@ -19,11 +19,11 @@ * */ -package org.apache.iotdb.commons.node_commons.utils.cte; +package org.apache.iotdb.commons.queryengine.utils.cte; import org.apache.iotdb.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; -import org.apache.iotdb.commons.node_commons.plan.relational.metadata.TableSchema; +import org.apache.iotdb.commons.queryengine.plan.relational.metadata.TableSchema; import org.apache.iotdb.commons.utils.TestOnly; import org.apache.tsfile.read.common.block.TsBlock; From 3626a42372a0e254ab4917116647f73537269ef0 Mon Sep 17 00:00:00 2001 From: shuwenwei Date: Tue, 21 Apr 2026 16:26:28 +0800 Subject: [PATCH 45/45] update pom.xml --- external-service-impl/rest/pom.xml | 6 + iotdb-client/cli/pom.xml | 5 + iotdb-core/calc-commons/pom.xml | 235 +++-------------------------- iotdb-core/confignode/pom.xml | 5 + iotdb-core/datanode/pom.xml | 5 +- iotdb-core/node-commons/pom.xml | 9 ++ 6 files changed, 46 insertions(+), 219 deletions(-) diff --git a/external-service-impl/rest/pom.xml b/external-service-impl/rest/pom.xml index 63b2443a8e0ab..9c3473a01c5f2 100644 --- a/external-service-impl/rest/pom.xml +++ b/external-service-impl/rest/pom.xml @@ -116,6 +116,12 @@ 2.0.7-SNAPSHOT provided + + org.apache.iotdb + calc-commons + 2.0.7-SNAPSHOT + provided + org.apache.iotdb iotdb-session diff --git a/iotdb-client/cli/pom.xml b/iotdb-client/cli/pom.xml index d8c48f7863fd2..e727adb57bfbe 100644 --- a/iotdb-client/cli/pom.xml +++ b/iotdb-client/cli/pom.xml @@ -64,6 +64,11 @@ iotdb-server 2.0.7-SNAPSHOT + + org.apache.iotdb + calc-commons + 2.0.7-SNAPSHOT + org.apache.iotdb isession diff --git a/iotdb-core/calc-commons/pom.xml b/iotdb-core/calc-commons/pom.xml index f4a6662608861..170604d15fcf0 100644 --- a/iotdb-core/calc-commons/pom.xml +++ b/iotdb-core/calc-commons/pom.xml @@ -1,4 +1,24 @@ + 4.0.0 @@ -20,16 +40,6 @@ service-rpc 2.0.7-SNAPSHOT - - org.apache.iotdb - iotdb-subscription - 2.0.7-SNAPSHOT - - - org.apache.iotdb - iotdb-consensus - 2.0.7-SNAPSHOT - org.apache.tsfile common @@ -40,86 +50,31 @@ tsfile ${tsfile.version} - - org.apache.iotdb - external-api - 2.0.7-SNAPSHOT - org.apache.iotdb node-commons 2.0.7-SNAPSHOT - - org.apache.iotdb - isession - 2.0.7-SNAPSHOT - - - org.apache.iotdb - iotdb-antlr - 2.0.7-SNAPSHOT - - - org.apache.iotdb - iotdb-relational-grammar - 2.0.7-SNAPSHOT - org.apache.iotdb iotdb-thrift-commons 2.0.7-SNAPSHOT - - org.apache.iotdb - iotdb-thrift-consensus - 2.0.7-SNAPSHOT - - - org.apache.iotdb - external-service-api - 2.0.7-SNAPSHOT - org.apache.iotdb udf-api 2.0.7-SNAPSHOT - - org.apache.iotdb - trigger-api - 2.0.7-SNAPSHOT - org.apache.iotdb metrics-interface 2.0.7-SNAPSHOT - - org.apache.iotdb - iotdb-thrift - 2.0.7-SNAPSHOT - - - org.apache.iotdb - iotdb-thrift-confignode - 2.0.7-SNAPSHOT - - - org.apache.iotdb - iotdb-thrift-ainode - 2.0.7-SNAPSHOT - org.apache.iotdb pipe-api 2.0.7-SNAPSHOT - - org.apache.iotdb - iotdb-session - 2.0.7-SNAPSHOT - io.airlift units @@ -128,172 +83,22 @@ com.google.code.findbugs jsr305 - - com.google.errorprone - error_prone_annotations - true - - - org.apache.thrift - libthrift - - - io.netty - netty-common - - - org.apache.ratis - ratis-common - - - io.dropwizard.metrics - metrics-core - org.slf4j slf4j-api - - net.java.dev.jna - jna - - - net.java.dev.jna - jna-platform - - - org.eclipse.milo - stack-core - - - org.eclipse.milo - sdk-core - - - org.eclipse.milo - stack-server - - - org.eclipse.milo - stack-client - - - org.eclipse.milo - sdk-client - - - org.bouncycastle - bcprov-jdk18on - - - org.apache.commons - commons-pool2 - - - org.antlr - antlr4-runtime - - - io.airlift - airline - - - org.eclipse.milo - sdk-server - - - commons-cli - commons-cli - - - jakarta.validation - jakarta.validation-api - - - org.reflections - reflections - test - - - org.javassist - javassist - - - com.google.code.gson gson - - com.github.ben-manes.caffeine - caffeine - - - - org.checkerframework - checker-qual - - - com.google.guava guava - - org.java-websocket - Java-WebSocket - at.yawk.lz4 lz4-java - - junit - junit - test - - - - org.apache.iotdb - metrics-core - 2.0.7-SNAPSHOT - - - org.mockito - mockito-core - test - - - org.apache.ratis - ratis-thirdparty-misc - runtime - - - org.powermock - powermock-core - test - - - org.powermock - powermock-module-junit4 - test - - - org.powermock - powermock-api-mockito2 - test - - - org.awaitility - awaitility - test - - - com.tngtech.archunit - archunit - 1.3.0 - test - diff --git a/iotdb-core/confignode/pom.xml b/iotdb-core/confignode/pom.xml index 57d21685eb8e8..8dcde31ec737a 100644 --- a/iotdb-core/confignode/pom.xml +++ b/iotdb-core/confignode/pom.xml @@ -59,6 +59,11 @@ iotdb-server 2.0.7-SNAPSHOT + + org.apache.iotdb + calc-commons + 2.0.7-SNAPSHOT + org.apache.iotdb pipe-api diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml index dca6f72db75cd..d3f5f4a669f0c 100644 --- a/iotdb-core/datanode/pom.xml +++ b/iotdb-core/datanode/pom.xml @@ -244,10 +244,6 @@ - - com.google.code.gson - gson - com.github.ben-manes.caffeine caffeine @@ -270,6 +266,7 @@ at.yawk.lz4 lz4-java + test junit diff --git a/iotdb-core/node-commons/pom.xml b/iotdb-core/node-commons/pom.xml index 894a88a146b1c..ca0000608b932 100644 --- a/iotdb-core/node-commons/pom.xml +++ b/iotdb-core/node-commons/pom.xml @@ -147,6 +147,15 @@ cglib cglib + + com.google.errorprone + error_prone_annotations + true + + + org.antlr + antlr4-runtime + com.github.ben-manes.caffeine caffeine